diff --git a/build.gradle b/build.gradle
index 31a1f9d8a..0f5163c0f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -93,8 +93,8 @@ dependencies {
 
     implementation group: 'org.luaj', name: 'luaj-jse', version: '3.0.1'
 
-    implementation group:  'com.esotericsoftware', name : 'reflectasm', version: '1.11.9'
-    implementation group:  'com.github.davidmoten', name : 'rtree-multi', version: '0.1'
+    implementation group: 'com.esotericsoftware', name: 'reflectasm', version: '1.11.9'
+    implementation group: 'com.github.davidmoten', name: 'rtree-multi', version: '0.1'
 
     implementation group: 'io.javalin', name: 'javalin', version: '4.6.4'
     implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.13.3'
@@ -181,8 +181,8 @@ publishing {
     }
     repositories {
         maven {
-            if(version.endsWith('-dev')) {
-                println ("Publishing to 4benj-maven")
+            if (version.endsWith('-dev')) {
+                println("Publishing to 4benj-maven")
                 url 'https://repo.4benj.com/releases'
                 name '4benj-maven'
                 credentials {
@@ -190,7 +190,7 @@ publishing {
                     password System.getenv('benj_maven_token')
                 }
             } else {
-                println ("Publishing to sonatype")
+                println("Publishing to sonatype")
                 def releasesRepoUrl = 'https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/'
                 def snapshotsRepoUrl = 'https://s01.oss.sonatype.org/content/repositories/snapshots/'
                 url = version.endsWith('SNAPSHOT') ? snapshotsRepoUrl : releasesRepoUrl
@@ -222,7 +222,7 @@ sourceSets {
             srcDir 'src/generated'
         }
         java {
-            srcDir 'src/java'
+            srcDir 'src/generated/main/java'
         }
     }
 }
@@ -238,23 +238,25 @@ idea {
 
 eclipse {
     classpath {
-        file.whenMerged { cp ->
-            cp.entries.add( new org.gradle.plugins.ide.eclipse.model.SourceFolder('src/generated/main/java', null) )
+        file.whenMerged { cp -> cp.entries.add(new org.gradle.plugins.ide.eclipse.model.SourceFolder('src/generated/main/java', null))
         }
     }
 }
 
 signing {
-    if(!version.endsWith('-dev')) {
+    if (!version.endsWith('-dev')) {
         sign publishing.publications.mavenJava
     }
 }
 
 javadoc {
     options.encoding = 'UTF-8'
-    if(JavaVersion.current().isJava9Compatible()) {
+    if (JavaVersion.current().isJava9Compatible()) {
         options.addBooleanOption('html5', true)
     }
+    // Add this to avoid warning caused by lack of comments in proto generated java files
+    options.addStringOption('Xdoclint:none', '-quiet')
+    exclude '**/*.md'
 }
 
 task injectGitHash {
@@ -266,8 +268,7 @@ task injectGitHash {
         }
     }
 
-    new File(projectDir, "src/main/java/emu/grasscutter/BuildConfig.java").text =
-        """package emu.grasscutter;
+    new File(projectDir, "src/main/java/emu/grasscutter/BuildConfig.java").text = """package emu.grasscutter;
 
 public final class BuildConfig {
     public static final String VERSION = \"${version}\";
@@ -279,3 +280,16 @@ public final class BuildConfig {
 processResources {
     dependsOn "generateProto"
 }
+
+sourcesJar {
+    dependsOn "generateProto"
+}
+
+delombok {
+    dependsOn "generateProto"
+}
+
+// For terminal interacting in IDEA running
+run {
+    standardInput = System.in
+}
diff --git a/src/main/java/emu/grasscutter/data/excels/ActivityWatcherData.java b/src/main/java/emu/grasscutter/data/excels/ActivityWatcherData.java
index d462c28f1..23a129423 100644
--- a/src/main/java/emu/grasscutter/data/excels/ActivityWatcherData.java
+++ b/src/main/java/emu/grasscutter/data/excels/ActivityWatcherData.java
@@ -13,7 +13,7 @@ import java.util.List;
 @Getter
 @FieldDefaults(level = AccessLevel.PRIVATE)
 public class ActivityWatcherData extends GameResource {
-    @Getter(onMethod = @__(@Override))
+    @Getter(onMethod_ = @Override)
     int id;
     int rewardID;
     int progress;
diff --git a/src/main/java/emu/grasscutter/data/excels/AvatarData.java b/src/main/java/emu/grasscutter/data/excels/AvatarData.java
index ac016cec5..799fb3a71 100644
--- a/src/main/java/emu/grasscutter/data/excels/AvatarData.java
+++ b/src/main/java/emu/grasscutter/data/excels/AvatarData.java
@@ -44,7 +44,7 @@ public class AvatarData extends GameResource {
     private float criticalHurt;
 
     private List<PropGrowCurve> propGrowCurves;
-    @Getter(onMethod = @__(@Override))
+    @Getter(onMethod_ = @Override)
     private int id;
 
     // Transient
diff --git a/src/main/java/emu/grasscutter/data/excels/AvatarSkillData.java b/src/main/java/emu/grasscutter/data/excels/AvatarSkillData.java
index 4518e93a2..cd8a342a0 100644
--- a/src/main/java/emu/grasscutter/data/excels/AvatarSkillData.java
+++ b/src/main/java/emu/grasscutter/data/excels/AvatarSkillData.java
@@ -9,7 +9,7 @@ import lombok.Getter;
 @ResourceType(name = "AvatarSkillExcelConfigData.json", loadPriority = LoadPriority.HIGHEST)
 @Getter
 public class AvatarSkillData extends GameResource {
-    @Getter(onMethod = @__(@Override))
+    @Getter(onMethod_ = @Override)
     private int id;
     private float cdTime;
     private int costElemVal;
diff --git a/src/main/java/emu/grasscutter/data/excels/AvatarSkillDepotData.java b/src/main/java/emu/grasscutter/data/excels/AvatarSkillDepotData.java
index 2a8486658..7187e8a13 100644
--- a/src/main/java/emu/grasscutter/data/excels/AvatarSkillDepotData.java
+++ b/src/main/java/emu/grasscutter/data/excels/AvatarSkillDepotData.java
@@ -20,7 +20,7 @@ import lombok.Getter;
 @ResourceType(name = "AvatarSkillDepotExcelConfigData.json", loadPriority = LoadPriority.HIGH)
 @Getter
 public class AvatarSkillDepotData extends GameResource {
-    @Getter(onMethod = @__(@Override))
+    @Getter(onMethod_ = @Override)
     private int id;
     private int energySkill;
     private int attackModeSkill;
diff --git a/src/main/java/emu/grasscutter/data/excels/BattlePassMissionData.java b/src/main/java/emu/grasscutter/data/excels/BattlePassMissionData.java
index 9fa7fb3be..61f22446e 100644
--- a/src/main/java/emu/grasscutter/data/excels/BattlePassMissionData.java
+++ b/src/main/java/emu/grasscutter/data/excels/BattlePassMissionData.java
@@ -14,7 +14,7 @@ import lombok.Getter;
 @ResourceType(name = {"BattlePassMissionExcelConfigData.json"})
 @Getter
 public class BattlePassMissionData extends GameResource {
-    @Getter(onMethod = @__(@Override))
+    @Getter(onMethod_ = @Override)
     private int id;
     private int addPoint;
     private int scheduleId;
diff --git a/src/main/java/emu/grasscutter/data/excels/BlossomRefreshExcelConfigData.java b/src/main/java/emu/grasscutter/data/excels/BlossomRefreshExcelConfigData.java
index 9053386d2..78aed4603 100644
--- a/src/main/java/emu/grasscutter/data/excels/BlossomRefreshExcelConfigData.java
+++ b/src/main/java/emu/grasscutter/data/excels/BlossomRefreshExcelConfigData.java
@@ -9,7 +9,7 @@ import lombok.Getter;
 @ResourceType(name = "BlossomRefreshExcelConfigData.json")
 @Getter
 public class BlossomRefreshExcelConfigData extends GameResource {
-    @Getter(onMethod = @__(@Override))
+    @Getter(onMethod_ = @Override)
     private int id;
     // Map details
     private long nameTextMapHash;
diff --git a/src/main/java/emu/grasscutter/data/excels/ChapterData.java b/src/main/java/emu/grasscutter/data/excels/ChapterData.java
index f1392a350..0d5e27dfc 100644
--- a/src/main/java/emu/grasscutter/data/excels/ChapterData.java
+++ b/src/main/java/emu/grasscutter/data/excels/ChapterData.java
@@ -15,7 +15,7 @@ import java.util.Map;
 @Setter  // TODO: remove on next API break
 @FieldDefaults(level = AccessLevel.PRIVATE)
 public class ChapterData extends GameResource {
-    @Getter(onMethod = @__(@Override))
+    @Getter(onMethod_ = @Override)
     int id;
     int beginQuestId;
     int endQuestId;
diff --git a/src/main/java/emu/grasscutter/data/excels/CodexAnimalData.java b/src/main/java/emu/grasscutter/data/excels/CodexAnimalData.java
index c5846107f..400026f20 100644
--- a/src/main/java/emu/grasscutter/data/excels/CodexAnimalData.java
+++ b/src/main/java/emu/grasscutter/data/excels/CodexAnimalData.java
@@ -9,7 +9,7 @@ import lombok.Getter;
 @ResourceType(name = {"AnimalCodexExcelConfigData.json"})
 @Getter
 public class CodexAnimalData extends GameResource {
-    @Getter(onMethod = @__(@Override))
+    @Getter(onMethod_ = @Override)
     private int Id;
     private String type;
     private int describeId;
diff --git a/src/main/java/emu/grasscutter/data/excels/CompoundData.java b/src/main/java/emu/grasscutter/data/excels/CompoundData.java
index 50f85ee7c..491761168 100644
--- a/src/main/java/emu/grasscutter/data/excels/CompoundData.java
+++ b/src/main/java/emu/grasscutter/data/excels/CompoundData.java
@@ -10,7 +10,7 @@ import java.util.List;
 @ResourceType(name = {"CompoundExcelConfigData.json"},loadPriority = ResourceType.LoadPriority.LOW)
 @Getter
 public class CompoundData extends GameResource {
-    @Getter(onMethod = @__(@Override))
+    @Getter(onMethod_ = @Override)
     private int id;
     private int groupID;
     private int rankLevel;
diff --git a/src/main/java/emu/grasscutter/data/excels/CookRecipeData.java b/src/main/java/emu/grasscutter/data/excels/CookRecipeData.java
index 7acdb9704..109135273 100644
--- a/src/main/java/emu/grasscutter/data/excels/CookRecipeData.java
+++ b/src/main/java/emu/grasscutter/data/excels/CookRecipeData.java
@@ -11,7 +11,7 @@ import lombok.Getter;
 @ResourceType(name = {"CookRecipeExcelConfigData.json"}, loadPriority = LoadPriority.LOW)
 @Getter
 public class CookRecipeData extends GameResource {
-    @Getter(onMethod = @__(@Override))
+    @Getter(onMethod_ = @Override)
     private int id;
 
     private int rankLevel;
diff --git a/src/main/java/emu/grasscutter/data/excels/DailyDungeonData.java b/src/main/java/emu/grasscutter/data/excels/DailyDungeonData.java
index b72f2f3b1..15a96f6a3 100644
--- a/src/main/java/emu/grasscutter/data/excels/DailyDungeonData.java
+++ b/src/main/java/emu/grasscutter/data/excels/DailyDungeonData.java
@@ -11,7 +11,7 @@ import lombok.Getter;
 
 @ResourceType(name = "DailyDungeonConfigData.json")
 public class DailyDungeonData extends GameResource {
-    @Getter(onMethod = @__(@Override))
+    @Getter(onMethod_ = @Override)
     private int id;
     private int[] monday;
     private int[] tuesday;
diff --git a/src/main/java/emu/grasscutter/data/excels/DungeonData.java b/src/main/java/emu/grasscutter/data/excels/DungeonData.java
index c52cdc16b..d1d9788a5 100644
--- a/src/main/java/emu/grasscutter/data/excels/DungeonData.java
+++ b/src/main/java/emu/grasscutter/data/excels/DungeonData.java
@@ -7,7 +7,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;
     @Getter private int showLevel;
diff --git a/src/main/java/emu/grasscutter/data/excels/DungeonEntryData.java b/src/main/java/emu/grasscutter/data/excels/DungeonEntryData.java
index 2a8186e7d..f5b434403 100644
--- a/src/main/java/emu/grasscutter/data/excels/DungeonEntryData.java
+++ b/src/main/java/emu/grasscutter/data/excels/DungeonEntryData.java
@@ -9,7 +9,7 @@ import lombok.Setter;
 @Getter
 @Setter  // TODO: remove this next API break
 public class DungeonEntryData extends GameResource {
-    @Getter(onMethod = @__(@Override))
+    @Getter(onMethod_ = @Override)
     private int id;
     private int dungeonEntryId;
     private int sceneId;
diff --git a/src/main/java/emu/grasscutter/data/excels/ForgeData.java b/src/main/java/emu/grasscutter/data/excels/ForgeData.java
index 8fff6fe49..8a91d20ed 100644
--- a/src/main/java/emu/grasscutter/data/excels/ForgeData.java
+++ b/src/main/java/emu/grasscutter/data/excels/ForgeData.java
@@ -11,7 +11,7 @@ import lombok.Getter;
 @ResourceType(name = {"ForgeExcelConfigData.json"}, loadPriority = LoadPriority.HIGHEST)
 @Getter
 public class ForgeData extends GameResource {
-    @Getter(onMethod = @__(@Override))
+    @Getter(onMethod_ = @Override)
     private int id;
     private int playerLevel;
     private int forgeType;
diff --git a/src/main/java/emu/grasscutter/data/excels/GadgetData.java b/src/main/java/emu/grasscutter/data/excels/GadgetData.java
index a748f186b..6d2d4ac8b 100644
--- a/src/main/java/emu/grasscutter/data/excels/GadgetData.java
+++ b/src/main/java/emu/grasscutter/data/excels/GadgetData.java
@@ -8,7 +8,7 @@ import lombok.Getter;
 @ResourceType(name = "GadgetExcelConfigData.json")
 @Getter
 public class GadgetData extends GameResource {
-    @Getter(onMethod = @__(@Override))
+    @Getter(onMethod_ = @Override)
     private int id;
 
     private EntityType type;
diff --git a/src/main/java/emu/grasscutter/data/excels/InvestigationMonsterData.java b/src/main/java/emu/grasscutter/data/excels/InvestigationMonsterData.java
index 18e4d5d61..a822bb7ce 100644
--- a/src/main/java/emu/grasscutter/data/excels/InvestigationMonsterData.java
+++ b/src/main/java/emu/grasscutter/data/excels/InvestigationMonsterData.java
@@ -13,7 +13,7 @@ import java.util.List;
 @Getter
 @FieldDefaults(level = AccessLevel.PRIVATE)
 public class InvestigationMonsterData extends GameResource {
-    @Getter(onMethod = @__(@Override))
+    @Getter(onMethod_ = @Override)
     int id;
     int cityId;
     List<Integer> monsterIdList;
diff --git a/src/main/java/emu/grasscutter/data/excels/ItemData.java b/src/main/java/emu/grasscutter/data/excels/ItemData.java
index 8de1efd1c..654bf1891 100644
--- a/src/main/java/emu/grasscutter/data/excels/ItemData.java
+++ b/src/main/java/emu/grasscutter/data/excels/ItemData.java
@@ -25,7 +25,7 @@ import lombok.Getter;
 @Getter
 public class ItemData extends GameResource {
     // Main
-    @Getter(onMethod = @__(@Override))
+    @Getter(onMethod_ = @Override)
     private int id;
     private int stackLimit = 1;
     private int maxUseCount;
diff --git a/src/main/java/emu/grasscutter/data/excels/MonsterData.java b/src/main/java/emu/grasscutter/data/excels/MonsterData.java
index 08ce10988..b77a1b963 100644
--- a/src/main/java/emu/grasscutter/data/excels/MonsterData.java
+++ b/src/main/java/emu/grasscutter/data/excels/MonsterData.java
@@ -19,7 +19,7 @@ import lombok.Getter;
 public class MonsterData extends GameResource {
     static public Set<FightProperty> definedFightProperties = Set.of(FightProperty.FIGHT_PROP_BASE_HP, FightProperty.FIGHT_PROP_BASE_ATTACK, FightProperty.FIGHT_PROP_BASE_DEFENSE, FightProperty.FIGHT_PROP_PHYSICAL_SUB_HURT, FightProperty.FIGHT_PROP_FIRE_SUB_HURT, FightProperty.FIGHT_PROP_ELEC_SUB_HURT, FightProperty.FIGHT_PROP_WATER_SUB_HURT, FightProperty.FIGHT_PROP_GRASS_SUB_HURT, FightProperty.FIGHT_PROP_WIND_SUB_HURT, FightProperty.FIGHT_PROP_ROCK_SUB_HURT, FightProperty.FIGHT_PROP_ICE_SUB_HURT);
 
-    @Getter(onMethod = @__(@Override))
+    @Getter(onMethod_ = @Override)
     private int id;
 
     private String monsterName;
diff --git a/src/main/java/emu/grasscutter/data/excels/MonsterDescribeData.java b/src/main/java/emu/grasscutter/data/excels/MonsterDescribeData.java
index 3c5339844..c667e3a2d 100644
--- a/src/main/java/emu/grasscutter/data/excels/MonsterDescribeData.java
+++ b/src/main/java/emu/grasscutter/data/excels/MonsterDescribeData.java
@@ -8,7 +8,7 @@ import lombok.Getter;
 @ResourceType(name = "MonsterDescribeExcelConfigData.json", loadPriority = LoadPriority.HIGH)
 @Getter
 public class MonsterDescribeData extends GameResource {
-    @Getter(onMethod = @__(@Override))
+    @Getter(onMethod_ = @Override)
     private int id;
     private long nameTextMapHash;
     private int titleID;
diff --git a/src/main/java/emu/grasscutter/data/excels/MusicGameBasicData.java b/src/main/java/emu/grasscutter/data/excels/MusicGameBasicData.java
index 93c38426b..7297e9048 100644
--- a/src/main/java/emu/grasscutter/data/excels/MusicGameBasicData.java
+++ b/src/main/java/emu/grasscutter/data/excels/MusicGameBasicData.java
@@ -10,7 +10,7 @@ import lombok.experimental.FieldDefaults;
 @Getter
 @FieldDefaults(level = AccessLevel.PRIVATE)
 public class MusicGameBasicData extends GameResource {
-    @Getter(onMethod = @__(@Override))
+    @Getter(onMethod_ = @Override)
     int id;
     int musicID;
     int musicLevel;
diff --git a/src/main/java/emu/grasscutter/data/excels/NpcData.java b/src/main/java/emu/grasscutter/data/excels/NpcData.java
index 35bb53a9c..b88d02bf1 100644
--- a/src/main/java/emu/grasscutter/data/excels/NpcData.java
+++ b/src/main/java/emu/grasscutter/data/excels/NpcData.java
@@ -7,7 +7,7 @@ import lombok.Getter;
 @ResourceType(name = "NpcExcelConfigData.json")
 @Getter
 public class NpcData extends GameResource {
-    @Getter(onMethod = @__(@Override))
+    @Getter(onMethod_ = @Override)
     private int id;
 
     private String jsonName;
diff --git a/src/main/java/emu/grasscutter/data/excels/OpenStateData.java b/src/main/java/emu/grasscutter/data/excels/OpenStateData.java
index a415e5180..00eae044e 100644
--- a/src/main/java/emu/grasscutter/data/excels/OpenStateData.java
+++ b/src/main/java/emu/grasscutter/data/excels/OpenStateData.java
@@ -10,7 +10,7 @@ import java.util.List;
 
 @ResourceType(name = "OpenStateConfigData.json", loadPriority = ResourceType.LoadPriority.HIGHEST)
 public class OpenStateData extends GameResource {
-    @Getter(onMethod = @__(@Override))
+    @Getter(onMethod_ = @Override)
     private int id;
     @Getter private boolean defaultState;
     @Getter private boolean allowClientOpen;
diff --git a/src/main/java/emu/grasscutter/data/excels/PersonalLineData.java b/src/main/java/emu/grasscutter/data/excels/PersonalLineData.java
index e8f1f8b62..ff7d7f29d 100644
--- a/src/main/java/emu/grasscutter/data/excels/PersonalLineData.java
+++ b/src/main/java/emu/grasscutter/data/excels/PersonalLineData.java
@@ -14,7 +14,7 @@ import java.util.List;
 @Setter  // TODO: remove setters next API break
 @FieldDefaults(level = AccessLevel.PRIVATE)
 public class PersonalLineData extends GameResource {
-    @Getter(onMethod = @__(@Override))
+    @Getter(onMethod_ = @Override)
     int id;
     int avatarID;
     List<Integer> preQuestId;
diff --git a/src/main/java/emu/grasscutter/data/excels/ReliquaryAffixData.java b/src/main/java/emu/grasscutter/data/excels/ReliquaryAffixData.java
index b0ed383b7..cfce45015 100644
--- a/src/main/java/emu/grasscutter/data/excels/ReliquaryAffixData.java
+++ b/src/main/java/emu/grasscutter/data/excels/ReliquaryAffixData.java
@@ -10,7 +10,7 @@ import lombok.Getter;
 @ResourceType(name = "ReliquaryAffixExcelConfigData.json")
 @Getter
 public class ReliquaryAffixData extends GameResource {
-    @Getter(onMethod = @__(@Override))
+    @Getter(onMethod_ = @Override)
     private int id;
 
     private int depotId;
diff --git a/src/main/java/emu/grasscutter/data/excels/ReliquaryLevelData.java b/src/main/java/emu/grasscutter/data/excels/ReliquaryLevelData.java
index d2b5dfe45..118f35752 100644
--- a/src/main/java/emu/grasscutter/data/excels/ReliquaryLevelData.java
+++ b/src/main/java/emu/grasscutter/data/excels/ReliquaryLevelData.java
@@ -11,7 +11,7 @@ import lombok.Getter;
 
 @ResourceType(name = "ReliquaryLevelExcelConfigData.json")
 public class ReliquaryLevelData extends GameResource {
-    @Getter(onMethod = @__(@Override))
+    @Getter(onMethod_ = @Override)
     private int id;
     private Int2FloatMap propMap;
 
diff --git a/src/main/java/emu/grasscutter/data/excels/ReliquaryMainPropData.java b/src/main/java/emu/grasscutter/data/excels/ReliquaryMainPropData.java
index da9af1bbe..20b4be63e 100644
--- a/src/main/java/emu/grasscutter/data/excels/ReliquaryMainPropData.java
+++ b/src/main/java/emu/grasscutter/data/excels/ReliquaryMainPropData.java
@@ -10,7 +10,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;
diff --git a/src/main/java/emu/grasscutter/data/excels/RewardPreviewData.java b/src/main/java/emu/grasscutter/data/excels/RewardPreviewData.java
index 81271cc43..50d2e0c0a 100644
--- a/src/main/java/emu/grasscutter/data/excels/RewardPreviewData.java
+++ b/src/main/java/emu/grasscutter/data/excels/RewardPreviewData.java
@@ -12,7 +12,7 @@ import emu.grasscutter.data.common.ItemParamStringData;
 
 @ResourceType(name = "RewardPreviewExcelConfigData.json", loadPriority = LoadPriority.HIGH)
 public class RewardPreviewData extends GameResource {
-    @Getter(onMethod = @__(@Override))
+    @Getter(onMethod_ = @Override)
     private int id;
     private ItemParamStringData[] previewItems;
     private ItemParamData[] previewItemsArray;
diff --git a/src/main/java/emu/grasscutter/data/excels/SceneData.java b/src/main/java/emu/grasscutter/data/excels/SceneData.java
index d2797a8a6..d288e7de4 100644
--- a/src/main/java/emu/grasscutter/data/excels/SceneData.java
+++ b/src/main/java/emu/grasscutter/data/excels/SceneData.java
@@ -11,7 +11,7 @@ import lombok.Getter;
 @ResourceType(name = "SceneExcelConfigData.json")
 @Getter
 public class SceneData extends GameResource {
-    @Getter(onMethod = @__(@Override))
+    @Getter(onMethod_ = @Override)
     private int id;
     @SerializedName("type")
     private SceneType sceneType;
diff --git a/src/main/java/emu/grasscutter/game/entity/EntityBaseGadget.java b/src/main/java/emu/grasscutter/game/entity/EntityBaseGadget.java
index b2370449a..b28e99480 100644
--- a/src/main/java/emu/grasscutter/game/entity/EntityBaseGadget.java
+++ b/src/main/java/emu/grasscutter/game/entity/EntityBaseGadget.java
@@ -7,9 +7,9 @@ import emu.grasscutter.utils.Position;
 import lombok.Getter;
 
 public abstract class EntityBaseGadget extends GameEntity {
-    @Getter(onMethod = @__(@Override))
+    @Getter(onMethod_ = @Override)
     protected final Position position;
-    @Getter(onMethod = @__(@Override))
+    @Getter(onMethod_ = @Override)
     protected final Position rotation;
 
     public EntityBaseGadget(Scene scene) {
diff --git a/src/main/java/emu/grasscutter/game/entity/EntityClientGadget.java b/src/main/java/emu/grasscutter/game/entity/EntityClientGadget.java
index ef376bd4f..cd23e8e80 100644
--- a/src/main/java/emu/grasscutter/game/entity/EntityClientGadget.java
+++ b/src/main/java/emu/grasscutter/game/entity/EntityClientGadget.java
@@ -25,7 +25,7 @@ import lombok.Getter;
 public class EntityClientGadget extends EntityBaseGadget {
     @Getter private final Player owner;
 
-    @Getter(onMethod = @__(@Override))
+    @Getter(onMethod_ = @Override)
     private int gadgetId;
 
     @Getter private int campId;
diff --git a/src/main/java/emu/grasscutter/game/entity/EntityGadget.java b/src/main/java/emu/grasscutter/game/entity/EntityGadget.java
index 0689214db..8c421fae9 100644
--- a/src/main/java/emu/grasscutter/game/entity/EntityGadget.java
+++ b/src/main/java/emu/grasscutter/game/entity/EntityGadget.java
@@ -40,13 +40,13 @@ import javax.annotation.Nullable;
 @ToString(callSuper = true)
 public class EntityGadget extends EntityBaseGadget {
     @Getter private final GadgetData gadgetData;
-    @Getter(onMethod = @__(@Override)) @Setter
+    @Getter(onMethod_ = @Override) @Setter
     private int gadgetId;
 
     @Getter @Setter private int state;
     @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;
     @Nullable @Getter
diff --git a/src/main/java/emu/grasscutter/game/entity/EntityMonster.java b/src/main/java/emu/grasscutter/game/entity/EntityMonster.java
index 19727b119..99a5e0902 100644
--- a/src/main/java/emu/grasscutter/game/entity/EntityMonster.java
+++ b/src/main/java/emu/grasscutter/game/entity/EntityMonster.java
@@ -37,12 +37,12 @@ import lombok.Setter;
 
 public class EntityMonster extends GameEntity {
     @Getter private final MonsterData monsterData;
-    @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 Position bornPos;
     @Getter private final int level;
diff --git a/src/main/java/emu/grasscutter/game/entity/EntityNPC.java b/src/main/java/emu/grasscutter/game/entity/EntityNPC.java
index 4a26f251c..d9442cd8f 100644
--- a/src/main/java/emu/grasscutter/game/entity/EntityNPC.java
+++ b/src/main/java/emu/grasscutter/game/entity/EntityNPC.java
@@ -9,9 +9,9 @@ import it.unimi.dsi.fastutil.ints.Int2FloatMap;
 import lombok.Getter;
 
 public class EntityNPC extends GameEntity{
-    @Getter(onMethod = @__(@Override))
+    @Getter(onMethod_ = @Override)
     private final Position position;
-    @Getter(onMethod = @__(@Override))
+    @Getter(onMethod_ = @Override)
     private final Position rotation;
     private final SceneNPC metaNpc;
     @Getter private final int suiteId;
diff --git a/src/main/java/emu/grasscutter/game/entity/EntityVehicle.java b/src/main/java/emu/grasscutter/game/entity/EntityVehicle.java
index 7bb4f0dae..ad2ce9c5d 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 @@ import java.util.List;
 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;
diff --git a/src/main/java/emu/grasscutter/game/entity/platform/EntityPlatform.java b/src/main/java/emu/grasscutter/game/entity/platform/EntityPlatform.java
index cc946d685..fe3fe4630 100644
--- a/src/main/java/emu/grasscutter/game/entity/platform/EntityPlatform.java
+++ b/src/main/java/emu/grasscutter/game/entity/platform/EntityPlatform.java
@@ -20,11 +20,11 @@ import javax.annotation.Nullable;
 public class EntityPlatform extends EntityBaseGadget {
     @Getter
     private final Player owner;
-    @Getter(onMethod = @__(@Override))
+    @Getter(onMethod_ = @Override)
     private final int gadgetId;
     @Getter
     private final EntityClientGadget gadget;
-    @Getter(onMethod = @__(@Override))
+    @Getter(onMethod_ = @Override)
     private final Int2FloatMap fightProperties;
     @Nullable
     @Getter