refactor: fix lombok

brenoepics · Jun 9, 2024 · bfc2c7c · bfc2c7c
1 parent 8c53f2b
commit bfc2c7c
Show file tree

Hide file tree

Showing 9 changed files with 122 additions and 102 deletions.
diff --git a/src/main/java/emu/grasscutter/data/excels/RewardPreviewData.java b/src/main/java/emu/grasscutter/data/excels/RewardPreviewData.java
@@ -8,7 +8,7 @@
 
 @ResourceType(name = "RewardPreviewExcelConfigData.json", loadPriority = LoadPriority.HIGH)
 public class RewardPreviewData extends GameResource {
-    @Getter(onMethod_ = @Override)
+    @Getter(onMethod = @__(@Override))
     private int id;
 
     private ItemParamStringData[] previewItems;

diff --git a/src/main/java/emu/grasscutter/data/excels/quest/QuestData.java b/src/main/java/emu/grasscutter/data/excels/quest/QuestData.java
@@ -13,7 +13,6 @@
 
 @Getter
 @ResourceType(name = "QuestExcelConfigData.json")
-@Getter
 @ToString
 public class QuestData extends GameResource {
     private int subId;

diff --git a/src/main/java/emu/grasscutter/data/excels/reliquary/ReliquaryMainPropData.java b/src/main/java/emu/grasscutter/data/excels/reliquary/ReliquaryMainPropData.java
@@ -8,7 +8,7 @@
 @ResourceType(name = "ReliquaryMainPropExcelConfigData.json")
 @Getter
 public class ReliquaryMainPropData extends GameResource {
-    @Getter(onMethod_ = @Override)
+    @Getter(onMethod = @__(@Override))
     private int id;
 
     private int propDepotId;

diff --git a/src/main/java/emu/grasscutter/data/excels/scene/SceneData.java b/src/main/java/emu/grasscutter/data/excels/scene/SceneData.java
@@ -9,7 +9,7 @@
 @ResourceType(name = "SceneExcelConfigData.json")
 @Getter
 public final class SceneData extends GameResource {
-    @Getter(onMethod_ = @Override)
+    @Getter(onMethod = @__(@Override))
     private int id;
 
     @SerializedName("type")

diff --git a/src/main/java/emu/grasscutter/data/excels/scene/SceneTagData.java b/src/main/java/emu/grasscutter/data/excels/scene/SceneTagData.java
@@ -8,7 +8,7 @@
 @ResourceType(name = "SceneTagConfigData.json")
 @Getter
 public final class SceneTagData extends GameResource {
-    @Getter(onMethod_ = @Override)
+    @Getter(onMethod = @__(@Override))
     private int id;
 
     @SerializedName("DJCOAOBDIHP")

diff --git a/src/main/java/emu/grasscutter/data/excels/trial/TrialAvatarActivityDataData.java b/src/main/java/emu/grasscutter/data/excels/trial/TrialAvatarActivityDataData.java
@@ -10,7 +10,7 @@
 @Data
 @FieldDefaults(level = AccessLevel.PRIVATE)
 public class TrialAvatarActivityDataData extends GameResource {
-    @Getter(onMethod_ = @Override)
+    @Getter(onMethod = @__({@Override}))
     private int id;
 
     private int trialAvatarIndexId;

diff --git a/src/main/java/emu/grasscutter/game/friends/FriendsList.java b/src/main/java/emu/grasscutter/game/friends/FriendsList.java
@@ -93,8 +93,8 @@ public synchronized void handleFriendRequest(int targetUid, DealAddFriendResultT
 
         // Handle
         if (result == DealAddFriendResultType.DEAL_ADD_FRIEND_RESULT_TYPE_ACCEPT) { // Request accepted
-            myFriendship.setIsFriend(true);
-            theirFriendship.setIsFriend(true);
+            myFriendship.setFriend(true);
+            theirFriendship.setFriend(true);
 
             this.getPendingFriends().remove(myFriendship.getOwnerId());
             this.addFriend(myFriendship);

diff --git a/src/main/java/emu/grasscutter/game/inventory/Inventory.java b/src/main/java/emu/grasscutter/game/inventory/Inventory.java
diff --git a/src/main/java/emu/grasscutter/net/packet/BasePacket.java b/src/main/java/emu/grasscutter/net/packet/BasePacket.java
@@ -2,20 +2,27 @@
 
 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 @Getter private byte[] data;
+    @Setter
+    @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 void setData(GeneratedMessageV3.Builder proto) {
         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;