From 79e4268d39ffcb3d969beafc2b2d4e98384d23a5 Mon Sep 17 00:00:00 2001
From: KingRainbow44 <kobedo11@gmail.com>
Date: Mon, 8 May 2023 01:47:02 -0400
Subject: [PATCH] Fix usage of `onMethod`

---
 .../emu/grasscutter/data/excels/dungeon/DungeonData.java    | 2 +-
 .../data/excels/trial/TrialAvatarActivityDataData.java      | 2 +-
 src/main/java/emu/grasscutter/game/entity/EntityGadget.java | 4 ++--
 .../java/emu/grasscutter/game/entity/EntityMonster.java     | 6 +++---
 .../java/emu/grasscutter/game/entity/EntityVehicle.java     | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/java/emu/grasscutter/data/excels/dungeon/DungeonData.java b/src/main/java/emu/grasscutter/data/excels/dungeon/DungeonData.java
index 21d5f1c51..520d501fc 100644
--- a/src/main/java/emu/grasscutter/data/excels/dungeon/DungeonData.java
+++ b/src/main/java/emu/grasscutter/data/excels/dungeon/DungeonData.java
@@ -13,7 +13,7 @@ import lombok.Getter;
 @ResourceType(name = "DungeonExcelConfigData.json")
 public class DungeonData extends GameResource {
 
-    @Getter(onMethod = @__(@Override))
+    @Getter(onMethod_ = @Override)
     private int id;
 
     @Getter private int sceneId;
diff --git a/src/main/java/emu/grasscutter/data/excels/trial/TrialAvatarActivityDataData.java b/src/main/java/emu/grasscutter/data/excels/trial/TrialAvatarActivityDataData.java
index 27b5cb2f1..d98de2264 100644
--- a/src/main/java/emu/grasscutter/data/excels/trial/TrialAvatarActivityDataData.java
+++ b/src/main/java/emu/grasscutter/data/excels/trial/TrialAvatarActivityDataData.java
@@ -12,7 +12,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;
diff --git a/src/main/java/emu/grasscutter/game/entity/EntityGadget.java b/src/main/java/emu/grasscutter/game/entity/EntityGadget.java
index c1f94edcb..c2bbf615d 100644
--- a/src/main/java/emu/grasscutter/game/entity/EntityGadget.java
+++ b/src/main/java/emu/grasscutter/game/entity/EntityGadget.java
@@ -49,7 +49,7 @@ import lombok.ToString;
 public class EntityGadget extends EntityBaseGadget {
     @Getter private final GadgetData gadgetData;
 
-    @Getter(onMethod = @__(@Override))
+    @Getter(onMethod_ = @Override)
     @Setter
     private int gadgetId;
 
@@ -62,7 +62,7 @@ public class EntityGadget extends EntityBaseGadget {
     @Getter @Setter private int pointType;
     @Getter private GadgetContent content;
 
-    @Getter(onMethod = @__(@Override), lazy = true)
+    @Getter(onMethod_ = @Override, lazy = true)
     private final Int2FloatMap fightProperties = new Int2FloatOpenHashMap();
 
     @Getter @Setter private SceneGadget metaGadget;
diff --git a/src/main/java/emu/grasscutter/game/entity/EntityMonster.java b/src/main/java/emu/grasscutter/game/entity/EntityMonster.java
index 30770e0fb..d5b5a062f 100644
--- a/src/main/java/emu/grasscutter/game/entity/EntityMonster.java
+++ b/src/main/java/emu/grasscutter/game/entity/EntityMonster.java
@@ -40,12 +40,12 @@ import java.util.Optional;
 import static emu.grasscutter.scripts.constants.EventType.EVENT_SPECIFIC_MONSTER_HP_CHANGE;
 
 public class EntityMonster extends GameEntity {
-    @Getter(onMethod = @__(@Override))
+    @Getter(onMethod_ = @Override)
     private final Int2FloatOpenHashMap fightProperties;
 
-    @Getter(onMethod = @__(@Override))
+    @Getter(onMethod_ = @Override)
     private final Position position;
-    @Getter(onMethod = @__(@Override))
+    @Getter(onMethod_ = @Override)
     private final Position rotation;
     @Getter private final MonsterData monsterData;
     @Getter private final Position bornPos;
diff --git a/src/main/java/emu/grasscutter/game/entity/EntityVehicle.java b/src/main/java/emu/grasscutter/game/entity/EntityVehicle.java
index c86a6aa64..27d6a8bd9 100644
--- a/src/main/java/emu/grasscutter/game/entity/EntityVehicle.java
+++ b/src/main/java/emu/grasscutter/game/entity/EntityVehicle.java
@@ -35,7 +35,7 @@ public class EntityVehicle extends EntityBaseGadget {
 
     @Getter private final Player owner;
 
-    @Getter(onMethod = @__(@Override))
+    @Getter(onMethod_ = @Override)
     private final Int2FloatMap fightProperties;
 
     @Getter private final int pointId;