Merge remote-tracking branch 'origin/unstable-quests' into unstable-quests

src/main/java/emu/grasscutter/game/world/SpawnDataEntry.java

@@ -1,97 +1,97 @@
-package emu.grasscutter.game.world;
-
-import emu.grasscutter.data.GameDepot;
-import emu.grasscutter.utils.Position;
-import java.util.List;
-import java.util.Objects;
-import lombok.Getter;
-import lombok.Setter;
-
-public class SpawnDataEntry {
-    @Getter @Setter private transient SpawnGroupEntry group;
-    @Getter private int monsterId;
-    @Getter private int gadgetId;
-    @Getter private int configId;
-    @Getter private int level;
-    @Getter private int poseId;
-    @Getter private int gatherItemId;
-    @Getter private int gadgetState;
-    @Getter private Position pos;
-    @Getter private Position rot;
-
-    public GridBlockId getBlockId() {
-        int scale = GridBlockId.getScale(gadgetId);
-        return new GridBlockId(
-                group.sceneId,
-                scale,
-                (int) (pos.getX() / GameDepot.BLOCK_SIZE[scale]),
-                (int) (pos.getZ() / GameDepot.BLOCK_SIZE[scale]));
-    }
-
-    public static class SpawnGroupEntry {
-        @Getter private int sceneId;
-        @Getter private int groupId;
-        @Getter private int blockId;
-        @Getter @Setter private List<SpawnDataEntry> spawns;
-    }
-
-    public static class GridBlockId {
-        @Getter private final int sceneId;
-        @Getter private final int scale;
-        @Getter private final int x;
-        @Getter private final int z;
-
-        public GridBlockId(int sceneId, int scale, int x, int z) {
-            this.sceneId = sceneId;
-            this.scale = scale;
-            this.x = x;
-            this.z = z;
-        }
-
-        public static GridBlockId[] getAdjacentGridBlockIds(int sceneId, Position pos) {
-            GridBlockId[] results = new GridBlockId[5 * 5 * GameDepot.BLOCK_SIZE.length];
-            int t = 0;
-            for (int scale = 0; scale < GameDepot.BLOCK_SIZE.length; scale++) {
-                int x = ((int) (pos.getX() / GameDepot.BLOCK_SIZE[scale]));
-                int z = ((int) (pos.getZ() / GameDepot.BLOCK_SIZE[scale]));
-                for (int i = x - 2; i < x + 3; i++) {
-                    for (int j = z - 2; j < z + 3; j++) {
-                        results[t++] = new GridBlockId(sceneId, scale, i, j);
-                    }
-                }
-            }
-            return results;
-        }
-
-        public static int getScale(int gadgetId) {
-            return 0; // you should implement here,this is index of GameDepot.BLOCK_SIZE
-        }
-
-        @Override
-        public String toString() {
-            return "SpawnDataEntryScaledPoint{"
-                    + "sceneId="
-                    + sceneId
-                    + ", scale="
-                    + scale
-                    + ", x="
-                    + x
-                    + ", z="
-                    + z
-                    + '}';
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) return true;
-            if (o == null || getClass() != o.getClass()) return false;
-            GridBlockId that = (GridBlockId) o;
-            return sceneId == that.sceneId && scale == that.scale && x == that.x && z == that.z;
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hash(sceneId, scale, x, z);
-        }
-    }
-}
+package emu.grasscutter.game.world;
+
+import emu.grasscutter.data.GameDepot;
+import emu.grasscutter.utils.Position;
+import java.util.List;
+import java.util.Objects;
+import lombok.Getter;
+import lombok.Setter;
+
+public class SpawnDataEntry {
+    @Getter @Setter private transient SpawnGroupEntry group;
+    @Getter private int monsterId;
+    @Getter private int gadgetId;
+    @Getter private int configId;
+    @Getter private int level;
+    @Getter private int poseId;
+    @Getter private int gatherItemId;
+    @Getter private int gadgetState;
+    @Getter private Position pos;
+    @Getter private Position rot;
+
+    public GridBlockId getBlockId() {
+        int scale = GridBlockId.getScale(gadgetId);
+        return new GridBlockId(
+                group.sceneId,
+                scale,
+                (int) (pos.getX() / GameDepot.BLOCK_SIZE[scale]),
+                (int) (pos.getZ() / GameDepot.BLOCK_SIZE[scale]));
+    }
+
+    public static class SpawnGroupEntry {
+        @Getter private int sceneId;
+        @Getter private int groupId;
+        @Getter private int blockId;
+        @Getter @Setter private List<SpawnDataEntry> spawns;
+    }
+
+    public static class GridBlockId {
+        @Getter private int sceneId;
+        @Getter private int scale;
+        @Getter private int x;
+        @Getter private int z;
+
+        public GridBlockId(int sceneId, int scale, int x, int z) {
+            this.sceneId = sceneId;
+            this.scale = scale;
+            this.x = x;
+            this.z = z;
+        }
+
+        public static GridBlockId[] getAdjacentGridBlockIds(int sceneId, Position pos) {
+            GridBlockId[] results = new GridBlockId[5 * 5 * GameDepot.BLOCK_SIZE.length];
+            int t = 0;
+            for (int scale = 0; scale < GameDepot.BLOCK_SIZE.length; scale++) {
+                int x = ((int) (pos.getX() / GameDepot.BLOCK_SIZE[scale]));
+                int z = ((int) (pos.getZ() / GameDepot.BLOCK_SIZE[scale]));
+                for (int i = x - 2; i < x + 3; i++) {
+                    for (int j = z - 2; j < z + 3; j++) {
+                        results[t++] = new GridBlockId(sceneId, scale, i, j);
+                    }
+                }
+            }
+            return results;
+        }
+
+        public static int getScale(int gadgetId) {
+            return 0; // you should implement here,this is index of GameDepot.BLOCK_SIZE
+        }
+
+        @Override
+        public String toString() {
+            return "SpawnDataEntryScaledPoint{"
+                    + "sceneId="
+                    + sceneId
+                    + ", scale="
+                    + scale
+                    + ", x="
+                    + x
+                    + ", z="
+                    + z
+                    + '}';
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (o == null || getClass() != o.getClass()) return false;
+            GridBlockId that = (GridBlockId) o;
+            return sceneId == that.sceneId && scale == that.scale && x == that.x && z == that.z;
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(sceneId, scale, x, z);
+        }
+    }
+}

src/main/java/emu/grasscutter/game/world/World.java

@@ -37,12 +37,12 @@ public class World implements Iterable<Player> {
     @Getter private final List<Player> players;
     @Getter private final Int2ObjectMap<Scene> scenes;
 
-    @Getter private final int levelEntityId;
+    @Getter private int levelEntityId;
     private int nextEntityId = 0;
     private int nextPeerId = 0;
     private int worldLevel;
 
-    private final boolean isMultiplayer;
+    private boolean isMultiplayer;
 
     private long lastUpdateTime;
     @Getter private int tickCount = 0;