From 6d6e6a041df049f168b0c9fece8337aa821ae037 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 4 Jun 2023 05:01:54 +0000 Subject: [PATCH] Format code [skip actions] --- .../actions/ActionGenerateElemBall.java | 57 ++++++++++++------- 1 file changed, 36 insertions(+), 21 deletions(-) diff --git a/src/main/java/emu/grasscutter/game/ability/actions/ActionGenerateElemBall.java b/src/main/java/emu/grasscutter/game/ability/actions/ActionGenerateElemBall.java index ad6bdb636..9aef4c396 100644 --- 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; @@ -12,13 +11,14 @@ import emu.grasscutter.game.entity.EntityAvatar; import emu.grasscutter.game.entity.EntityItem; import emu.grasscutter.game.entity.GameEntity; import emu.grasscutter.game.props.SceneType; -import emu.grasscutter.net.proto.AbilityActionGenerateElemBallOuterClass.AbilityActionGenerateElemBall; import emu.grasscutter.game.world.Position; +import emu.grasscutter.net.proto.AbilityActionGenerateElemBallOuterClass.AbilityActionGenerateElemBall; @AbilityAction(AbilityModifierAction.Type.GenerateElemBall) public final 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; @@ -28,54 +28,69 @@ public final class ActionGenerateElemBall extends AbilityActionHandler { return false; } - //Check if we should allow elem ball generation - if(action.dropType == 0x0) { + // Check if we should allow elem ball generation + 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; } - } else if(action.dropType == 0x1) { - if(owner.getScene().getSceneData().getSceneType() != SceneType.SCENE_WORLD) { + } else if (action.dropType == 0x1) { + if (owner.getScene().getSceneData().getSceneType() != SceneType.SCENE_WORLD) { Grasscutter.getLogger().warn("This level config only allows element balls on big world"); return true; } - } //Else the drop is forced + } // Else the drop is forced var energy = action.baseEnergy.get(ability) * action.ratio.get(ability); - if(energy <= 0.0) return true; + if (energy <= 0.0) return true; var itemData = GameData.getItemDataMap().get(action.configID); - if(itemData == null) { + if (itemData == null) { Grasscutter.getLogger().warn("configID {} not found", action.configID); return false; } - if(itemData.getItemUse() == null || itemData.getItemUse().isEmpty()) { + if (itemData.getItemUse() == null || itemData.getItemUse().isEmpty()) { Grasscutter.getLogger().warn("Item {} has no item use array", action.configID); return true; } 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; + 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; default: Grasscutter.getLogger().warn("UseOp not implemented", itemUse.getUseOp()); return false; } - var amountGenerated = (int)Math.ceil(energy / requiredEnergy); - if(amountGenerated >= 21) { - Grasscutter.getLogger().warn("Attempt to generate more than 20 element balls {}", amountGenerated); + var amountGenerated = (int) Math.ceil(energy / requiredEnergy); + if (amountGenerated >= 21) { + Grasscutter.getLogger() + .warn("Attempt to generate more than 20 element balls {}", amountGenerated); return false; } - 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); + 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); owner.getScene().addEntity(energyBall); }