Format code [skip actions]

2024-11-26 15:39:37 +00:00 · 2023-06-04 04:29:25 +00:00 · 2023-06-04 04:29:25 +00:00 · b050337216
commit b050337216
parent ac3ccf93f3
6 changed files with 68 additions and 48 deletions
--- a/src/main/java/emu/grasscutter/Grasscutter.java
+++ b/src/main/java/emu/grasscutter/Grasscutter.java
@ -1,5 +1,8 @@
 package emu.grasscutter;

+import static emu.grasscutter.config.Configuration.SERVER;
+import static emu.grasscutter.utils.lang.Language.translate;
+
 import ch.qos.logback.classic.*;
 import emu.grasscutter.auth.*;
 import emu.grasscutter.command.*;
@ -18,20 +21,16 @@ import emu.grasscutter.tools.Tools;
 import emu.grasscutter.utils.*;
 import emu.grasscutter.utils.lang.Language;
 import io.netty.util.concurrent.FastThreadLocalThread;
+import java.io.*;
+import java.util.Calendar;
+import java.util.concurrent.*;
+import javax.annotation.Nullable;
 import lombok.*;
 import org.jline.reader.*;
 import org.jline.terminal.*;
 import org.reflections.Reflections;
 import org.slf4j.LoggerFactory;

-import javax.annotation.Nullable;
-import java.io.*;
-import java.util.Calendar;
-import java.util.concurrent.*;
-
-import static emu.grasscutter.config.Configuration.SERVER;
-import static emu.grasscutter.utils.lang.Language.translate;
-
 public final class Grasscutter {
    public static final File configFile = new File("./config.json");
    public static final Reflections reflector = new Reflections("emu.grasscutter");
--- a/src/main/java/emu/grasscutter/command/CommandMap.java
+++ b/src/main/java/emu/grasscutter/command/CommandMap.java
@ -1,14 +1,13 @@
 package emu.grasscutter.command;

+import static emu.grasscutter.config.Configuration.SERVER;
+
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.database.DatabaseHelper;
 import emu.grasscutter.game.player.Player;
 import it.unimi.dsi.fastutil.objects.*;
-import org.reflections.Reflections;
-
 import java.util.*;
-
-import static emu.grasscutter.config.Configuration.SERVER;
+import org.reflections.Reflections;

@SuppressWarnings({"UnusedReturnValue", "unused"})
 public final class CommandMap {
--- a/src/main/java/emu/grasscutter/data/binout/config/ConfigLevelEntity.java
+++ b/src/main/java/emu/grasscutter/data/binout/config/ConfigLevelEntity.java
@ -1,9 +1,8 @@
 package emu.grasscutter.data.binout.config;

 import emu.grasscutter.data.binout.config.fields.ConfigAbilityData;
-import lombok.Getter;
-
 import java.util.List;
+import lombok.Getter;

 public class ConfigLevelEntity {

--- a/src/main/java/emu/grasscutter/game/ability/actions/ActionGenerateElemBall.java
+++ b/src/main/java/emu/grasscutter/game/ability/actions/ActionGenerateElemBall.java
@ -2,7 +2,6 @@ package emu.grasscutter.game.ability.actions;

 import com.google.protobuf.ByteString;
 import com.google.protobuf.InvalidProtocolBufferException;
-
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.binout.AbilityModifier.AbilityModifierAction;
@ -11,7 +10,6 @@ import emu.grasscutter.game.ability.Ability;
 import emu.grasscutter.game.entity.EntityAvatar;
 import emu.grasscutter.game.entity.EntityItem;
 import emu.grasscutter.game.entity.GameEntity;
-import emu.grasscutter.game.props.ItemUseOp;
 import emu.grasscutter.game.props.SceneType;
 import emu.grasscutter.net.proto.AbilityActionGenerateElemBallOuterClass.AbilityActionGenerateElemBall;
 import emu.grasscutter.utils.Position;
@ -19,7 +17,8 @@ import emu.grasscutter.utils.Position;
@AbilityAction(AbilityModifierAction.Type.GenerateElemBall)
 public class ActionGenerateElemBall extends AbilityActionHandler {
    @Override
-    public boolean execute(Ability ability, AbilityModifierAction action, ByteString abilityData, GameEntity target) {
+    public boolean execute(
+            Ability ability, AbilityModifierAction action, ByteString abilityData, GameEntity target) {
        GameEntity owner = ability.getOwner();

        AbilityActionGenerateElemBall generateElemBall;
@ -33,7 +32,9 @@ public class ActionGenerateElemBall extends AbilityActionHandler {
        if (action.dropType == 0x0) {
            String levelEntityConfig = owner.getScene().getSceneData().getLevelEntityConfig();
            ConfigLevelEntity config = GameData.getConfigLevelEntityDataMap().get(levelEntityConfig);
-            if(config != null && config.getDropElemControlType() != null && config.getDropElemControlType().compareTo("None") == 0) {
+            if (config != null
+                    && config.getDropElemControlType() != null
+                    && config.getDropElemControlType().compareTo("None") == 0) {
                Grasscutter.getLogger().warn("This level config don't allow element balls");
                return true;
            }
@ -61,8 +62,12 @@ public class ActionGenerateElemBall extends AbilityActionHandler {
        var itemUse = itemData.getItemUse().get(0);
        double requiredEnergy;
        switch (itemUse.getUseOp()) {
-            case ITEM_USE_ADD_ELEM_ENERGY: requiredEnergy = Integer.parseInt(itemUse.getUseParam()[1]); break;
-            case ITEM_USE_ADD_ALL_ENERGY: requiredEnergy = Integer.parseInt(itemUse.getUseParam()[0]); break;
+            case ITEM_USE_ADD_ELEM_ENERGY:
+                requiredEnergy = Integer.parseInt(itemUse.getUseParam()[1]);
+                break;
+            case ITEM_USE_ADD_ALL_ENERGY:
+                requiredEnergy = Integer.parseInt(itemUse.getUseParam()[0]);
+                break;
            default:
                Grasscutter.getLogger().warn("UseOp not implemented", itemUse.getUseOp());
                return false;
@ -70,17 +75,25 @@ public class ActionGenerateElemBall extends AbilityActionHandler {

        var amountGenerated = (int) Math.ceil(energy / requiredEnergy);
        if (amountGenerated >= 21) {
-            Grasscutter.getLogger().warn("Attempt to generate more than 20 element balls {}", amountGenerated);
+            Grasscutter.getLogger()
+                    .warn("Attempt to generate more than 20 element balls {}", amountGenerated);
            return false;
        }

-        Grasscutter.getLogger().debug("Generating {} of {} element balls", amountGenerated, action.configID);
+        Grasscutter.getLogger()
+                .debug("Generating {} of {} element balls", amountGenerated, action.configID);
        for (int i = 0; i < amountGenerated; i++) {
-            EntityItem energyBall = new EntityItem(owner.getScene(), (owner instanceof EntityAvatar avatar) ? avatar.getPlayer() : null, itemData, new Position(generateElemBall.getPos()), new Position(generateElemBall.getRot()), 1);
+            EntityItem energyBall =
+                    new EntityItem(
+                            owner.getScene(),
+                            (owner instanceof EntityAvatar avatar) ? avatar.getPlayer() : null,
+                            itemData,
+                            new Position(generateElemBall.getPos()),
+                            new Position(generateElemBall.getRot()),
+                            1);
            owner.getScene().addEntity(energyBall);
        }

        return true;
    }
 }
-
--- a/src/main/java/emu/grasscutter/game/entity/EntityItem.java
+++ b/src/main/java/emu/grasscutter/game/entity/EntityItem.java
@ -37,18 +37,29 @@ public class EntityItem extends EntityBaseGadget {
        this(scene, player, itemData, pos, count, true);
    }

-    public EntityItem(Scene scene, Player player, ItemData itemData, Position pos, Position rotation, int count) {
+    public EntityItem(
+            Scene scene, Player player, ItemData itemData, Position pos, Position rotation, int count) {
        this(scene, player, itemData, pos, rotation, count, true);
    }

-    public EntityItem(Scene scene, Player player, ItemData itemData, Position pos, int count, boolean share) {
+    public EntityItem(
+            Scene scene, Player player, ItemData itemData, Position pos, int count, boolean share) {
        this(scene, player, itemData, pos, null, count, share);
    }

-    // In official game, some drop items are shared to all players, and some other items are independent to all players
-    // For example, if you killed a monster in MP mode, all players could get drops but rarity and number of them are different
+    // In official game, some drop items are shared to all players, and some other items are
+    // independent to all players
+    // For example, if you killed a monster in MP mode, all players could get drops but rarity and
+    // number of them are different
    // but if you broke regional mine, when someone picked up the drop then it disappeared
-    public EntityItem(Scene scene, Player player, ItemData itemData, Position pos, Position rotation, int count, boolean share) {
+    public EntityItem(
+            Scene scene,
+            Player player,
+            ItemData itemData,
+            Position pos,
+            Position rotation,
+            int count,
+            boolean share) {
        super(scene, pos, rotation);
        this.id = getScene().getWorld().getNextEntityId(EntityIdType.GADGET);
        this.guid =
--- a/src/main/java/emu/grasscutter/server/game/GameServer.java
+++ b/src/main/java/emu/grasscutter/server/game/GameServer.java
@ -1,5 +1,8 @@
 package emu.grasscutter.server.game;

+import static emu.grasscutter.config.Configuration.*;
+import static emu.grasscutter.utils.lang.Language.translate;
+
 import emu.grasscutter.*;
 import emu.grasscutter.Grasscutter.ServerRunMode;
 import emu.grasscutter.database.DatabaseHelper;
@ -30,17 +33,13 @@ import emu.grasscutter.server.event.types.ServerEvent;
 import emu.grasscutter.server.scheduler.ServerTaskScheduler;
 import emu.grasscutter.task.TaskMap;
 import emu.grasscutter.utils.Utils;
-import kcp.highway.*;
-import lombok.*;
-import org.jetbrains.annotations.NotNull;
-
 import java.net.*;
 import java.time.*;
 import java.util.*;
 import java.util.concurrent.*;
-
-import static emu.grasscutter.config.Configuration.*;
-import static emu.grasscutter.utils.lang.Language.translate;
+import kcp.highway.*;
+import lombok.*;
+import org.jetbrains.annotations.NotNull;

@Getter
 public final class GameServer extends KcpServer implements Iterable<Player> {