refactor: fix lombok

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

@@ -8,7 +8,7 @@ import lombok.Getter;
 
 @ResourceType(name = "RewardPreviewExcelConfigData.json", loadPriority = LoadPriority.HIGH)
 public class RewardPreviewData extends GameResource {
-    @Getter(onMethod_ = @Override)
+    @Getter(onMethod = @__(@Override))
     private int id;
 
     private ItemParamStringData[] previewItems;

src/main/java/emu/grasscutter/data/excels/quest/QuestData.java

@@ -13,7 +13,6 @@ import lombok.experimental.FieldDefaults;
 
 @Getter
 @ResourceType(name = "QuestExcelConfigData.json")
-@Getter
 @ToString
 public class QuestData extends GameResource {
     private int subId;

src/main/java/emu/grasscutter/data/excels/reliquary/ReliquaryMainPropData.java

@@ -8,7 +8,7 @@ import lombok.Getter;
 @ResourceType(name = "ReliquaryMainPropExcelConfigData.json")
 @Getter
 public class ReliquaryMainPropData extends GameResource {
-    @Getter(onMethod_ = @Override)
+    @Getter(onMethod = @__(@Override))
     private int id;
 
     private int propDepotId;

src/main/java/emu/grasscutter/data/excels/scene/SceneData.java

@@ -9,7 +9,7 @@ import lombok.Getter;
 @ResourceType(name = "SceneExcelConfigData.json")
 @Getter
 public final class SceneData extends GameResource {
-    @Getter(onMethod_ = @Override)
+    @Getter(onMethod = @__(@Override))
     private int id;
 
     @SerializedName("type")

src/main/java/emu/grasscutter/data/excels/scene/SceneTagData.java

@@ -8,7 +8,7 @@ import lombok.Getter;
 @ResourceType(name = "SceneTagConfigData.json")
 @Getter
 public final class SceneTagData extends GameResource {
-    @Getter(onMethod_ = @Override)
+    @Getter(onMethod = @__(@Override))
     private int id;
 
     @SerializedName("DJCOAOBDIHP")

src/main/java/emu/grasscutter/data/excels/trial/TrialAvatarActivityDataData.java

@@ -10,7 +10,7 @@ import lombok.experimental.FieldDefaults;
 @Data
 @FieldDefaults(level = AccessLevel.PRIVATE)
 public class TrialAvatarActivityDataData extends GameResource {
-    @Getter(onMethod_ = @Override)
+    @Getter(onMethod = @__({@Override}))
     private int id;
 
     private int trialAvatarIndexId;

src/main/java/emu/grasscutter/game/friends/FriendsList.java

@@ -93,8 +93,8 @@ public class FriendsList extends BasePlayerManager {
 
         // Handle
         if (result == DealAddFriendResultType.DEAL_ADD_FRIEND_RESULT_TYPE_ACCEPT) { // Request accepted
-            myFriendship.setIsFriend(true);
+            myFriendship.setFriend(true);
-            theirFriendship.setIsFriend(true);
+            theirFriendship.setFriend(true);
 
             this.getPendingFriends().remove(myFriendship.getOwnerId());
             this.addFriend(myFriendship);

src/main/java/emu/grasscutter/game/inventory/Inventory.java

@@ -1,32 +1,43 @@
 package emu.grasscutter.game.inventory;
 
-import static emu.grasscutter.config.Configuration.INVENTORY_LIMITS;
-
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.common.ItemParamData;
 import emu.grasscutter.data.excels.ItemData;
 import emu.grasscutter.database.DatabaseHelper;
-import emu.grasscutter.game.avatar.*;
+import emu.grasscutter.game.avatar.Avatar;
+import emu.grasscutter.game.avatar.AvatarStorage;
 import emu.grasscutter.game.entity.EntityAvatar;
-import emu.grasscutter.game.player.*;
+import emu.grasscutter.game.player.BasePlayerManager;
-import emu.grasscutter.game.props.*;
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.game.props.ActionReason;
 import emu.grasscutter.game.props.ItemUseAction.UseItemParams;
+import emu.grasscutter.game.props.PlayerProperty;
+import emu.grasscutter.game.props.WatcherTriggerType;
 import emu.grasscutter.game.quest.enums.QuestContent;
 import emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam;
 import emu.grasscutter.server.event.player.PlayerObtainItemEvent;
 import emu.grasscutter.server.packet.send.*;
 import emu.grasscutter.utils.Utils;
-import it.unimi.dsi.fastutil.ints.*;
+import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import it.unimi.dsi.fastutil.longs.*;
+import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
-import java.util.*;
+import it.unimi.dsi.fastutil.longs.Long2ObjectMap;
-import javax.annotation.Nullable;
+import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap;
 import lombok.Getter;
 import lombok.val;
 
+import javax.annotation.Nullable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+
+import static emu.grasscutter.config.Configuration.INVENTORY_LIMITS;
+
 public class Inventory extends BasePlayerManager implements Iterable<GameItem> {
     private final Long2ObjectMap<GameItem> store;
-    @Getter private final Int2ObjectMap<InventoryTab> inventoryTypes;
+    @Getter
+    private final Int2ObjectMap<InventoryTab> inventoryTypes;
 
     public Inventory(Player player) {
         super(player);
@@ -76,7 +87,8 @@ public class Inventory extends BasePlayerManager implements Iterable<GameItem> {
         return this.getItems().get(id);
     }
 
-    @Nullable public InventoryTab getInventoryTabByItemId(int itemId) {
+    @Nullable
+    public InventoryTab getInventoryTabByItemId(int itemId) {
         val itemData = GameData.getItemDataMap().get(itemId);
         if (itemData == null || itemData.getItemType() == null) {
             return null;
@@ -84,7 +96,8 @@ public class Inventory extends BasePlayerManager implements Iterable<GameItem> {
         return getInventoryTab(itemData.getItemType());
     }
 
-    @Nullable public GameItem getItemById(int itemId) {
+    @Nullable
+    public GameItem getItemById(int itemId) {
         val inventoryTab = this.getInventoryTabByItemId(itemId);
         return inventoryTab != null ? inventoryTab.getItemById(itemId) : null;
     }
@@ -319,9 +332,7 @@ public class Inventory extends BasePlayerManager implements Iterable<GameItem> {
                     case MATERIAL_COSTUME:
                     case MATERIAL_NAMECARD:
                         Grasscutter.getLogger()
-                                .warn(
+                            .warn("Attempted to add a {} to inventory, but item definition lacks isUseOnGain. This indicates a Resources error.", item.getItemData().getMaterialType().name());
-                                        "Attempted to add a {} to inventory, but item definition lacks isUseOnGain. This indicates a Resources error.",
-                                        item.getItemData().getMaterialType().name());
                         return null;
                     default:
                         if (tab == null) {
@@ -444,9 +455,8 @@ public class Inventory extends BasePlayerManager implements Iterable<GameItem> {
                 GameItem item =
                     getInventoryTab(ItemType.ITEM_MATERIAL)
                         .getItemById(
-                                        itemId); // What if we ever want to operate on weapons/relics/furniture? :Syield
+                            itemId); // What if we ever want to operate on weapons/relics/furniture? :Syield (item == null) ? 0 : item.getCount(); // What if we ever want to operate on weapons/relics/furniture? :S
-                // (item == null) ? 0 : item.getCount(); // What if we ever want to
+                yield (item == null) ? 0 : item.getCount();
-                // operate on weapons/relics/furniture? :S
             }
         };
     }

src/main/java/emu/grasscutter/net/packet/BasePacket.java

@@ -2,20 +2,27 @@ package emu.grasscutter.net.packet;
 
 import com.google.protobuf.GeneratedMessageV3;
 import emu.grasscutter.net.proto.PacketHeadOuterClass.PacketHead;
-import java.io.*;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.io.*;
+
 public class BasePacket {
     private static final int const1 = 17767; // 0x4567
     private static final int const2 = -30293; // 0x89ab
     public final boolean shouldEncrypt = true;
-    @Setter @Getter private int opcode;
+    @Setter
+    @Getter
+    private int opcode;
     private boolean shouldBuildHeader = false;
-    @Setter @Getter private byte[] header;
+    @Setter
-    @Setter @Getter private byte[] data;
+    @Getter
+    private byte[] header;
+    @Getter
+    private byte[] data;
     // Encryption
-    @Setter private boolean useDispatchKey;
+    @Setter
+    private boolean useDispatchKey;
 
     public BasePacket(int opcode) {
         this.opcode = opcode;
@@ -48,6 +55,10 @@ public class BasePacket {
         this.data = proto.build().toByteArray();
     }
 
+    public void setData(byte[] packet) {
+        this.data = packet;
+    }
+
     public BasePacket buildHeader(int clientSequence) {
         if (this.getHeader() != null && clientSequence == 0) {
             return this;