Fix player fields not being set

line seps r weird

src/main/java/emu/grasscutter/data/binout/config/ConfigEntityAvatar.java

@@ -1,3 +1,3 @@
-package emu.grasscutter.data.binout.config;
-
-public class ConfigEntityAvatar extends ConfigEntityBase {}
+package emu.grasscutter.data.binout.config;
+
+public class ConfigEntityAvatar extends ConfigEntityBase {}

src/main/java/emu/grasscutter/data/binout/config/ConfigEntityBase.java

@@ -1,17 +1,17 @@
-package emu.grasscutter.data.binout.config;
-
-import emu.grasscutter.data.binout.config.fields.ConfigAbilityData;
-import emu.grasscutter.data.binout.config.fields.ConfigCombat;
-import emu.grasscutter.data.binout.config.fields.ConfigCommon;
-import emu.grasscutter.data.binout.config.fields.ConfigGlobalValue;
-import java.util.Collection;
-import javax.annotation.Nullable;
-import lombok.Data;
-
-@Data
-public class ConfigEntityBase {
-    @Nullable ConfigCommon configCommon;
-    @Nullable ConfigCombat combat;
-    Collection<ConfigAbilityData> abilities;
-    ConfigGlobalValue globalValue; // used for SGV in monsters and Gadgets
-}
+package emu.grasscutter.data.binout.config;
+
+import emu.grasscutter.data.binout.config.fields.ConfigAbilityData;
+import emu.grasscutter.data.binout.config.fields.ConfigCombat;
+import emu.grasscutter.data.binout.config.fields.ConfigCommon;
+import emu.grasscutter.data.binout.config.fields.ConfigGlobalValue;
+import java.util.Collection;
+import javax.annotation.Nullable;
+import lombok.Data;
+
+@Data
+public class ConfigEntityBase {
+    @Nullable ConfigCommon configCommon;
+    @Nullable ConfigCombat combat;
+    Collection<ConfigAbilityData> abilities;
+    ConfigGlobalValue globalValue; // used for SGV in monsters and Gadgets
+}

src/main/java/emu/grasscutter/data/binout/config/ConfigEntityGadget.java

@@ -1,11 +1,11 @@
-package emu.grasscutter.data.binout.config;
-
-import lombok.AccessLevel;
-import lombok.Data;
-import lombok.experimental.FieldDefaults;
-
-@Data
-@FieldDefaults(level = AccessLevel.PRIVATE)
-public class ConfigEntityGadget extends ConfigEntityBase {
-    // There are more values that can be added that might be useful in the json
-}
+package emu.grasscutter.data.binout.config;
+
+import lombok.AccessLevel;
+import lombok.Data;
+import lombok.experimental.FieldDefaults;
+
+@Data
+@FieldDefaults(level = AccessLevel.PRIVATE)
+public class ConfigEntityGadget extends ConfigEntityBase {
+    // There are more values that can be added that might be useful in the json
+}

src/main/java/emu/grasscutter/data/binout/config/ConfigEntityMonster.java

@@ -1,6 +1,6 @@
-package emu.grasscutter.data.binout.config;
-
-import lombok.Data;
-
-@Data
-public class ConfigEntityMonster extends ConfigEntityBase {}
+package emu.grasscutter.data.binout.config;
+
+import lombok.Data;
+
+@Data
+public class ConfigEntityMonster extends ConfigEntityBase {}

src/main/java/emu/grasscutter/data/binout/config/ConfigLevelEntity.java

@@ -1,13 +1,13 @@
-package emu.grasscutter.data.binout.config;
-
-import emu.grasscutter.data.binout.config.fields.ConfigAbilityData;
-import java.util.List;
-import lombok.Getter;
-
-public class ConfigLevelEntity {
-
-    @Getter private List<ConfigAbilityData> abilities; // monster abilities
-    @Getter private List<ConfigAbilityData> avatarAbilities;
-    @Getter private List<ConfigAbilityData> teamAbilities;
-    @Getter private List<Integer> preloadMonsterEntityIDs;
-}
+package emu.grasscutter.data.binout.config;
+
+import emu.grasscutter.data.binout.config.fields.ConfigAbilityData;
+import java.util.List;
+import lombok.Getter;
+
+public class ConfigLevelEntity {
+
+    @Getter private List<ConfigAbilityData> abilities; // monster abilities
+    @Getter private List<ConfigAbilityData> avatarAbilities;
+    @Getter private List<ConfigAbilityData> teamAbilities;
+    @Getter private List<Integer> preloadMonsterEntityIDs;
+}

src/main/java/emu/grasscutter/data/binout/config/fields/ConfigAbilityData.java

@@ -1,10 +1,10 @@
-package emu.grasscutter.data.binout.config.fields;
-
-import lombok.Data;
-
-@Data
-public class ConfigAbilityData {
-    public String abilityID;
-    public String abilityName;
-    public String abilityOverride;
-}
+package emu.grasscutter.data.binout.config.fields;
+
+import lombok.Data;
+
+@Data
+public class ConfigAbilityData {
+    public String abilityID;
+    public String abilityName;
+    public String abilityOverride;
+}

src/main/java/emu/grasscutter/data/binout/config/fields/ConfigAiBeta.java

@@ -1,8 +1,8 @@
-package emu.grasscutter.data.binout.config.fields;
-
-import lombok.Data;
-
-@Data
-public class ConfigAiBeta {
-    boolean enable;
-}
+package emu.grasscutter.data.binout.config.fields;
+
+import lombok.Data;
+
+@Data
+public class ConfigAiBeta {
+    boolean enable;
+}

src/main/java/emu/grasscutter/data/binout/config/fields/ConfigCombat.java

@@ -1,12 +1,12 @@
-package emu.grasscutter.data.binout.config.fields;
-
-import lombok.AccessLevel;
-import lombok.Data;
-import lombok.experimental.FieldDefaults;
-
-@Data
-@FieldDefaults(level = AccessLevel.PRIVATE)
-public class ConfigCombat {
-    // There are more values that can be added that might be useful in the json
-    ConfigCombatProperty property;
-}
+package emu.grasscutter.data.binout.config.fields;
+
+import lombok.AccessLevel;
+import lombok.Data;
+import lombok.experimental.FieldDefaults;
+
+@Data
+@FieldDefaults(level = AccessLevel.PRIVATE)
+public class ConfigCombat {
+    // There are more values that can be added that might be useful in the json
+    ConfigCombatProperty property;
+}

src/main/java/emu/grasscutter/data/binout/config/fields/ConfigCombatDie.java

@@ -1,18 +1,18 @@
-package emu.grasscutter.data.binout.config.fields;
-
-import com.google.gson.annotations.SerializedName;
-import lombok.AccessLevel;
-import lombok.Data;
-import lombok.experimental.FieldDefaults;
-
-@Data
-@FieldDefaults(level = AccessLevel.PRIVATE)
-public class ConfigCombatDie {
-    @SerializedName(
-            value = "dieEndTime",
-            alternate = {"HGGPMFGGBNC"})
-    double dieEndTime;
-
-    double dieForceDisappearTime;
-    boolean hasAnimatorDie;
-}
+package emu.grasscutter.data.binout.config.fields;
+
+import com.google.gson.annotations.SerializedName;
+import lombok.AccessLevel;
+import lombok.Data;
+import lombok.experimental.FieldDefaults;
+
+@Data
+@FieldDefaults(level = AccessLevel.PRIVATE)
+public class ConfigCombatDie {
+    @SerializedName(
+            value = "dieEndTime",
+            alternate = {"HGGPMFGGBNC"})
+    double dieEndTime;
+
+    double dieForceDisappearTime;
+    boolean hasAnimatorDie;
+}

src/main/java/emu/grasscutter/data/binout/config/fields/ConfigCombatProperty.java

@@ -1,18 +1,18 @@
-package emu.grasscutter.data.binout.config.fields;
-
-import lombok.AccessLevel;
-import lombok.Data;
-import lombok.experimental.FieldDefaults;
-
-@Data
-@FieldDefaults(level = AccessLevel.PRIVATE)
-public class ConfigCombatProperty {
-    float HP;
-    boolean isLockHP;
-    boolean isInvincible;
-    boolean isGhostToAllied;
-    float attack;
-    float defence;
-    float weight;
-    boolean useCreatorProperty;
-}
+package emu.grasscutter.data.binout.config.fields;
+
+import lombok.AccessLevel;
+import lombok.Data;
+import lombok.experimental.FieldDefaults;
+
+@Data
+@FieldDefaults(level = AccessLevel.PRIVATE)
+public class ConfigCombatProperty {
+    float HP;
+    boolean isLockHP;
+    boolean isInvincible;
+    boolean isGhostToAllied;
+    float attack;
+    float defence;
+    float weight;
+    boolean useCreatorProperty;
+}

src/main/java/emu/grasscutter/data/binout/config/fields/ConfigCommon.java

@@ -1,6 +1,6 @@
-package emu.grasscutter.data.binout.config.fields;
-
-import lombok.Data;
-
-@Data
-public class ConfigCommon {}
+package emu.grasscutter.data.binout.config.fields;
+
+import lombok.Data;
+
+@Data
+public class ConfigCommon {}

src/main/java/emu/grasscutter/data/binout/config/fields/ConfigGlobalValue.java

@@ -1,12 +1,12 @@
-package emu.grasscutter.data.binout.config.fields;
-
-import java.util.Map;
-import java.util.Set;
-import lombok.Data;
-
-/** Contains information about the entities SGVs */
-@Data
-public class ConfigGlobalValue {
-    Set<String> serverGlobalValues;
-    Map<String, Float> initServerGlobalValues;
-}
+package emu.grasscutter.data.binout.config.fields;
+
+import java.util.Map;
+import java.util.Set;
+import lombok.Data;
+
+/** Contains information about the entities SGVs */
+@Data
+public class ConfigGlobalValue {
+    Set<String> serverGlobalValues;
+    Map<String, Float> initServerGlobalValues;
+}

src/main/java/emu/grasscutter/data/binout/routes/RotAngleType.java

@@ -1,22 +1,22 @@
-package emu.grasscutter.data.binout.routes;
-
-// import emu.grasscutter.scripts.constants.IntValueEnum;
-import lombok.Getter;
-
-public enum RotAngleType /*implements IntValueEnum */ {
-    ROT_NONE(-1),
-    ROT_ANGLE_X(0),
-    ROT_ANGLE_Y(1),
-    ROT_ANGLE_Z(2);
-
-    @Getter private final int id;
-
-    RotAngleType(int id) {
-        this.id = id;
-    }
-
-    // @Override
-    public int getValue() {
-        return id;
-    }
-}
+package emu.grasscutter.data.binout.routes;
+
+// import emu.grasscutter.scripts.constants.IntValueEnum;
+import lombok.Getter;
+
+public enum RotAngleType /*implements IntValueEnum */ {
+    ROT_NONE(-1),
+    ROT_ANGLE_X(0),
+    ROT_ANGLE_Y(1),
+    ROT_ANGLE_Z(2);
+
+    @Getter private final int id;
+
+    RotAngleType(int id) {
+        this.id = id;
+    }
+
+    // @Override
+    public int getValue() {
+        return id;
+    }
+}

src/main/java/emu/grasscutter/data/binout/routes/RotType.java

@@ -1,7 +1,7 @@
-package emu.grasscutter.data.binout.routes;
-
-public enum RotType {
-    ROT_NONE,
-    ROT_ANGLE,
-    ROT_ROUND
-}
+package emu.grasscutter.data.binout.routes;
+
+public enum RotType {
+    ROT_NONE,
+    ROT_ANGLE,
+    ROT_ROUND
+}

src/main/java/emu/grasscutter/data/binout/routes/Route.java

@@ -1,29 +1,29 @@
-package emu.grasscutter.data.binout.routes;
-
-import emu.grasscutter.net.proto.RouteOuterClass;
-import lombok.AccessLevel;
-import lombok.Data;
-import lombok.experimental.FieldDefaults;
-import lombok.val;
-
-@Data
-@FieldDefaults(level = AccessLevel.PRIVATE)
-public class Route {
-    private int localId;
-    private String name;
-    private RouteType type = RouteType.Unknown;
-    private RoutePoint[] points;
-    private float arriveRange; // optional
-    private RotType rotType; // optional
-    private RotAngleType rotAngleType; // optional
-
-    public RouteOuterClass.Route toProto() {
-        val builder = RouteOuterClass.Route.newBuilder().setRouteType(type.getValue());
-        if (points != null) {
-            for (var routePoint : points) {
-                builder.addRoutePoints(routePoint.toProto().setArriveRange(arriveRange));
-            }
-        }
-        return builder.build();
-    }
-}
+package emu.grasscutter.data.binout.routes;
+
+import emu.grasscutter.net.proto.RouteOuterClass;
+import lombok.AccessLevel;
+import lombok.Data;
+import lombok.experimental.FieldDefaults;
+import lombok.val;
+
+@Data
+@FieldDefaults(level = AccessLevel.PRIVATE)
+public class Route {
+    private int localId;
+    private String name;
+    private RouteType type = RouteType.Unknown;
+    private RoutePoint[] points;
+    private float arriveRange; // optional
+    private RotType rotType; // optional
+    private RotAngleType rotAngleType; // optional
+
+    public RouteOuterClass.Route toProto() {
+        val builder = RouteOuterClass.Route.newBuilder().setRouteType(type.getValue());
+        if (points != null) {
+            for (var routePoint : points) {
+                builder.addRoutePoints(routePoint.toProto().setArriveRange(arriveRange));
+            }
+        }
+        return builder.build();
+    }
+}

src/main/java/emu/grasscutter/data/binout/routes/RoutePoint.java

@@ -1,31 +1,31 @@
-package emu.grasscutter.data.binout.routes;
-
-import emu.grasscutter.net.proto.RoutePointOuterClass;
-import emu.grasscutter.utils.Position;
-import lombok.AccessLevel;
-import lombok.Data;
-import lombok.experimental.FieldDefaults;
-import lombok.val;
-
-@Data
-@FieldDefaults(level = AccessLevel.PRIVATE)
-public class RoutePoint {
-    private Position pos;
-    private int speedLevel; // optional
-    private float waitTime; // optional
-    private float targetVelocity; // optional
-    private boolean hasReachEvent; // optional
-    // rotRoundReachDir //optional Pos with optional values
-    // rotRoundLeaveDir //optional Pos with optional values
-
-    public RoutePointOuterClass.RoutePoint.Builder toProto() {
-        val builder = RoutePointOuterClass.RoutePoint.newBuilder().setPosition(pos.toProto());
-        if (waitTime != 0) {
-            builder.setTime(waitTime);
-        } else if (targetVelocity != 0) {
-            builder.setVelocity(targetVelocity);
-        }
-
-        return builder;
-    }
-}
+package emu.grasscutter.data.binout.routes;
+
+import emu.grasscutter.net.proto.RoutePointOuterClass;
+import emu.grasscutter.utils.Position;
+import lombok.AccessLevel;
+import lombok.Data;
+import lombok.experimental.FieldDefaults;
+import lombok.val;
+
+@Data
+@FieldDefaults(level = AccessLevel.PRIVATE)
+public class RoutePoint {
+    private Position pos;
+    private int speedLevel; // optional
+    private float waitTime; // optional
+    private float targetVelocity; // optional
+    private boolean hasReachEvent; // optional
+    // rotRoundReachDir //optional Pos with optional values
+    // rotRoundLeaveDir //optional Pos with optional values
+
+    public RoutePointOuterClass.RoutePoint.Builder toProto() {
+        val builder = RoutePointOuterClass.RoutePoint.newBuilder().setPosition(pos.toProto());
+        if (waitTime != 0) {
+            builder.setTime(waitTime);
+        } else if (targetVelocity != 0) {
+            builder.setVelocity(targetVelocity);
+        }
+
+        return builder;
+    }
+}

src/main/java/emu/grasscutter/data/binout/routes/RouteType.java

@@ -1,22 +1,22 @@
-package emu.grasscutter.data.binout.routes;
-
-// import emu.grasscutter.scripts.constants.IntValueEnum;
-import lombok.Getter;
-
-public enum RouteType /*implements IntValueEnum*/ {
-    Unknown(-1),
-    OneWay(0),
-    Reciprocate(1),
-    Loop(2);
-
-    @Getter private final int id;
-
-    RouteType(int id) {
-        this.id = id;
-    }
-
-    // @Override
-    public int getValue() {
-        return id;
-    }
-}
+package emu.grasscutter.data.binout.routes;
+
+// import emu.grasscutter.scripts.constants.IntValueEnum;
+import lombok.Getter;
+
+public enum RouteType /*implements IntValueEnum*/ {
+    Unknown(-1),
+    OneWay(0),
+    Reciprocate(1),
+    Loop(2);
+
+    @Getter private final int id;
+
+    RouteType(int id) {
+        this.id = id;
+    }
+
+    // @Override
+    public int getValue() {
+        return id;
+    }
+}

src/main/java/emu/grasscutter/data/binout/routes/SceneRoutes.java

@@ -1,13 +1,13 @@
-package emu.grasscutter.data.binout.routes;
-
-import javax.annotation.Nullable;
-import lombok.AccessLevel;
-import lombok.Data;
-import lombok.experimental.FieldDefaults;
-
-@Data
-@FieldDefaults(level = AccessLevel.PRIVATE)
-public class SceneRoutes {
-    private int sceneId;
-    @Nullable private Route[] routes;
-}
+package emu.grasscutter.data.binout.routes;
+
+import javax.annotation.Nullable;
+import lombok.AccessLevel;
+import lombok.Data;
+import lombok.experimental.FieldDefaults;
+
+@Data
+@FieldDefaults(level = AccessLevel.PRIVATE)
+public class SceneRoutes {
+    private int sceneId;
+    @Nullable private Route[] routes;
+}