Fix whitespace [skip actions]

src/main/java/emu/grasscutter/data/ResourceLoader.java

@@ -105,7 +105,7 @@ public class ResourceLoader {
 
     @SuppressWarnings("rawtypes")
     protected static void loadFromResource(Class<?> c, ResourceType type, Int2ObjectMap map, boolean doReload) throws Exception {
-		if(!loadedResources.contains(c.getSimpleName()) || doReload) {
+        if (!loadedResources.contains(c.getSimpleName()) || doReload) {
             for (String name : type.name()) {
                 loadFromResource(c, name, map);
             }
@@ -183,14 +183,14 @@ public class ResourceLoader {
             embryoList = Grasscutter.getGsonFactory().fromJson(new InputStreamReader(embryoCache), TypeToken.getParameterized(Collection.class, AbilityEmbryoEntry.class).getType());
         } catch (Exception ignored) {}
 
-		if(embryoList == null) {
+        if (embryoList == null) {
             // Load from BinOutput
             Pattern pattern = Pattern.compile("(?<=ConfigAvatar_)(.*?)(?=.json)");
 
             embryoList = new LinkedList<>();
             File folder = new File(Utils.toFilePath(RESOURCE("BinOutput/Avatar/")));
             File[] files = folder.listFiles();
-			if(files == null) {
+            if (files == null) {
                 Grasscutter.getLogger().error("Error loading ability embryos: no files found in " + folder.getAbsolutePath());
                 return;
             }
@@ -333,7 +333,7 @@ public class ResourceLoader {
                 s -> {
                     s.setGroup(entry);
                     GridBlockId point = s.getBlockId();
-                    if(!areaSort.containsKey(point)) {
+                    if (!areaSort.containsKey(point)) {
                         areaSort.put(point, new ArrayList<>());
                     }
                     areaSort.get(point).add(s);
@@ -347,7 +347,7 @@ public class ResourceLoader {
         // Read from cached file if exists
         List<OpenConfigEntry> list = null;
 
-		try(InputStream openConfigCache = DataLoader.load("OpenConfig.json", false)) {
+        try (InputStream openConfigCache = DataLoader.load("OpenConfig.json", false)) {
             list = Grasscutter.getGsonFactory().fromJson(new InputStreamReader(openConfigCache), TypeToken.getParameterized(Collection.class, SpawnGroupEntry.class).getType());
         } catch (Exception ignored) {}
 
@@ -359,7 +359,7 @@ public class ResourceLoader {
             for (String name : folderNames) {
                 File folder = new File(Utils.toFilePath(RESOURCE(name)));
                 File[] files = folder.listFiles();
-				if(files == null) {
+                if (files == null) {
                     Grasscutter.getLogger().error("Error loading open config: no files found in " + folder.getAbsolutePath()); return;
                 }
 
@@ -421,13 +421,13 @@ public class ResourceLoader {
     }
 
     @SneakyThrows
-	private static void loadHomeworldDefaultSaveData(){
+    private static void loadHomeworldDefaultSaveData() {
         var folder = Files.list(Path.of(RESOURCE("BinOutput/HomeworldDefaultSave"))).toList();
         var pattern = Pattern.compile("scene(.*)_home_config.json");
 
-		for(var file : folder){
+        for (var file : folder) {
             var matcher = pattern.matcher(file.getFileName().toString());
-			if(!matcher.find()){
+            if (!matcher.find()) {
                 continue;
             }
             var sceneId = matcher.group(1);
@@ -441,16 +441,16 @@ public class ResourceLoader {
     }
 
     @SneakyThrows
-	private static void loadNpcBornData(){
+    private static void loadNpcBornData() {
         var folder = Files.list(Path.of(RESOURCE("BinOutput/Scene/SceneNpcBorn"))).toList();
 
-		for(var file : folder){
-			if(file.toFile().isDirectory()){
+        for (var file : folder) {
+            if (file.toFile().isDirectory()) {
                 continue;
             }
 
             var data = Grasscutter.getGsonFactory().fromJson(Files.readString(file), SceneNpcBornData.class);
-			if(data.getBornPosList() == null || data.getBornPosList().size() == 0){
+            if (data.getBornPosList() == null || data.getBornPosList().size() == 0) {
                 continue;
             }
 

src/main/java/emu/grasscutter/data/excels/EnvAnimalGatherConfigData.java

@@ -21,11 +21,11 @@ public class EnvAnimalGatherConfigData extends GameResource {
         return animalId;
     }
 
-    public int getAnimalId(){
+    public int getAnimalId() {
         return animalId;
     }
 
-    public String getEntityType(){
+    public String getEntityType() {
         return entityType;
     }
 

src/main/java/emu/grasscutter/database/DatabaseManager.java

@@ -49,7 +49,7 @@ public final class DatabaseManager {
     // Yes. I very dislike this method. However, this will be good for now.
     // TODO: Add dispatch routes for player account management
     public static Datastore getAccountDatastore() {
-		if(SERVER.runMode == ServerRunMode.GAME_ONLY) {
+        if (SERVER.runMode == ServerRunMode.GAME_ONLY) {
             return dispatchDatastore;
         } else {
             return gameDatastore;
@@ -85,7 +85,7 @@ public final class DatabaseManager {
             }
         }
 
-		if(SERVER.runMode == ServerRunMode.GAME_ONLY) {
+        if (SERVER.runMode == ServerRunMode.GAME_ONLY) {
             MongoClient dispatchMongoClient = MongoClients.create(DATABASE.server.connectionUri);
             dispatchDatastore = Morphia.createDatastore(dispatchMongoClient, DATABASE.server.collection);
 

src/main/java/emu/grasscutter/game/Account.java

@@ -81,7 +81,7 @@ public class Account {
     }
 
     public String getEmail() {
-		if(email != null && !email.isEmpty()) {
+        if (email != null && !email.isEmpty()) {
             return email;
         } else {
             return "";
@@ -158,7 +158,7 @@ public class Account {
     }
 
     public boolean addPermission(String permission) {
-		if(this.permissions.contains(permission)) return false;
+        if (this.permissions.contains(permission)) return false;
         this.permissions.add(permission); return true;
     }
 
@@ -187,7 +187,7 @@ public class Account {
     }
 
     public boolean hasPermission(String permission) {
-		if(this.permissions.contains("*") && this.permissions.size() == 1) return true;
+        if (this.permissions.contains("*") && this.permissions.size() == 1) return true;
 
         // Add default permissions if it doesn't exist
         List<String> permissions = Stream.of(this.permissions, Arrays.asList(ACCOUNT.defaultPermissions))

src/main/java/emu/grasscutter/game/activity/ActivityManager.java

@@ -45,7 +45,7 @@ public class ActivityManager extends BasePlayerManager {
             activityWatcherTypeMap.put(typeName.value(), ConstructorAccess.get(item));
         });
 
-        try(Reader reader = DataLoader.loadReader("ActivityConfig.json")) {
+        try (Reader reader = DataLoader.loadReader("ActivityConfig.json")) {
             List<ActivityConfigItem> activities = Grasscutter.getGsonFactory().fromJson(
                 reader,
                 TypeToken.getParameterized(List.class, ActivityConfigItem.class).getType());
@@ -53,16 +53,16 @@ public class ActivityManager extends BasePlayerManager {
 
             activities.forEach(item -> {
                 var activityData = GameData.getActivityDataMap().get(item.getActivityId());
-                if(activityData == null){
+                if (activityData == null) {
                     Grasscutter.getLogger().warn("activity {} not exist.", item.getActivityId());
                     return;
                 }
                 var activityHandlerType = activityHandlerTypeMap.get(ActivityType.getTypeByName(activityData.getActivityType()));
                 ActivityHandler activityHandler;
 
-                if(activityHandlerType != null) {
+                if (activityHandlerType != null) {
                     activityHandler = (ActivityHandler) activityHandlerType.newInstance();
-                }else{
+                }else {
                     activityHandler = new DefaultActivityHandler();
                 }
                 activityHandler.setActivityConfigItem(item);
@@ -79,14 +79,14 @@ public class ActivityManager extends BasePlayerManager {
 
     }
 
-    public ActivityManager(Player player){
+    public ActivityManager(Player player) {
         super(player);
 
         playerActivityDataMap = new ConcurrentHashMap<>();
         // load data for player
         activityConfigItemMap.values().forEach(item -> {
             var data = PlayerActivityData.getByPlayer(player, item.getActivityId());
-            if(data == null){
+            if (data == null) {
                 data = item.getActivityHandler().initPlayerActivityData(player);
                 data.save();
             }
@@ -116,34 +116,34 @@ public class ActivityManager extends BasePlayerManager {
             params));
     }
 
-    public ActivityInfoOuterClass.ActivityInfo getInfoProtoByActivityId(int activityId){
+    public ActivityInfoOuterClass.ActivityInfo getInfoProtoByActivityId(int activityId) {
         var activityHandler = activityConfigItemMap.get(activityId).getActivityHandler();
         var activityData = playerActivityDataMap.get(activityId);
 
         return activityHandler.toProto(activityData);
     }
 
-    public Optional<ActivityHandler> getActivityHandler(ActivityType type){
+    public Optional<ActivityHandler> getActivityHandler(ActivityType type) {
         return activityConfigItemMap.values().stream()
             .map(ActivityConfigItem::getActivityHandler)
             .filter(x -> type == x.getClass().getAnnotation(GameActivity.class).value())
             .findFirst();
     }
 
-    public <T extends ActivityHandler> Optional<T> getActivityHandlerAs(ActivityType type, Class<T> clazz){
+    public <T extends ActivityHandler> Optional<T> getActivityHandlerAs(ActivityType type, Class<T> clazz) {
         return getActivityHandler(type).map(x -> (T)x);
     }
 
-    public Optional<Integer> getActivityIdByActivityType(ActivityType type){
+    public Optional<Integer> getActivityIdByActivityType(ActivityType type) {
         return getActivityHandler(type)
             .map(ActivityHandler::getActivityConfigItem)
             .map(ActivityConfigItem::getActivityId);
     }
-    public Optional<PlayerActivityData> getPlayerActivityDataByActivityType(ActivityType type){
+    public Optional<PlayerActivityData> getPlayerActivityDataByActivityType(ActivityType type) {
         return getActivityIdByActivityType(type)
             .map(playerActivityDataMap::get);
     }
-    public Optional<ActivityInfoOuterClass.ActivityInfo> getInfoProtoByActivityType(ActivityType type){
+    public Optional<ActivityInfoOuterClass.ActivityInfo> getInfoProtoByActivityType(ActivityType type) {
        return getActivityIdByActivityType(type)
            .map(this::getInfoProtoByActivityId);
     }

src/main/java/emu/grasscutter/game/activity/musicgame/MusicGameActivityHandler.java

@@ -41,8 +41,8 @@ public class MusicGameActivityHandler extends ActivityHandler {
             .build());
     }
 
-    public MusicGamePlayerData getMusicGamePlayerData(PlayerActivityData playerActivityData){
-        if(playerActivityData.getDetail() == null || playerActivityData.getDetail().isBlank()){
+    public MusicGamePlayerData getMusicGamePlayerData(PlayerActivityData playerActivityData) {
+        if (playerActivityData.getDetail() == null || playerActivityData.getDetail().isBlank()) {
             onInitPlayerActivityData(playerActivityData);
             playerActivityData.save();
         }
@@ -51,7 +51,7 @@ public class MusicGameActivityHandler extends ActivityHandler {
             MusicGamePlayerData.class);
     }
 
-    public boolean setMusicGameRecord(PlayerActivityData playerActivityData, MusicGamePlayerData.MusicGameRecord newRecord){
+    public boolean setMusicGameRecord(PlayerActivityData playerActivityData, MusicGamePlayerData.MusicGameRecord newRecord) {
         var musicGamePlayerData = getMusicGamePlayerData(playerActivityData);
         var saveRecord = musicGamePlayerData.getMusicGameRecord().get(newRecord.getMusicId());
 
@@ -63,7 +63,7 @@ public class MusicGameActivityHandler extends ActivityHandler {
 
         return newRecord.getMaxScore() > saveRecord.getMaxScore();
     }
-    public void setMusicGameCustomBeatmapRecord(PlayerActivityData playerActivityData, MusicGamePlayerData.CustomBeatmapRecord newRecord){
+    public void setMusicGameCustomBeatmapRecord(PlayerActivityData playerActivityData, MusicGamePlayerData.CustomBeatmapRecord newRecord) {
         var musicGamePlayerData = getMusicGamePlayerData(playerActivityData);
         musicGamePlayerData.getOthersCustomBeatmapRecord().put(newRecord.getMusicShareId(), newRecord);
 

src/main/java/emu/grasscutter/game/activity/musicgame/MusicGamePlayerData.java

@@ -21,7 +21,7 @@ public class MusicGamePlayerData {
     Map<Long, CustomBeatmapRecord> personalCustomBeatmapRecord;
     Map<Long, CustomBeatmapRecord> othersCustomBeatmapRecord;
 
-    public static MusicGamePlayerData create(){
+    public static MusicGamePlayerData create() {
         return MusicGamePlayerData.of()
             .musicGameRecord(GameData.getMusicGameBasicDataMap().values().stream()
                 .collect(Collectors.toMap(MusicGameBasicData::getId, MusicGamePlayerData.MusicGameRecord::create)))
@@ -38,13 +38,13 @@ public class MusicGamePlayerData {
         int maxCombo;
         int maxScore;
 
-        public static MusicGameRecord create(MusicGameBasicData musicGameBasicData){
+        public static MusicGameRecord create(MusicGameBasicData musicGameBasicData) {
             return MusicGameRecord.of()
                 .musicId(musicGameBasicData.getId())
                 .build();
         }
 
-        public MusicGameRecordOuterClass.MusicGameRecord toProto(){
+        public MusicGameRecordOuterClass.MusicGameRecord toProto() {
             return MusicGameRecordOuterClass.MusicGameRecord.newBuilder()
                 .setIsUnlock(true)
                 .setMaxCombo(maxCombo)
@@ -61,7 +61,7 @@ public class MusicGamePlayerData {
         int score;
         boolean settle;
 
-        public MusicBriefInfoOuterClass.MusicBriefInfo.Builder toPersonalBriefProto(){
+        public MusicBriefInfoOuterClass.MusicBriefInfo.Builder toPersonalBriefProto() {
             var musicGameBeatmap = MusicGameBeatmap.getByShareId(musicShareId);
 
             return MusicBriefInfoOuterClass.MusicBriefInfo.newBuilder()
@@ -74,7 +74,7 @@ public class MusicGamePlayerData {
                 .setMusicShareId(musicShareId);
         }
 
-        public MusicBriefInfoOuterClass.MusicBriefInfo.Builder toOthersBriefProto(){
+        public MusicBriefInfoOuterClass.MusicBriefInfo.Builder toOthersBriefProto() {
             var musicGameBeatmap = MusicGameBeatmap.getByShareId(musicShareId);
 
             return musicGameBeatmap.toBriefProto()

src/main/java/emu/grasscutter/game/battlepass/BattlePassManager.java

@@ -81,7 +81,7 @@ public class BattlePassManager extends BasePlayerDataManager {
         return false;
     }
 
-	public void addPoints(int points){
+    public void addPoints(int points) {
         this.addPointsDirectly(points, false);
 
         this.player.sendPacket(new PacketBattlePassCurScheduleUpdateNotify(player));

src/main/java/emu/grasscutter/game/combine/CombineManger.java

@@ -74,16 +74,16 @@ public class CombineManger extends BaseGameSystem {
         return true;
     }
 
-    public CombineResult combineItem(Player player, int cid, int count){
+    public CombineResult combineItem(Player player, int cid, int count) {
         // check config exist
-        if(!GameData.getCombineDataMap().containsKey(cid)){
+        if (!GameData.getCombineDataMap().containsKey(cid)) {
             player.getWorld().getHost().sendPacket(new PacketCombineRsp());
             return null;
         }
 
         CombineData combineData = GameData.getCombineDataMap().get(cid);
 
-        if(combineData.getPlayerLevel() > player.getLevel()){
+        if (combineData.getPlayerLevel() > player.getLevel()) {
             return null;
         }
 

src/main/java/emu/grasscutter/game/drop/DropSystem.java

@@ -41,7 +41,7 @@ public class DropSystem extends BaseGameSystem {
         try (Reader fileReader = DataLoader.loadReader("Drop.json")) {
             getDropData().clear();
             List<DropInfo> banners = Grasscutter.getGsonFactory().fromJson(fileReader, TypeToken.getParameterized(Collection.class, DropInfo.class).getType());
-            if(banners.size() > 0) {
+            if (banners.size() > 0) {
                 for (DropInfo di : banners) {
                     getDropData().put(di.getMonsterId(), di.getDropDataList());
                 }

src/main/java/emu/grasscutter/game/dungeons/DungeonSystem.java

@@ -70,7 +70,7 @@ public class DungeonSystem extends BaseGameSystem {
         }
         Grasscutter.getLogger().info("{}({}) is trying to enter tower dungeon {}" ,player.getNickname(),player.getUid(),dungeonId);
 
-		if(player.getWorld().transferPlayerToScene(player, data.getSceneId(), data)){
+        if (player.getWorld().transferPlayerToScene(player, data.getSceneId(), data)) {
             dungeonSettleListeners.forEach(player.getScene()::addDungeonSettleObserver);
         }
         return true;

src/main/java/emu/grasscutter/game/dungeons/challenge/DungeonChallenge.java

@@ -95,7 +95,7 @@ public class DungeonChallenge extends WorldChallenge {
     }
 
     private void settle() {
-		if(!stage){
+        if (!stage) {
             getScene().getDungeonSettleObservers().forEach(o -> o.onDungeonSettle(getScene()));
             getScene().getScriptManager().callEvent(EventType.EVENT_DUNGEON_SETTLE,
                     new ScriptArgs(this.isSuccess() ? 1 : 0));