From e04df0526a889ee5c11aa24577df28ad7dc75c2a Mon Sep 17 00:00:00 2001 From: KingRainbow44 Date: Thu, 31 Aug 2023 23:46:55 -0400 Subject: [PATCH] Run formatter & update protocol --- .../AbilityFireworkBornTypeOuterClass.java | 866 +++++++++--------- ...AbilityMetaSetPoseParameterOuterClass.java | 44 +- ...ityGetFriendGiftWishListReqOuterClass.java | 28 +- .../net/proto/ForgeQueueDataOuterClass.java | 251 +++-- .../net/proto/GetScenePointRspOuterClass.java | 706 +++++++------- .../SealBattleBeginNotifyOuterClass.java | 148 +-- .../SealBattleProgressNotifyOuterClass.java | 147 ++- .../auth/AuthenticationSystem.java | 5 +- .../emu/grasscutter/auth/Authenticator.java | 3 +- .../auth/DefaultAuthentication.java | 9 +- .../auth/DefaultAuthenticators.java | 9 +- .../auth/HandbookAuthenticator.java | 3 +- .../java/emu/grasscutter/command/Command.java | 3 +- .../grasscutter/command/CommandHandler.java | 8 +- .../grasscutter/command/CommandHelpers.java | 8 +- .../command/commands/AccountCommand.java | 5 +- .../command/commands/AchievementCommand.java | 10 +- .../command/commands/AnnounceCommand.java | 12 +- .../command/commands/BanCommand.java | 4 +- .../command/commands/ClearCommand.java | 17 +- .../command/commands/CoopCommand.java | 4 +- .../command/commands/CutsceneCommand.java | 6 +- .../command/commands/DebugCommand.java | 1 + .../command/commands/EnterDungeonCommand.java | 8 +- .../command/commands/EntityCommand.java | 19 +- .../command/commands/GiveCommand.java | 36 +- .../command/commands/GroupCommand.java | 8 +- .../command/commands/HealCommand.java | 11 +- .../command/commands/HelpCommand.java | 12 +- .../command/commands/InfoCommand.java | 6 +- .../command/commands/KickCommand.java | 4 +- .../command/commands/KillAllCommand.java | 11 +- .../commands/KillCharacterCommand.java | 14 +- .../command/commands/LanguageCommand.java | 11 +- .../command/commands/ListCommand.java | 11 +- .../command/commands/PermissionCommand.java | 8 +- .../command/commands/PositionCommand.java | 4 +- .../command/commands/QuestCommand.java | 5 +- .../command/commands/ReloadCommand.java | 8 +- .../command/commands/ResetConstCommand.java | 8 +- .../commands/ResetShopLimitCommand.java | 8 +- .../command/commands/SendMailCommand.java | 12 +- .../command/commands/SendMessageCommand.java | 4 +- .../command/commands/SetConstCommand.java | 8 +- .../commands/SetFetterLevelCommand.java | 8 +- .../command/commands/SetPropCommand.java | 12 +- .../command/commands/SetStatsCommand.java | 8 +- .../command/commands/SoundCommand.java | 10 +- .../command/commands/SpawnCommand.java | 32 +- .../command/commands/StopCommand.java | 8 +- .../command/commands/TalentCommand.java | 4 +- .../command/commands/TeamCommand.java | 12 +- .../command/commands/TeleportAllCommand.java | 8 +- .../command/commands/TeleportCommand.java | 8 +- .../commands/TrialAvatarActivityCommand.java | 11 +- .../command/commands/UnBanCommand.java | 4 +- .../command/commands/UnlockAllCommand.java | 15 +- .../command/commands/WeatherCommand.java | 4 +- .../java/emu/grasscutter/data/GameData.java | 47 +- .../java/emu/grasscutter/data/GameDepot.java | 15 +- .../emu/grasscutter/data/ResourceType.java | 3 +- .../grasscutter/data/binout/AbilityData.java | 4 +- .../data/binout/AbilityMixinData.java | 7 +- .../data/binout/AbilityModifierEntry.java | 4 +- .../grasscutter/data/binout/ConfigGadget.java | 6 +- .../data/binout/ConfigGadgetCombat.java | 3 +- .../binout/ConfigGadgetCombatProperty.java | 3 +- .../data/binout/HomeworldDefaultSaveData.java | 3 +- .../data/binout/MainQuestData.java | 6 +- .../data/binout/OpenConfigEntry.java | 4 +- .../data/binout/SceneNpcBornData.java | 9 +- .../data/binout/SceneNpcBornEntry.java | 6 +- .../data/binout/ScriptSceneData.java | 4 +- .../grasscutter/data/binout/TalentData.java | 1 + .../data/binout/config/ConfigEntityBase.java | 10 +- .../binout/config/ConfigEntityGadget.java | 4 +- .../binout/config/ConfigEntityMonster.java | 3 +- .../binout/config/ConfigGlobalCombat.java | 3 +- .../data/binout/config/ConfigLevelEntity.java | 3 +- .../binout/config/fields/ConfigCombat.java | 3 +- .../binout/config/fields/ConfigCombatDie.java | 3 +- .../config/fields/ConfigCombatProperty.java | 3 +- .../config/fields/ConfigGlobalValue.java | 4 +- .../grasscutter/data/binout/routes/Route.java | 4 +- .../data/binout/routes/RoutePoint.java | 4 +- .../data/binout/routes/SceneRoutes.java | 6 +- .../grasscutter/data/common/DynamicFloat.java | 3 +- .../grasscutter/data/common/PointData.java | 6 +- .../custom/TrialAvatarActivityCustomData.java | 3 +- .../data/custom/TrialAvatarCustomData.java | 3 +- .../grasscutter/data/excels/BargainData.java | 3 +- .../data/excels/BattlePassMissionData.java | 12 +- .../data/excels/BattlePassRewardData.java | 6 +- .../excels/BlossomRefreshExcelConfigData.java | 6 +- .../emu/grasscutter/data/excels/BuffData.java | 3 +- .../grasscutter/data/excels/ChapterData.java | 7 +- .../emu/grasscutter/data/excels/CityData.java | 10 +- .../grasscutter/data/excels/CombineData.java | 4 +- .../grasscutter/data/excels/CompoundData.java | 6 +- .../data/excels/CookBonusData.java | 3 +- .../data/excels/CookRecipeData.java | 6 +- .../data/excels/DropMaterialData.java | 3 +- .../data/excels/DropTableData.java | 6 +- .../excels/EnvAnimalGatherConfigData.java | 4 +- .../data/excels/EquipAffixData.java | 4 +- .../data/excels/FetterCharacterCardData.java | 3 +- .../grasscutter/data/excels/FetterData.java | 4 +- .../grasscutter/data/excels/ForgeData.java | 6 +- .../data/excels/FurnitureMakeConfigData.java | 9 +- .../grasscutter/data/excels/GadgetData.java | 3 +- .../grasscutter/data/excels/GatherData.java | 3 +- .../data/excels/GuideTriggerData.java | 7 +- .../data/excels/HomeWorldBgmData.java | 6 +- .../data/excels/HomeWorldLevelData.java | 9 +- .../data/excels/HomeWorldNPCData.java | 6 +- .../data/excels/InvestigationMonsterData.java | 10 +- .../emu/grasscutter/data/excels/ItemData.java | 18 +- .../data/excels/MonsterAffixData.java | 3 +- .../data/excels/MusicGameBasicData.java | 6 +- .../emu/grasscutter/data/excels/NpcData.java | 3 +- .../data/excels/OpenStateData.java | 7 +- .../data/excels/PersonalLineData.java | 10 +- .../data/excels/PlayerLevelData.java | 3 +- .../data/excels/ProudSkillData.java | 13 +- .../excels/RefreshPolicyExcelConfigData.java | 7 +- .../grasscutter/data/excels/RewardData.java | 4 +- .../data/excels/RewardPreviewData.java | 9 +- .../data/excels/ShopGoodsData.java | 4 +- .../data/excels/StatuePromoteData.java | 6 +- .../data/excels/TalkConfigData.java | 3 +- .../data/excels/TriggerExcelConfigData.java | 3 +- .../excels/achievement/AchievementData.java | 11 +- .../achievement/AchievementGoalData.java | 3 +- .../activity/ActivityCondExcelConfigData.java | 9 +- .../data/excels/activity/ActivityData.java | 11 +- .../excels/activity/ActivityShopData.java | 6 +- .../excels/activity/ActivityWatcherData.java | 9 +- .../data/excels/avatar/AvatarCostumeData.java | 4 +- .../data/excels/avatar/AvatarCurveData.java | 7 +- .../data/excels/avatar/AvatarData.java | 15 +- .../excels/avatar/AvatarFetterLevelData.java | 3 +- .../excels/avatar/AvatarFlycloakData.java | 3 +- .../data/excels/avatar/AvatarLevelData.java | 3 +- .../data/excels/avatar/AvatarPromoteData.java | 7 +- .../avatar/AvatarReplaceCostumeData.java | 6 +- .../data/excels/avatar/AvatarSkillData.java | 3 +- .../excels/avatar/AvatarSkillDepotData.java | 14 +- .../data/excels/avatar/AvatarTalentData.java | 4 +- .../data/excels/codex/CodexAnimalData.java | 3 +- .../data/excels/codex/CodexMaterialData.java | 4 +- .../data/excels/codex/CodexQuestData.java | 4 +- .../data/excels/codex/CodexReliquaryData.java | 7 +- .../data/excels/codex/CodexWeaponData.java | 4 +- .../data/excels/dungeon/DailyDungeonData.java | 9 +- .../dungeon/DungeonChallengeConfigData.java | 6 +- .../data/excels/dungeon/DungeonData.java | 7 +- .../data/excels/dungeon/DungeonEntryData.java | 6 +- .../excels/dungeon/DungeonPassConfigData.java | 7 +- .../data/excels/giving/GivingData.java | 3 +- .../data/excels/giving/GivingGroupData.java | 3 +- .../data/excels/monster/MonsterCurveData.java | 7 +- .../data/excels/monster/MonsterData.java | 11 +- .../excels/monster/MonsterDescribeData.java | 3 +- .../monster/MonsterSpecialNameData.java | 6 +- .../data/excels/quest/QuestData.java | 12 +- .../data/excels/quest/QuestGlobalVarData.java | 3 +- .../excels/reliquary/ReliquaryAffixData.java | 3 +- .../excels/reliquary/ReliquaryLevelData.java | 9 +- .../reliquary/ReliquaryMainPropData.java | 3 +- .../excels/reliquary/ReliquarySetData.java | 3 +- .../data/excels/scene/MapLayerData.java | 3 +- .../data/excels/scene/MapLayerFloorData.java | 9 +- .../data/excels/scene/MapLayerGroupData.java | 6 +- .../data/excels/scene/SceneData.java | 3 +- .../data/excels/scene/SceneTagData.java | 6 +- .../data/excels/tower/TowerFloorData.java | 3 +- .../data/excels/tower/TowerLevelData.java | 3 +- .../data/excels/tower/TowerScheduleData.java | 4 +- .../excels/trial/TrialAvatarActivityData.java | 6 +- .../trial/TrialAvatarActivityDataData.java | 4 +- .../data/excels/trial/TrialAvatarData.java | 6 +- .../excels/trial/TrialAvatarTemplateData.java | 6 +- .../data/excels/trial/TrialReliquaryData.java | 6 +- .../data/excels/weapon/WeaponCurveData.java | 7 +- .../data/excels/weapon/WeaponLevelData.java | 3 +- .../data/excels/weapon/WeaponPromoteData.java | 7 +- .../data/excels/world/WeatherData.java | 3 +- .../data/excels/world/WorldAreaData.java | 3 +- .../data/excels/world/WorldLevelData.java | 3 +- .../data/server/ActivityCondGroup.java | 3 +- .../emu/grasscutter/data/server/Grid.java | 4 +- .../grasscutter/database/DatabaseCounter.java | 3 +- .../grasscutter/database/DatabaseHelper.java | 9 +- .../java/emu/grasscutter/game/Account.java | 7 +- .../emu/grasscutter/game/HandbookActions.java | 1 + .../emu/grasscutter/game/ability/Ability.java | 3 +- .../game/ability/AbilityLocalIdGenerator.java | 3 +- .../ability/AbilityModifierController.java | 3 +- .../game/ability/actions/AbilityAction.java | 4 +- .../actions/ActionAvatarSkillStart.java | 3 +- .../ability/actions/ActionCreateGadget.java | 6 +- .../actions/ActionExecuteGadgetLua.java | 2 +- .../actions/ActionGenerateElemBall.java | 7 +- .../game/ability/actions/ActionHealHP.java | 3 +- .../game/ability/actions/ActionLoseHP.java | 3 +- .../ActionSetRandomOverrideMapValue.java | 3 +- .../game/ability/mixins/AbilityMixin.java | 4 +- .../game/achievement/Achievement.java | 2 +- .../game/achievement/Achievements.java | 7 +- .../game/activity/ActivityConfigItem.java | 7 +- .../game/activity/ActivityHandler.java | 7 +- .../game/activity/ActivityWatcher.java | 4 +- .../game/activity/ActivityWatcherType.java | 6 +- .../game/activity/GameActivity.java | 6 +- .../game/activity/PlayerActivityData.java | 14 +- .../activity/condition/ActivityCondition.java | 4 +- .../ActivityConditionBaseHandler.java | 3 +- .../AllActivityConditionBuilder.java | 6 +- .../BasicActivityConditionExecutor.java | 7 +- .../PlayerActivityDataMappingBuilder.java | 4 +- .../game/activity/condition/all/DayLess.java | 8 +- .../condition/all/DaysGreatEqual.java | 9 +- .../activity/condition/all/FinishWatcher.java | 7 +- .../activity/condition/all/NotFinishTalk.java | 8 +- ...elGreatEqualActivityActivityCondition.java | 8 +- .../activity/condition/all/QuestFinished.java | 10 +- .../condition/all/SalesmanCanDeliver.java | 8 +- .../all/UnknownActivityConditionHandler.java | 6 +- .../musicgame/MusicGameActivityHandler.java | 8 +- .../activity/musicgame/MusicGameBeatmap.java | 16 +- .../musicgame/MusicGamePlayerData.java | 13 +- .../musicgame/MusicGameScoreTrigger.java | 3 +- .../TrialAvatarActivityChallengeTrigger.java | 7 +- .../TrialAvatarActivityHandler.java | 18 +- .../trialavatar/TrialAvatarPlayerData.java | 8 +- .../emu/grasscutter/game/avatar/Avatar.java | 11 +- .../game/avatar/AvatarStorage.java | 19 +- .../game/battlepass/BattlePassManager.java | 5 +- .../game/battlepass/BattlePassMission.java | 3 +- .../game/battlepass/BattlePassReward.java | 3 +- .../game/battlepass/BattlePassSystem.java | 12 +- .../emu/grasscutter/game/chat/ChatSystem.java | 15 +- .../grasscutter/game/city/CityInfoData.java | 3 +- .../game/combine/CombineManger.java | 17 +- .../game/combine/CombineResult.java | 1 + .../emu/grasscutter/game/drop/DropSystem.java | 19 +- .../game/drop/DropSystemLegacy.java | 19 +- .../game/dungeons/DungeonManager.java | 5 +- .../game/dungeons/DungeonTrialTeam.java | 4 +- .../game/dungeons/DungeonValue.java | 4 +- .../dungeons/TowerDungeonSettleListener.java | 3 +- .../dungeons/challenge/DungeonChallenge.java | 2 +- .../dungeons/challenge/WorldChallenge.java | 3 +- .../challenge/factory/ChallengeFactory.java | 4 +- .../KillAndGuardChallengeFactoryHandler.java | 10 +- ...llMonsterCountChallengeFactoryHandler.java | 3 +- ...CountInTimeIncChallengeFactoryHandler.java | 7 +- ...lMonsterInTimeChallengeFactoryHandler.java | 6 +- ...illMonsterTimeChallengeFactoryHandler.java | 6 +- .../SurviveChallengeFactoryHandler.java | 5 +- .../TriggerInTimeChallengeFactoryHandler.java | 8 +- .../challenge/trigger/ChallengeTrigger.java | 3 +- .../dungeons/dungeon_results/TowerResult.java | 3 +- .../game/entity/EntityBaseGadget.java | 7 +- .../game/entity/EntityClientGadget.java | 3 +- .../grasscutter/game/entity/EntityGadget.java | 10 +- .../grasscutter/game/entity/EntityNPC.java | 3 +- .../grasscutter/game/entity/EntityRegion.java | 6 +- .../grasscutter/game/entity/EntityScene.java | 6 +- .../grasscutter/game/entity/EntityTeam.java | 6 +- .../game/entity/EntityVehicle.java | 17 +- .../grasscutter/game/entity/EntityWeapon.java | 3 +- .../grasscutter/game/entity/EntityWorld.java | 7 +- .../grasscutter/game/entity/GameEntity.java | 3 +- .../game/entity/gadget/GadgetAbility.java | 3 +- .../game/entity/gadget/GadgetChest.java | 6 +- .../entity/gadget/GadgetGatherObject.java | 6 +- .../game/entity/gadget/GadgetObject.java | 7 +- .../game/entity/gadget/GadgetWorktop.java | 6 +- .../chest/BossChestInteractHandler.java | 4 +- .../chest/NormalChestInteractHandler.java | 1 + .../entity/gadget/platform/AbilityRoute.java | 3 +- .../entity/gadget/platform/BaseRoute.java | 7 +- .../entity/gadget/platform/ConfigRoute.java | 10 +- .../gadget/platform/PointArrayRoute.java | 6 +- .../EntitySolarIsotomaElevatorPlatform.java | 3 +- .../game/expedition/ExpeditionInfo.java | 3 +- .../expedition/ExpeditionRewardDataList.java | 4 +- .../game/expedition/ExpeditionRewardInfo.java | 3 +- .../game/expedition/ExpeditionSystem.java | 7 +- .../grasscutter/game/friends/FriendsList.java | 7 +- .../grasscutter/game/friends/Friendship.java | 5 +- .../game/friends/PlayerProfile.java | 7 +- .../grasscutter/game/gacha/GachaBanner.java | 4 +- .../grasscutter/game/gacha/GachaRecord.java | 7 +- .../game/gacha/PlayerGachaBannerInfo.java | 3 +- .../game/home/FurnitureMakeSlotItem.java | 7 +- .../emu/grasscutter/game/home/GameHome.java | 4 +- .../grasscutter/game/home/HomeAnimalItem.java | 4 +- .../grasscutter/game/home/HomeBlockItem.java | 10 +- .../game/home/HomeFurnitureItem.java | 7 +- .../grasscutter/game/home/HomeNPCItem.java | 8 +- .../grasscutter/game/home/HomeSceneItem.java | 7 +- .../emu/grasscutter/game/home/HomeWorld.java | 6 +- .../game/home/HomeWorldMPSystem.java | 15 +- .../grasscutter/game/inventory/BagTab.java | 3 +- .../game/inventory/EquipInventoryTab.java | 3 +- .../grasscutter/game/inventory/EquipType.java | 9 +- .../grasscutter/game/inventory/GameItem.java | 15 +- .../grasscutter/game/inventory/Inventory.java | 9 +- .../game/inventory/ItemQuality.java | 9 +- .../grasscutter/game/inventory/ItemType.java | 9 +- .../game/inventory/MaterialInventoryTab.java | 3 +- .../game/inventory/MaterialType.java | 9 +- .../java/emu/grasscutter/game/mail/Mail.java | 17 +- .../grasscutter/game/mail/MailHandler.java | 11 +- .../game/managers/FurnitureManager.java | 7 +- .../game/managers/ResinManager.java | 14 +- .../game/managers/SatiationManager.java | 12 +- .../game/managers/SotSManager.java | 21 +- .../managers/blossom/BlossomActivity.java | 19 +- .../game/managers/blossom/BlossomConfig.java | 4 +- .../game/managers/blossom/BlossomManager.java | 19 +- .../game/managers/blossom/BlossomType.java | 7 +- .../cooking/CookingCompoundManager.java | 9 +- .../game/managers/cooking/CookingManager.java | 14 +- .../deforestation/DeforestationManager.java | 13 +- .../game/managers/energy/EnergyManager.java | 27 +- .../game/managers/forging/ForgingManager.java | 15 +- .../managers/mapmark/MapMarksManager.java | 7 +- .../game/player/InvokeHandler.java | 4 +- .../emu/grasscutter/game/player/Player.java | 28 +- .../game/player/PlayerBuffManager.java | 9 +- .../grasscutter/game/player/PlayerCodex.java | 10 +- .../game/player/PlayerCollectionRecords.java | 4 +- .../game/player/PlayerProgress.java | 3 +- .../game/player/PlayerProgressManager.java | 7 +- .../emu/grasscutter/game/player/TeamInfo.java | 5 +- .../grasscutter/game/player/TeamManager.java | 33 +- .../grasscutter/game/props/ActionReason.java | 7 +- .../grasscutter/game/props/ActivityType.java | 10 +- .../game/props/CampTargetType.java | 7 +- .../grasscutter/game/props/ClimateType.java | 7 +- .../grasscutter/game/props/ElementType.java | 9 +- .../grasscutter/game/props/EnterReason.java | 7 +- .../grasscutter/game/props/EntityIdType.java | 3 +- .../grasscutter/game/props/EntityType.java | 7 +- .../grasscutter/game/props/FetterState.java | 7 +- .../grasscutter/game/props/FightProperty.java | 8 +- .../emu/grasscutter/game/props/GrowCurve.java | 7 +- .../ItemUseAction/ItemUseAddAllEnergy.java | 3 +- .../ItemUseAction/ItemUseAddElemEnergy.java | 3 +- .../props/ItemUseAction/ItemUseAddItem.java | 3 +- .../ItemUseAction/ItemUseGainAvatar.java | 1 + .../ItemUseAction/ItemUseOpenRandomChest.java | 3 +- .../emu/grasscutter/game/props/ItemUseOp.java | 4 +- .../grasscutter/game/props/ItemUseTarget.java | 4 +- .../emu/grasscutter/game/props/LifeState.java | 7 +- .../grasscutter/game/props/MonsterType.java | 7 +- .../game/props/PlayerProperty.java | 3 +- .../grasscutter/game/props/RefreshType.java | 7 +- .../emu/grasscutter/game/props/SceneType.java | 7 +- .../game/props/ServerBuffType.java | 4 +- .../game/props/WatcherTriggerType.java | 7 +- .../grasscutter/game/props/WeaponType.java | 7 +- .../grasscutter/game/quest/GameMainQuest.java | 8 +- .../emu/grasscutter/game/quest/GameQuest.java | 5 +- .../game/quest/ItemGiveRecord.java | 3 +- .../game/quest/QuestEncryptionKey.java | 3 +- .../game/quest/QuestGroupSuite.java | 4 +- .../grasscutter/game/quest/QuestManager.java | 11 +- .../game/quest/QuestValueCond.java | 4 +- .../game/quest/QuestValueContent.java | 4 +- .../game/quest/QuestValueExec.java | 4 +- .../grasscutter/game/quest/RewindData.java | 4 +- .../grasscutter/game/quest/TeleportData.java | 3 +- .../game/quest/conditions/BaseCondition.java | 4 +- .../conditions/ConditionActivityCond.java | 4 +- .../conditions/ConditionActivityEnd.java | 4 +- .../conditions/ConditionActivityOpen.java | 4 +- .../conditions/ConditionCompleteTalk.java | 4 +- .../conditions/ConditionItemNumLessThan.java | 4 +- .../quest/conditions/ConditionLuaNotify.java | 4 +- .../conditions/ConditionPackHaveItem.java | 4 +- .../ConditionPlayerLevelEqualGreater.java | 4 +- .../ConditionQuestGlobalVarEqual.java | 4 +- .../ConditionQuestGlobalVarGreater.java | 4 +- .../ConditionQuestGlobalVarLess.java | 4 +- .../conditions/ConditionQuestVarEqual.java | 4 +- .../conditions/ConditionQuestVarGreater.java | 4 +- .../conditions/ConditionQuestVarLess.java | 4 +- .../quest/conditions/ConditionStateEqual.java | 4 +- .../conditions/ConditionStateNotEqual.java | 4 +- .../game/quest/content/BaseContent.java | 3 +- .../content/ContentAddQuestProgress.java | 7 +- .../content/ContentAnyManualTransport.java | 7 +- .../content/ContentClearGroupMonster.java | 7 +- .../quest/content/ContentCompleteAnyTalk.java | 7 +- .../quest/content/ContentCompleteTalk.java | 4 +- .../quest/content/ContentDestroyGadget.java | 7 +- .../quest/content/ContentEnterDungeon.java | 7 +- .../quest/content/ContentEnterMyWorld.java | 7 +- .../content/ContentEnterMyWorldScene.java | 7 +- .../game/quest/content/ContentEnterRoom.java | 7 +- .../quest/content/ContentEnterVehicle.java | 7 +- .../quest/content/ContentFailDungeon.java | 7 +- .../quest/content/ContentFinishDungeon.java | 7 +- .../game/quest/content/ContentFinishPlot.java | 4 +- .../quest/content/ContentGameTimeTick.java | 7 +- .../quest/content/ContentInteractGadget.java | 7 +- .../quest/content/ContentItemLessThan.java | 7 +- .../quest/content/ContentKillMonster.java | 7 +- .../game/quest/content/ContentLeaveScene.java | 7 +- .../game/quest/content/ContentLuaNotify.java | 7 +- .../game/quest/content/ContentMonsterDie.java | 7 +- .../quest/content/ContentNotFinishPlot.java | 4 +- .../game/quest/content/ContentObtainItem.java | 7 +- .../quest/content/ContentPlayerLevelUp.java | 7 +- .../quest/content/ContentQuestStateEqual.java | 7 +- .../content/ContentQuestStateNotEqual.java | 7 +- .../quest/content/ContentQuestVarEqual.java | 7 +- .../quest/content/ContentQuestVarGreater.java | 7 +- .../quest/content/ContentQuestVarLess.java | 7 +- .../game/quest/content/ContentSkill.java | 7 +- .../content/ContentTimeVarMoreOrEqual.java | 3 +- .../quest/content/ContentTimeVarPassDay.java | 3 +- .../quest/content/ContentTriggerFire.java | 7 +- .../game/quest/content/ContentUnlockArea.java | 7 +- .../content/ContentUnlockTransPoint.java | 7 +- .../game/quest/content/ContentUseItem.java | 7 +- .../quest/content/ContentWorktopSelect.java | 7 +- .../game/quest/enums/LogicType.java | 6 +- .../game/quest/enums/QuestCond.java | 7 +- .../game/quest/enums/QuestContent.java | 7 +- .../game/quest/enums/QuestExec.java | 7 +- .../quest/exec/ExecAddCurAvatarEnergy.java | 3 +- .../game/quest/exec/ExecAddQuestProgress.java | 4 +- .../quest/exec/ExecChangeAvatarElemet.java | 3 +- .../game/quest/exec/ExecClearTimeVar.java | 3 +- .../quest/exec/ExecDecQuestGlobalVar.java | 3 +- .../game/quest/exec/ExecDecQuestVar.java | 3 +- .../game/quest/exec/ExecDelPackItem.java | 3 +- .../game/quest/exec/ExecDelPackItemBatch.java | 3 +- .../game/quest/exec/ExecGrantTrialAvatar.java | 3 +- .../quest/exec/ExecIncQuestGlobalVar.java | 3 +- .../game/quest/exec/ExecIncQuestVar.java | 3 +- .../game/quest/exec/ExecInitTimeVar.java | 3 +- .../game/quest/exec/ExecNotifyGroupLua.java | 6 +- .../game/quest/exec/ExecRandomQuestVar.java | 3 +- .../quest/exec/ExecRefreshGroupMonster.java | 3 +- .../quest/exec/ExecRefreshGroupSuite.java | 3 +- .../quest/exec/ExecRegisterDynamicGroup.java | 4 +- .../quest/exec/ExecRemoveTrialAvatar.java | 3 +- .../quest/exec/ExecRollbackParentQuest.java | 3 +- .../game/quest/exec/ExecRollbackQuest.java | 3 +- .../game/quest/exec/ExecSetFlyable.java | 3 +- .../quest/exec/ExecSetGameTimeLocked.java | 4 +- .../game/quest/exec/ExecSetOpenState.java | 4 +- .../quest/exec/ExecSetQuestGlobalVar.java | 3 +- .../game/quest/exec/ExecSetQuestVar.java | 3 +- .../game/quest/exec/ExecUnlockArea.java | 3 +- .../game/quest/exec/ExecUnlockPoint.java | 3 +- .../exec/ExecUnregisterDynamicGroup.java | 3 +- .../emu/grasscutter/game/shop/ShopInfo.java | 7 +- .../emu/grasscutter/game/shop/ShopSystem.java | 18 +- .../emu/grasscutter/game/shop/ShopTable.java | 3 +- .../game/systems/AnnouncementSystem.java | 13 +- .../game/systems/InventorySystem.java | 3 +- .../game/systems/MultiplayerSystem.java | 7 +- .../emu/grasscutter/game/talk/TalkExec.java | 10 +- .../grasscutter/game/talk/TalkManager.java | 6 +- .../grasscutter/game/talk/TalkValueExec.java | 3 +- .../game/talk/exec/ExecDecQuestGlobalVar.java | 4 +- .../game/talk/exec/ExecDecQuestVar.java | 4 +- .../game/talk/exec/ExecIncQuestGlobalVar.java | 4 +- .../game/talk/exec/ExecIncQuestVar.java | 4 +- .../game/talk/exec/ExecSetGameTime.java | 4 +- .../game/talk/exec/ExecSetQuestGlobalVar.java | 4 +- .../game/talk/exec/ExecSetQuestVar.java | 4 +- .../talk/exec/ExecTransSceneDummyPoint.java | 4 +- .../emu/grasscutter/game/tower/TowerData.java | 4 +- .../game/tower/TowerLevelRecord.java | 4 +- .../grasscutter/game/tower/TowerManager.java | 11 +- .../grasscutter/game/tower/TowerSystem.java | 10 +- .../grasscutter/game/world/ChestReward.java | 6 +- .../grasscutter/game/world/GridPosition.java | 8 +- .../game/world/GroupReplacementData.java | 3 +- .../emu/grasscutter/game/world/Location.java | 6 +- .../emu/grasscutter/game/world/Position.java | 6 +- .../emu/grasscutter/game/world/Scene.java | 28 +- .../game/world/SceneGroupInstance.java | 17 +- .../game/world/SpawnDataEntry.java | 7 +- .../emu/grasscutter/game/world/World.java | 23 +- .../game/world/WorldDataSystem.java | 3 +- .../game/world/data/TeleportProperties.java | 3 +- .../grasscutter/net/packet/BasePacket.java | 4 +- .../emu/grasscutter/net/packet/Opcodes.java | 3 +- .../net/packet/PacketOpcodesUtils.java | 13 +- .../grasscutter/net/packet/PacketWriter.java | 3 +- .../java/emu/grasscutter/plugin/Plugin.java | 5 +- .../emu/grasscutter/plugin/PluginManager.java | 2 +- .../grasscutter/plugin/api/PlayerHook.java | 7 +- .../grasscutter/plugin/api/ServerHelper.java | 12 +- .../EntityControllerScriptManager.java | 7 +- .../scripts/SceneIndexManager.java | 11 +- .../scripts/SceneScriptManager.java | 15 +- .../grasscutter/scripts/SceneTimeAxis.java | 3 +- .../emu/grasscutter/scripts/ScriptLoader.java | 4 +- .../emu/grasscutter/scripts/ScriptUtils.java | 4 +- .../emu/grasscutter/scripts/data/Explore.java | 3 +- .../grasscutter/scripts/data/SceneBlock.java | 5 +- .../scripts/data/SceneBossChest.java | 3 +- .../scripts/data/SceneBusiness.java | 3 +- .../grasscutter/scripts/data/SceneConfig.java | 3 +- .../grasscutter/scripts/data/SceneGadget.java | 3 +- .../scripts/data/SceneGarbage.java | 4 +- .../scripts/data/SceneInitConfig.java | 3 +- .../grasscutter/scripts/data/SceneMeta.java | 5 +- .../scripts/data/SceneMonster.java | 4 +- .../grasscutter/scripts/data/SceneNPC.java | 3 +- .../grasscutter/scripts/data/SceneObject.java | 3 +- .../grasscutter/scripts/data/SceneRegion.java | 4 +- .../scripts/data/SceneReplaceable.java | 3 +- .../grasscutter/scripts/data/SceneSuite.java | 7 +- .../grasscutter/scripts/data/SceneVar.java | 3 +- .../data/controller/EntityController.java | 5 +- .../scripts/serializer/LuaSerializer.java | 19 +- .../serializer/LuaTableJacksonSerializer.java | 13 +- .../scripts/serializer/Serializer.java | 3 +- .../service/ScriptMonsterSpawnService.java | 4 +- .../service/ScriptMonsterTideService.java | 5 +- .../server/dispatch/DispatchClient.java | 27 +- .../server/dispatch/DispatchServer.java | 21 +- .../server/dispatch/IDispatcher.java | 24 +- .../event/dispatch/ServerMessageEvent.java | 9 +- .../event/entity/EntityCreationEvent.java | 5 +- .../event/entity/EntityDamageEvent.java | 4 +- .../server/event/entity/EntityDeathEvent.java | 3 +- .../event/game/ExecuteCommandEvent.java | 3 +- .../game/ReceiveCommandFeedbackEvent.java | 1 + .../server/event/game/ServerTickEvent.java | 1 + .../event/internal/ServerStartEvent.java | 1 + .../event/internal/ServerStopEvent.java | 1 + .../server/event/player/PlayerChatEvent.java | 4 +- .../player/PlayerFinishBattlePassMission.java | 2 +- .../player/PlayerFinishDungeonEvent.java | 3 +- .../event/player/PlayerNpcTalkEvent.java | 3 +- .../event/player/PlayerUseFoodEvent.java | 3 +- .../server/event/player/PlayerWishEvent.java | 3 +- .../grasscutter/server/game/GameServer.java | 51 +- .../grasscutter/server/game/GameSession.java | 9 +- .../server/game/GameSessionManager.java | 5 +- .../grasscutter/server/http/HttpServer.java | 7 +- .../http/dispatch/AuthenticationHandler.java | 4 +- .../server/http/dispatch/RegionHandler.java | 7 +- .../GachaMappingRequestHandler.java | 8 +- .../http/documentation/HandbookHandler.java | 5 +- .../documentation/RootRequestHandler.java | 8 +- .../http/handlers/AnnouncementsHandler.java | 14 +- .../server/http/handlers/GachaHandler.java | 7 +- .../server/http/handlers/GenericHandler.java | 10 +- .../server/http/objects/HttpJsonResponse.java | 13 +- .../objects/WebStaticVersionResponse.java | 12 +- .../server/packet/recv/Handler.java | 4 +- .../recv/HandlerAbilityInvocationsNotify.java | 4 +- .../HandlerActivityTakeWatcherRewardReq.java | 5 +- .../recv/HandlerAddBackupAvatarTeamReq.java | 4 +- .../HandlerAddQuestContentProgressReq.java | 4 +- .../packet/recv/HandlerAskAddFriendReq.java | 4 +- .../recv/HandlerAvatarChangeCostumeReq.java | 4 +- .../HandlerAvatarChangeElementTypeReq.java | 4 +- .../recv/HandlerAvatarDieAnimationEndReq.java | 4 +- .../HandlerAvatarExpeditionAllDataReq.java | 4 +- .../HandlerAvatarExpeditionCallBackReq.java | 4 +- .../HandlerAvatarExpeditionGetRewardReq.java | 14 +- .../recv/HandlerAvatarExpeditionStartReq.java | 4 +- .../HandlerAvatarFetterLevelRewardReq.java | 9 +- .../packet/recv/HandlerAvatarPromoteReq.java | 4 +- .../recv/HandlerAvatarSkillUpgradeReq.java | 4 +- .../packet/recv/HandlerAvatarUpgradeReq.java | 4 +- .../recv/HandlerAvatarWearFlycloakReq.java | 4 +- .../packet/recv/HandlerBackMyWorldReq.java | 4 +- .../recv/HandlerBuyBattlePassLevelReq.java | 4 +- .../packet/recv/HandlerBuyGoodsReq.java | 13 +- .../packet/recv/HandlerBuyResinReq.java | 4 +- ...andlerCalcWeaponUpgradeReturnItemsReq.java | 5 +- .../packet/recv/HandlerChangeAvatarReq.java | 4 +- .../packet/recv/HandlerChangeGameTimeReq.java | 4 +- .../recv/HandlerChangeMailStarNotify.java | 8 +- .../recv/HandlerChangeMpTeamAvatarReq.java | 4 +- .../packet/recv/HandlerChangeTeamNameReq.java | 4 +- .../packet/recv/HandlerCheckUgcStateReq.java | 4 +- .../packet/recv/HandlerCheckUgcUpdateReq.java | 4 +- .../recv/HandlerChooseCurAvatarTeamReq.java | 4 +- ...lientAbilitiesInitFinishCombineNotify.java | 4 +- .../HandlerClientAbilityChangeNotify.java | 4 +- .../HandlerClientAbilityInitFinishNotify.java | 4 +- .../recv/HandlerClientLockGameTimeNotify.java | 4 +- .../recv/HandlerCombatInvocationsNotify.java | 4 +- .../server/packet/recv/HandlerCombineReq.java | 8 +- .../packet/recv/HandlerCreateVehicleReq.java | 4 +- .../packet/recv/HandlerDealAddFriendReq.java | 4 +- .../recv/HandlerDelBackupAvatarTeamReq.java | 4 +- .../server/packet/recv/HandlerDelMailReq.java | 4 +- .../packet/recv/HandlerDeleteFriendReq.java | 4 +- .../recv/HandlerDestroyMaterialReq.java | 4 +- .../server/packet/recv/HandlerDoGachaReq.java | 4 +- .../recv/HandlerDungeonEntryInfoReq.java | 4 +- .../recv/HandlerDungeonPlayerDieReq.java | 4 +- ...dlerDungeonSlipRevivePointActivateReq.java | 4 +- .../HandlerDungeonWayPointActivateReq.java | 4 +- .../packet/recv/HandlerEnterSceneDoneReq.java | 4 +- .../recv/HandlerEnterSceneReadyReq.java | 7 +- .../HandlerEnterTransPointRegionNotify.java | 4 +- ...lerEnterTrialAvatarActivityDungeonReq.java | 4 +- .../packet/recv/HandlerEnterWorldAreaReq.java | 4 +- .../recv/HandlerEntityAiSyncNotify.java | 4 +- ...andlerEvtAiSyncCombatThreatInfoNotify.java | 4 +- .../recv/HandlerEvtAiSyncSkillCdNotify.java | 4 +- .../HandlerEvtAvatarEnterFocusNotify.java | 4 +- .../recv/HandlerEvtAvatarExitFocusNotify.java | 4 +- .../recv/HandlerEvtAvatarLockChairReq.java | 4 +- .../recv/HandlerEvtAvatarSitDownNotify.java | 4 +- .../recv/HandlerEvtAvatarStandUpNotify.java | 4 +- .../HandlerEvtAvatarUpdateFocusNotify.java | 4 +- .../recv/HandlerEvtBulletDeactiveNotify.java | 4 +- .../recv/HandlerEvtBulletHitNotify.java | 4 +- .../recv/HandlerEvtBulletMoveNotify.java | 4 +- .../recv/HandlerEvtCreateGadgetNotify.java | 7 +- .../recv/HandlerEvtDestroyGadgetNotify.java | 4 +- .../recv/HandlerEvtDoSkillSuccNotify.java | 4 +- ...andlerEvtEntityRenderersChangedNotify.java | 4 +- .../recv/HandlerExecuteGadgetLuaReq.java | 7 +- .../HandlerExitTransPointRegionNotify.java | 4 +- .../recv/HandlerForgeGetQueueDataReq.java | 4 +- .../recv/HandlerForgeQueueManipulateReq.java | 4 +- .../packet/recv/HandlerForgeStartReq.java | 4 +- .../packet/recv/HandlerFurnitureMakeReq.java | 4 +- .../recv/HandlerFurnitureMakeStartReq.java | 4 +- .../packet/recv/HandlerGachaWishReq.java | 7 +- .../packet/recv/HandlerGadgetInteractReq.java | 4 +- .../recv/HandlerGetActivityInfoReq.java | 5 +- .../HandlerGetActivityShopSheetInfoReq.java | 4 +- .../recv/HandlerGetAllH5ActivityInfoReq.java | 4 +- .../packet/recv/HandlerGetAllMailNotify.java | 4 +- .../recv/HandlerGetAllUnlockNameCardReq.java | 4 +- .../packet/recv/HandlerGetAuthkeyReq.java | 4 +- .../HandlerGetChatEmojiCollectionReq.java | 4 +- .../recv/HandlerGetCompoundDataReq.java | 4 +- .../HandlerGetDailyDungeonEntryInfoReq.java | 4 +- .../HandlerGetFriendShowAvatarInfoReq.java | 4 +- .../HandlerGetFriendShowNameCardInfoReq.java | 4 +- ...rGetFurnitureCurModuleArrangeCountReq.java | 4 +- .../packet/recv/HandlerGetGachaInfoReq.java | 4 +- .../recv/HandlerGetHomeLevelUpRewardReq.java | 8 +- .../HandlerGetInvestigationMonsterReq.java | 4 +- .../packet/recv/HandlerGetMailItemReq.java | 4 +- .../recv/HandlerGetOnlinePlayerListReq.java | 4 +- .../HandlerGetPlayerAskFriendListReq.java | 4 +- .../recv/HandlerGetPlayerBlacklistReq.java | 5 +- .../recv/HandlerGetPlayerFriendListReq.java | 4 +- .../recv/HandlerGetPlayerHomeCompInfoReq.java | 4 +- .../recv/HandlerGetPlayerSocialDetailReq.java | 4 +- .../packet/recv/HandlerGetPlayerTokenReq.java | 7 +- .../recv/HandlerGetRegionSearchReq.java | 4 +- .../packet/recv/HandlerGetSceneAreaReq.java | 4 +- .../packet/recv/HandlerGetScenePointReq.java | 4 +- .../server/packet/recv/HandlerGetShopReq.java | 4 +- .../recv/HandlerGetShopmallDataReq.java | 4 +- .../recv/HandlerGetUgcBriefInfoReq.java | 7 +- .../server/packet/recv/HandlerGetUgcReq.java | 7 +- .../packet/recv/HandlerGetWidgetSlotReq.java | 4 +- .../packet/recv/HandlerGetWorldMpInfoReq.java | 4 +- .../packet/recv/HandlerHitTreeNotify.java | 4 +- .../packet/recv/HandlerHomeChangeBgmReq.java | 7 +- .../recv/HandlerHomeChangeEditModeReq.java | 12 +- .../recv/HandlerHomeChangeModuleReq.java | 11 +- .../recv/HandlerHomeChooseModuleReq.java | 8 +- .../HandlerHomeEnterEditModeFinishReq.java | 4 +- .../HandlerHomeGetArrangementInfoReq.java | 4 +- .../recv/HandlerHomeGetBasicInfoReq.java | 4 +- .../recv/HandlerHomeGetOnlineStatusReq.java | 4 +- .../packet/recv/HandlerHomeKickPlayerReq.java | 7 +- .../packet/recv/HandlerHomeModuleSeenReq.java | 7 +- .../HandlerHomeResourceTakeFetterExpReq.java | 4 +- .../HandlerHomeResourceTakeHomeCoinReq.java | 4 +- ...HandlerHomeSaveArrangementNoChangeReq.java | 4 +- .../recv/HandlerHomeSceneInitFinishReq.java | 8 +- .../packet/recv/HandlerHomeSceneJumpReq.java | 4 +- .../packet/recv/HandlerHomeTransferReq.java | 5 +- .../HandlerHomeUpdateArrangementInfoReq.java | 7 +- .../packet/recv/HandlerItemGivingReq.java | 1 + .../recv/HandlerLaunchFireworksReq.java | 7 +- .../packet/recv/HandlerLevelupCityReq.java | 4 +- .../server/packet/recv/HandlerMarkMapReq.java | 4 +- ...dlerMassiveEntityElementOpBatchNotify.java | 4 +- .../recv/HandlerMcoinExchangeHcoinReq.java | 7 +- .../HandlerMonsterAIConfigHashNotify.java | 4 +- .../recv/HandlerMonsterAlertChangeNotify.java | 4 +- .../recv/HandlerMusicGameSettleReq.java | 13 +- .../packet/recv/HandlerMusicGameStartReq.java | 4 +- .../server/packet/recv/HandlerNpcTalkReq.java | 4 +- .../recv/HandlerObstacleModifyNotify.java | 4 +- .../recv/HandlerPathfindingEnterSceneReq.java | 4 +- .../recv/HandlerPersonalLineAllDataReq.java | 4 +- .../recv/HandlerPersonalSceneJumpReq.java | 4 +- .../server/packet/recv/HandlerPingReq.java | 4 +- .../HandlerPlayerApplyEnterHomeResultReq.java | 4 +- .../recv/HandlerPlayerApplyEnterMpReq.java | 4 +- .../HandlerPlayerApplyEnterMpResultReq.java | 4 +- .../packet/recv/HandlerPlayerChatReq.java | 4 +- .../HandlerPlayerCompoundMaterialReq.java | 4 +- .../packet/recv/HandlerPlayerCookArgsReq.java | 4 +- .../packet/recv/HandlerPlayerCookReq.java | 4 +- .../recv/HandlerPlayerEnterDungeonReq.java | 4 +- .../recv/HandlerPlayerForceExitReq.java | 5 +- .../HandlerPlayerGetForceQuitBanInfoReq.java | 4 +- .../packet/recv/HandlerPlayerLoginReq.java | 5 +- .../recv/HandlerPlayerQuitDungeonReq.java | 5 +- .../packet/recv/HandlerPlayerSetPauseReq.java | 4 +- .../packet/recv/HandlerPostEnterSceneReq.java | 4 +- .../packet/recv/HandlerPrivateChatReq.java | 4 +- .../recv/HandlerPullPrivateChatReq.java | 4 +- .../packet/recv/HandlerPullRecentChatReq.java | 4 +- ...andlerQueryCodexMonsterBeKilledNumReq.java | 4 +- .../packet/recv/HandlerQueryPathReq.java | 4 +- .../recv/HandlerQuestDestroyEntityReq.java | 4 +- .../recv/HandlerQuestDestroyNpcReq.java | 4 +- .../packet/recv/HandlerQuestTransmitReq.java | 5 +- .../recv/HandlerQuestUpdateQuestVarReq.java | 4 +- .../packet/recv/HandlerQuickUseWidgetReq.java | 10 +- .../packet/recv/HandlerReadMailNotify.java | 8 +- ...rReceivedTrialAvatarActivityRewardReq.java | 4 +- .../recv/HandlerReliquaryDecomposeReq.java | 4 +- .../recv/HandlerReliquaryUpgradeReq.java | 4 +- .../packet/recv/HandlerSceneAudioNotify.java | 5 +- .../recv/HandlerSceneEntityDrownReq.java | 8 +- .../recv/HandlerSceneInitFinishReq.java | 5 +- .../recv/HandlerSceneKickPlayerReq.java | 4 +- .../recv/HandlerSceneTransToPointReq.java | 4 +- .../recv/HandlerSelectWorktopOptionReq.java | 7 +- .../recv/HandlerSetBattlePassViewedReq.java | 4 +- .../HandlerSetChatEmojiCollectionReq.java | 4 +- .../HandlerSetEntityClientDataNotify.java | 5 +- .../recv/HandlerSetEquipLockStateReq.java | 4 +- .../HandlerSetFriendEnterHomeOptionReq.java | 7 +- .../packet/recv/HandlerSetNameCardReq.java | 4 +- .../packet/recv/HandlerSetOpenStateReq.java | 4 +- .../recv/HandlerSetPlayerBirthdayReq.java | 7 +- .../recv/HandlerSetPlayerBornDataReq.java | 14 +- .../recv/HandlerSetPlayerHeadImageReq.java | 4 +- .../packet/recv/HandlerSetPlayerNameReq.java | 4 +- .../packet/recv/HandlerSetPlayerPropReq.java | 4 +- .../recv/HandlerSetPlayerSignatureReq.java | 4 +- .../recv/HandlerSetUpAvatarTeamReq.java | 4 +- .../recv/HandlerSetUpLunchBoxWidgetReq.java | 4 +- .../packet/recv/HandlerSetWidgetSlotReq.java | 10 +- .../recv/HandlerSkipPlayerGameTimeReq.java | 7 +- .../HandlerTakeAchievementGoalRewardReq.java | 4 +- .../recv/HandlerTakeAchievementRewardReq.java | 4 +- .../HandlerTakeBattlePassMissionPointReq.java | 4 +- .../recv/HandlerTakeBattlePassRewardReq.java | 4 +- .../recv/HandlerTakeCompoundOutputReq.java | 4 +- .../recv/HandlerTakeFurnitureMakeReq.java | 4 +- .../recv/HandlerTakePlayerLevelRewardReq.java | 8 +- .../packet/recv/HandlerTakeoffEquipReq.java | 4 +- .../packet/recv/HandlerTowerAllDataReq.java | 4 +- .../recv/HandlerTowerEnterLevelReq.java | 4 +- .../recv/HandlerTowerTeamSelectReq.java | 4 +- .../packet/recv/HandlerTryEnterHomeReq.java | 8 +- .../packet/recv/HandlerUnionCmdNotify.java | 9 +- .../recv/HandlerUnlockAvatarTalentReq.java | 4 +- .../recv/HandlerUnlockPersonalLineReq.java | 4 +- .../recv/HandlerUnlockTransPointReq.java | 4 +- ...ateAbilityCreatedMovingPlatformNotify.java | 4 +- .../HandlerUpdatePlayerShowAvatarListReq.java | 4 +- ...andlerUpdatePlayerShowNameCardListReq.java | 4 +- .../server/packet/recv/HandlerUseItemReq.java | 4 +- .../recv/HandlerVehicleInteractReq.java | 4 +- .../packet/recv/HandlerWeaponAwakenReq.java | 4 +- .../packet/recv/HandlerWeaponPromoteReq.java | 4 +- .../packet/recv/HandlerWeaponUpgradeReq.java | 4 +- .../packet/recv/HandlerWearEquipReq.java | 4 +- .../packet/recv/HandlerWidgetDoBagReq.java | 8 +- .../recv/HandlerWorldPlayerReviveReq.java | 4 +- .../send/PackageTakeCompoundOutputRsp.java | 3 +- .../server/packet/send/Packet.java | 3 +- .../send/PacketAbilityChangeNotify.java | 3 +- .../send/PacketAbilityInvocationsNotify.java | 4 +- .../send/PacketAchievementAllDataNotify.java | 3 +- .../send/PacketAchievementUpdateNotify.java | 4 +- .../packet/send/PacketActivityInfoNotify.java | 6 +- .../PacketActivityScheduleInfoNotify.java | 7 +- .../PacketActivityTakeWatcherRewardRsp.java | 3 +- .../PacketActivityUpdateWatcherNotify.java | 3 +- .../send/PacketAddBackupAvatarTeamRsp.java | 3 +- .../PacketAddNoGachaAvatarCardNotify.java | 3 +- .../PacketAddQuestContentProgressRsp.java | 3 +- .../send/PacketAllWidgetDataNotify.java | 8 +- .../packet/send/PacketAskAddFriendNotify.java | 3 +- .../packet/send/PacketAskAddFriendRsp.java | 3 +- .../packet/send/PacketAvatarAddNotify.java | 3 +- .../send/PacketAvatarChangeCostumeNotify.java | 3 +- .../send/PacketAvatarChangeCostumeRsp.java | 3 +- .../PacketAvatarChangeElementTypeRsp.java | 3 +- .../packet/send/PacketAvatarDataNotify.java | 3 +- .../packet/send/PacketAvatarDelNotify.java | 4 +- .../send/PacketAvatarDieAnimationEndRsp.java | 3 +- .../send/PacketAvatarEquipChangeNotify.java | 6 +- .../PacketAvatarExpeditionAllDataRsp.java | 7 +- .../PacketAvatarExpeditionCallBackRsp.java | 4 +- .../PacketAvatarExpeditionDataNotify.java | 4 +- .../PacketAvatarExpeditionGetRewardRsp.java | 7 +- .../send/PacketAvatarExpeditionStartRsp.java | 4 +- .../send/PacketAvatarFetterDataNotify.java | 3 +- .../PacketAvatarFetterLevelRewardRsp.java | 3 +- .../send/PacketAvatarFightPropNotify.java | 3 +- .../PacketAvatarFightPropUpdateNotify.java | 4 +- .../PacketAvatarFlycloakChangeNotify.java | 3 +- .../send/PacketAvatarGainCostumeNotify.java | 3 +- .../send/PacketAvatarGainFlycloakNotify.java | 3 +- .../PacketAvatarLifeStateChangeNotify.java | 6 +- .../packet/send/PacketAvatarPromoteRsp.java | 3 +- .../packet/send/PacketAvatarPropNotify.java | 4 +- .../send/PacketAvatarSatiationDataNotify.java | 3 +- .../send/PacketAvatarSkillChangeNotify.java | 3 +- .../PacketAvatarSkillDepotChangeNotify.java | 3 +- .../send/PacketAvatarSkillInfoNotify.java | 3 +- ...PacketAvatarSkillMaxChargeCountNotify.java | 3 +- .../send/PacketAvatarSkillUpgradeRsp.java | 3 +- .../send/PacketAvatarTeamAllDataNotify.java | 3 +- .../send/PacketAvatarTeamUpdateNotify.java | 3 +- .../send/PacketAvatarUnlockTalentNotify.java | 3 +- .../packet/send/PacketAvatarUpgradeRsp.java | 4 +- .../send/PacketAvatarWearFlycloakRsp.java | 3 +- .../packet/send/PacketBackMyWorldRsp.java | 3 +- .../send/PacketBattlePassAllDataNotify.java | 3 +- ...cketBattlePassCurScheduleUpdateNotify.java | 3 +- .../PacketBattlePassMissionUpdateNotify.java | 4 +- .../PacketBeginCameraSceneLookNotify.java | 10 +- .../send/PacketBlossomBriefInfoNotify.java | 6 +- .../send/PacketBuyBattlePassLevelRsp.java | 3 +- .../server/packet/send/PacketBuyGoodsRsp.java | 6 +- .../server/packet/send/PacketBuyResinRsp.java | 3 +- ...PacketCalcWeaponUpgradeReturnItemsRsp.java | 4 +- .../packet/send/PacketCanUseSkillNotify.java | 3 +- .../send/PacketCardProductRewardNotify.java | 3 +- .../send/PacketChallengeDataNotify.java | 3 +- .../packet/send/PacketChangeAvatarRsp.java | 3 +- .../packet/send/PacketChangeGameTimeRsp.java | 3 +- .../send/PacketChangeMpTeamAvatarRsp.java | 6 +- .../packet/send/PacketChangeTeamNameRsp.java | 3 +- .../packet/send/PacketChapterStateNotify.java | 6 +- .../packet/send/PacketCheckUgcStateRsp.java | 3 +- .../packet/send/PacketCheckUgcUpdateRsp.java | 3 +- .../send/PacketChooseCurAvatarTeamRsp.java | 3 +- ...lientAbilitiesInitFinishCombineNotify.java | 4 +- .../PacketClientAbilityInitFinishNotify.java | 4 +- .../send/PacketCloseCommonTipsNotify.java | 3 +- .../send/PacketCodexDataFullNotify.java | 4 +- .../send/PacketCodexDataUpdateNotify.java | 3 +- .../send/PacketCombatInvocationsNotify.java | 4 +- .../packet/send/PacketCombineDataNotify.java | 3 +- .../send/PacketCombineFormulaDataNotify.java | 3 +- .../server/packet/send/PacketCombineRsp.java | 8 +- .../packet/send/PacketCompoundDataNotify.java | 7 +- .../packet/send/PacketCookDataNotify.java | 4 +- .../send/PacketCookRecipeDataNotify.java | 3 +- .../packet/send/PacketCreateVehicleRsp.java | 7 +- .../send/PacketCutsceneBeginNotify.java | 3 +- .../packet/send/PacketDealAddFriendRsp.java | 3 +- .../send/PacketDelBackupAvatarTeamRsp.java | 3 +- .../server/packet/send/PacketDelMailRsp.java | 4 +- .../packet/send/PacketDelQuestNotify.java | 3 +- .../send/PacketDelTeamEntityNotify.java | 4 +- .../packet/send/PacketDeleteFriendNotify.java | 3 +- .../packet/send/PacketDeleteFriendRsp.java | 3 +- .../packet/send/PacketDestroyMaterialRsp.java | 3 +- .../server/packet/send/PacketDoGachaRsp.java | 7 +- .../packet/send/PacketDropHintNotify.java | 3 +- .../PacketDungeonChallengeBeginNotify.java | 3 +- .../PacketDungeonChallengeFinishNotify.java | 3 +- .../send/PacketDungeonEntryInfoRsp.java | 7 +- .../send/PacketDungeonPlayerDieNotify.java | 3 +- .../send/PacketDungeonPlayerDieRsp.java | 3 +- .../send/PacketDungeonSettleNotify.java | 3 +- .../send/PacketDungeonShowReminderNotify.java | 3 +- ...cketDungeonSlipRevivePointActivateRsp.java | 3 +- .../PacketDungeonWayPointActivateRsp.java | 6 +- .../send/PacketDungeonWayPointNotify.java | 4 +- .../send/PacketEndCameraSceneLookNotify.java | 3 +- .../packet/send/PacketEnterSceneDoneRsp.java | 3 +- .../send/PacketEnterScenePeerNotify.java | 3 +- .../packet/send/PacketEnterSceneReadyRsp.java | 3 +- ...ketEnterTrialAvatarActivityDungeonRsp.java | 3 +- .../packet/send/PacketEnterWorldAreaRsp.java | 3 +- .../packet/send/PacketEntityAiSyncNotify.java | 3 +- ...cketEntityFightPropChangeReasonNotify.java | 4 +- .../PacketEntityFightPropUpdateNotify.java | 4 +- .../send/PacketEvtAvatarEnterFocusNotify.java | 3 +- .../send/PacketEvtAvatarExitFocusNotify.java | 3 +- .../send/PacketEvtAvatarLockChairRsp.java | 3 +- .../send/PacketEvtAvatarSitDownNotify.java | 3 +- .../send/PacketEvtAvatarStandUpNotify.java | 3 +- .../PacketEvtAvatarUpdateFocusNotify.java | 3 +- .../send/PacketEvtBulletDeactiveNotify.java | 3 +- .../packet/send/PacketEvtBulletHitNotify.java | 3 +- .../send/PacketEvtBulletMoveNotify.java | 3 +- ...PacketEvtEntityRenderersChangedNotify.java | 3 +- .../send/PacketExecuteGadgetLuaRsp.java | 3 +- .../send/PacketFinishedParentQuestNotify.java | 3 +- ...PacketFinishedParentQuestUpdateNotify.java | 4 +- .../packet/send/PacketForgeDataNotify.java | 4 +- .../send/PacketForgeFormulaDataNotify.java | 3 +- .../send/PacketForgeGetQueueDataRsp.java | 4 +- .../send/PacketForgeQueueDataNotify.java | 7 +- .../send/PacketForgeQueueManipulateRsp.java | 4 +- .../packet/send/PacketForgeStartRsp.java | 3 +- ...tFurnitureCurModuleArrangeCountNotify.java | 3 +- .../packet/send/PacketFurnitureMakeRsp.java | 9 +- .../send/PacketFurnitureMakeStartRsp.java | 8 +- .../packet/send/PacketGachaWishRsp.java | 3 +- .../PacketGadgetAutoPickDropInfoNotify.java | 4 +- .../packet/send/PacketGadgetInteractRsp.java | 3 +- .../packet/send/PacketGadgetStateNotify.java | 3 +- .../packet/send/PacketGetActivityInfoRsp.java | 4 +- .../PacketGetActivityShopSheetInfoRsp.java | 10 +- .../PacketGetAllActivatedBargainDataRsp.java | 1 + .../send/PacketGetAllMailResultNotify.java | 4 +- .../send/PacketGetAllUnlockNameCardRsp.java | 3 +- .../packet/send/PacketGetAuthkeyRsp.java | 3 +- .../send/PacketGetChatEmojiCollectionRsp.java | 7 +- .../packet/send/PacketGetCompoundDataRsp.java | 7 +- .../PacketGetDailyDungeonEntryInfoRsp.java | 7 +- .../PacketGetFriendShowAvatarInfoRsp.java | 5 +- .../PacketGetFriendShowNameCardInfoRsp.java | 4 +- .../packet/send/PacketGetGachaInfoRsp.java | 3 +- .../send/PacketGetHomeLevelUpRewardRsp.java | 3 +- .../PacketGetInvestigationMonsterRsp.java | 4 +- .../packet/send/PacketGetMailItemRsp.java | 7 +- .../send/PacketGetOnlinePlayerListRsp.java | 4 +- .../send/PacketGetPlayerAskFriendListRsp.java | 3 +- .../send/PacketGetPlayerFriendListRsp.java | 6 +- .../send/PacketGetPlayerSocialDetailRsp.java | 3 +- .../packet/send/PacketGetPlayerTokenRsp.java | 3 +- .../packet/send/PacketGetSceneAreaRsp.java | 3 +- .../packet/send/PacketGetScenePointRsp.java | 3 +- .../server/packet/send/PacketGetShopRsp.java | 14 +- .../packet/send/PacketGetShopmallDataRsp.java | 4 +- .../packet/send/PacketGetUgcBriefInfoRsp.java | 3 +- .../server/packet/send/PacketGetUgcRsp.java | 3 +- .../packet/send/PacketGetWidgetSlotRsp.java | 8 +- .../packet/send/PacketGetWorldMpInfoRsp.java | 3 +- .../packet/send/PacketGivingRecordNotify.java | 1 + .../packet/send/PacketGroupSuiteNotify.java | 7 +- .../packet/send/PacketGroupUnloadNotify.java | 4 +- .../send/PacketH5ActivityIdsNotify.java | 3 +- .../PacketHomeAllUnlockedBgmIdListNotify.java | 3 +- .../send/PacketHomeBasicInfoNotify.java | 6 +- .../send/PacketHomeChangeBgmNotify.java | 3 +- .../packet/send/PacketHomeChangeBgmRsp.java | 3 +- .../send/PacketHomeChangeEditModeRsp.java | 3 +- .../send/PacketHomeChangeModuleRsp.java | 3 +- .../send/PacketHomeChooseModuleRsp.java | 3 +- .../send/PacketHomeComfortInfoNotify.java | 10 +- .../PacketHomeEnterEditModeFinishRsp.java | 3 +- .../send/PacketHomeGetArrangementInfoRsp.java | 3 +- .../send/PacketHomeGetOnlineStatusRsp.java | 3 +- .../packet/send/PacketHomeKickPlayerRsp.java | 6 +- .../send/PacketHomeMarkPointNotify.java | 10 +- .../packet/send/PacketHomeModuleSeenRsp.java | 4 +- .../send/PacketHomeModuleUnlockNotify.java | 3 +- .../PacketHomeNewUnlockedBgmIdListNotify.java | 3 +- .../PacketHomePreChangeEditModeNotify.java | 3 +- .../packet/send/PacketHomeResourceNotify.java | 3 +- .../PacketHomeResourceTakeFetterExpRsp.java | 3 +- .../PacketHomeResourceTakeHomeCoinRsp.java | 3 +- .../PacketHomeSaveArrangementNoChangeRsp.java | 3 +- .../send/PacketHomeSceneInitFinishRsp.java | 3 +- .../packet/send/PacketHomeSceneJumpRsp.java | 3 +- .../PacketHomeUpdateArrangementInfoRsp.java | 3 +- .../packet/send/PacketHostPlayerNotify.java | 3 +- .../packet/send/PacketItemAddHintNotify.java | 4 +- .../packet/send/PacketLaunchFireworksRsp.java | 3 +- .../packet/send/PacketLevelupCityRsp.java | 3 +- .../send/PacketLifeStateChangeNotify.java | 3 +- .../packet/send/PacketMailChangeNotify.java | 7 +- .../server/packet/send/PacketMarkMapRsp.java | 4 +- .../packet/send/PacketMarkNewNotify.java | 4 +- ...cketMassiveEntityElementOpBatchNotify.java | 3 +- .../send/PacketMcoinExchangeHcoinRsp.java | 3 +- .../send/PacketMonsterForceAlertNotify.java | 3 +- .../packet/send/PacketMusicGameSettleRsp.java | 7 +- .../packet/send/PacketMusicGameStartRsp.java | 3 +- .../server/packet/send/PacketNpcTalkRsp.java | 3 +- .../send/PacketOpenStateChangeNotify.java | 4 +- .../send/PacketOpenStateUpdateNotify.java | 6 +- ...cketOtherPlayerEnterOrLeaveHomeNotify.java | 3 +- .../send/PacketPathfindingEnterSceneRsp.java | 3 +- .../send/PacketPersonalLineAllDataRsp.java | 10 +- .../send/PacketPersonalSceneJumpRsp.java | 3 +- .../server/packet/send/PacketPingRsp.java | 3 +- .../send/PacketPlatformChangeRouteNotify.java | 3 +- .../send/PacketPlatformStartRouteNotify.java | 3 +- .../send/PacketPlatformStopRouteNotify.java | 3 +- .../PacketPlayerApplyEnterHomeNotify.java | 3 +- ...acketPlayerApplyEnterHomeResultNotify.java | 3 +- .../PacketPlayerApplyEnterHomeResultRsp.java | 3 +- .../send/PacketPlayerApplyEnterMpNotify.java | 3 +- .../PacketPlayerApplyEnterMpResultNotify.java | 3 +- .../PacketPlayerApplyEnterMpResultRsp.java | 3 +- .../send/PacketPlayerApplyEnterMpRsp.java | 3 +- .../packet/send/PacketPlayerChatNotify.java | 3 +- .../packet/send/PacketPlayerChatRsp.java | 3 +- .../send/PacketPlayerCompoundMaterialRsp.java | 3 +- .../packet/send/PacketPlayerCookArgsRsp.java | 3 +- .../packet/send/PacketPlayerCookRsp.java | 4 +- .../packet/send/PacketPlayerDataNotify.java | 3 +- .../send/PacketPlayerEnterDungeonRsp.java | 3 +- .../send/PacketPlayerEnterSceneNotify.java | 3 +- .../send/PacketPlayerGameTimeNotify.java | 3 +- .../PacketPlayerGetForceQuitBanInfoRsp.java | 3 +- .../send/PacketPlayerHomeCompInfoNotify.java | 6 +- .../PacketPlayerLevelRewardUpdateNotify.java | 4 +- .../packet/send/PacketPlayerLoginRsp.java | 5 +- .../send/PacketPlayerPreEnterMpNotify.java | 3 +- .../send/PacketPlayerPropChangeNotify.java | 3 +- .../PacketPlayerPropChangeReasonNotify.java | 3 +- .../packet/send/PacketPlayerPropNotify.java | 3 +- .../packet/send/PacketPlayerSetPauseRsp.java | 3 +- .../packet/send/PacketPlayerStoreNotify.java | 7 +- .../packet/send/PacketPlayerTimeNotify.java | 3 +- .../PacketPlayerWorldSceneInfoListNotify.java | 4 +- .../packet/send/PacketPostEnterSceneRsp.java | 3 +- .../packet/send/PacketPrivateChatNotify.java | 3 +- .../send/PacketProudSkillChangeNotify.java | 3 +- .../PacketProudSkillExtraLevelNotify.java | 3 +- .../packet/send/PacketPullPrivateChatRsp.java | 4 +- .../packet/send/PacketPullRecentChatRsp.java | 4 +- ...PacketQueryCodexMonsterBeKilledNumRsp.java | 4 +- .../packet/send/PacketQueryPathRsp.java | 7 +- .../send/PacketQuestCreateEntityRsp.java | 3 +- .../send/PacketQuestDestroyEntityRsp.java | 3 +- .../packet/send/PacketQuestDestroyNpcRsp.java | 3 +- .../send/PacketQuestGlobalVarNotify.java | 3 +- .../packet/send/PacketQuestListNotify.java | 3 +- .../send/PacketQuestListUpdateNotify.java | 4 +- .../send/PacketQuestProgressUpdateNotify.java | 3 +- .../packet/send/PacketQuestTransmitRsp.java | 3 +- .../send/PacketQuestUpdateQuestVarNotify.java | 4 +- .../send/PacketQuestUpdateQuestVarRsp.java | 4 +- ...tReceivedTrialAvatarActivityRewardRsp.java | 3 +- .../send/PacketReliquaryDecomposeRsp.java | 4 +- .../send/PacketReliquaryUpgradeRsp.java | 4 +- .../packet/send/PacketResinChangeNotify.java | 3 +- .../send/PacketSceneAreaUnlockNotify.java | 3 +- .../send/PacketSceneAreaWeatherNotify.java | 3 +- .../packet/send/PacketSceneAudioNotify.java | 4 +- .../send/PacketSceneEntityAppearNotify.java | 4 +- .../PacketSceneEntityDisappearNotify.java | 4 +- .../send/PacketSceneEntityDrownRsp.java | 3 +- .../send/PacketSceneEntityMoveNotify.java | 3 +- .../send/PacketSceneEntityUpdateNotify.java | 4 +- .../send/PacketSceneForceLockNotify.java | 6 +- .../send/PacketSceneForceUnlockNotify.java | 6 +- .../packet/send/PacketSceneInitFinishRsp.java | 3 +- .../packet/send/PacketSceneKickPlayerRsp.java | 3 +- .../send/PacketScenePlayerInfoNotify.java | 3 +- .../send/PacketScenePlayerLocationNotify.java | 3 +- .../send/PacketScenePlayerSoundNotify.java | 4 +- .../send/PacketScenePointUnlockNotify.java | 3 +- .../send/PacketSceneTeamUpdateNotify.java | 3 +- .../packet/send/PacketSceneTimeNotify.java | 3 +- .../send/PacketSceneTransToPointRsp.java | 3 +- .../send/PacketSelectWorktopOptionRsp.java | 3 +- .../send/PacketServerAnnounceNotify.java | 7 +- .../PacketServerAnnounceRevokeNotify.java | 3 +- .../send/PacketServerBuffChangeNotify.java | 4 +- ...etServerCondMeetQuestListUpdateNotify.java | 3 +- .../PacketServerGlobalValueChangeNotify.java | 3 +- .../packet/send/PacketServerTimeNotify.java | 3 +- .../send/PacketSetBattlePassViewedRsp.java | 3 +- .../send/PacketSetChatEmojiCollectionRsp.java | 3 +- .../send/PacketSetEquipLockStateRsp.java | 3 +- .../PacketSetFriendEnterHomeOptionRsp.java | 3 +- .../packet/send/PacketSetNameCardRsp.java | 3 +- .../packet/send/PacketSetOpenStateRsp.java | 3 +- .../send/PacketSetPlayerBirthdayRsp.java | 3 +- .../send/PacketSetPlayerHeadImageRsp.java | 3 +- .../packet/send/PacketSetPlayerNameRsp.java | 3 +- .../packet/send/PacketSetPlayerPropRsp.java | 3 +- .../send/PacketSetPlayerSignatureRsp.java | 3 +- .../packet/send/PacketSetUpAvatarTeamRsp.java | 6 +- .../send/PacketSetUpLunchBoxWidgetRsp.java | 6 +- .../packet/send/PacketSetWidgetSlotRsp.java | 3 +- .../send/PacketShowClientGuideNotify.java | 3 +- .../send/PacketShowCommonTipsNotify.java | 3 +- .../send/PacketSkipPlayerGameTimeRsp.java | 6 +- .../send/PacketStoreItemChangeNotify.java | 4 +- .../packet/send/PacketStoreItemDelNotify.java | 4 +- .../send/PacketStoreWeightLimitNotify.java | 7 +- .../PacketSyncScenePlayTeamEntityNotify.java | 3 +- .../send/PacketSyncTeamEntityNotify.java | 3 +- .../PacketTakeAchievementGoalRewardRsp.java | 8 +- .../send/PacketTakeAchievementRewardReq.java | 3 +- .../send/PacketTakeAchievementRewardRsp.java | 8 +- .../PacketTakeBattlePassMissionPointRsp.java | 3 +- .../send/PacketTakeBattlePassRewardRsp.java | 4 +- .../send/PacketTakeFurnitureMakeRsp.java | 9 +- .../send/PacketTakePlayerLevelRewardRsp.java | 3 +- .../packet/send/PacketTakeoffEquipRsp.java | 3 +- .../packet/send/PacketTowerAllDataRsp.java | 13 +- ...PacketTowerCurLevelRecordChangeNotify.java | 3 +- .../packet/send/PacketTowerEnterLevelRsp.java | 3 +- .../PacketTowerFloorRecordChangeNotify.java | 3 +- .../send/PacketTowerLevelStarCondNotify.java | 3 +- ...acketTowerMiddleLevelChangeTeamNotify.java | 3 +- .../packet/send/PacketTowerTeamSelectRsp.java | 3 +- .../packet/send/PacketTryEnterHomeRsp.java | 6 +- .../send/PacketUnlockAvatarTalentRsp.java | 3 +- .../send/PacketUnlockNameCardNotify.java | 3 +- .../send/PacketUnlockPersonalLineRsp.java | 3 +- .../send/PacketUnlockTransPointRsp.java | 3 +- ...ketUnlockedFurnitureFormulaDataNotify.java | 4 +- ...acketUnlockedFurnitureSuiteDataNotify.java | 4 +- .../PacketUpdatePlayerShowAvatarListRsp.java | 4 +- ...PacketUpdatePlayerShowNameCardListRsp.java | 4 +- .../server/packet/send/PacketUseItemRsp.java | 3 +- .../packet/send/PacketVehicleInteractRsp.java | 6 +- .../send/PacketVehicleStaminaNotify.java | 3 +- .../packet/send/PacketWeaponAwakenRsp.java | 3 +- .../packet/send/PacketWeaponPromoteRsp.java | 3 +- .../packet/send/PacketWeaponUpgradeRsp.java | 4 +- .../packet/send/PacketWearEquipRsp.java | 3 +- .../send/PacketWidgetCoolDownNotify.java | 6 +- .../packet/send/PacketWidgetDoBagRsp.java | 3 +- .../send/PacketWidgetGadgetAllDataNotify.java | 3 +- .../send/PacketWidgetGadgetDataNotify.java | 7 +- .../send/PacketWidgetSlotChangeNotify.java | 7 +- .../send/PacketWindSeedClientNotify.java | 3 +- .../send/PacketWorktopOptionNotify.java | 3 +- .../send/PacketWorldChestOpenNotify.java | 3 +- .../packet/send/PacketWorldDataNotify.java | 3 +- .../send/PacketWorldPlayerDieNotify.java | 3 +- .../send/PacketWorldPlayerInfoNotify.java | 3 +- .../send/PacketWorldPlayerLocationNotify.java | 3 +- .../send/PacketWorldPlayerRTTNotify.java | 3 +- .../send/PacketWorldPlayerReviveRsp.java | 3 +- .../server/scheduler/AsyncServerTask.java | 3 +- src/main/java/emu/grasscutter/task/Task.java | 3 +- .../java/emu/grasscutter/task/TaskMap.java | 3 +- .../task/tasks/AnnouncementTask.java | 10 +- .../emu/grasscutter/task/tasks/MoonCard.java | 6 +- .../java/emu/grasscutter/tools/Dumpers.java | 19 +- .../java/emu/grasscutter/tools/Tools.java | 9 +- .../java/emu/grasscutter/utils/Crypto.java | 16 +- .../emu/grasscutter/utils/DispatchUtils.java | 17 +- .../java/emu/grasscutter/utils/FileUtils.java | 17 +- .../emu/grasscutter/utils/JsonAdapters.java | 3 +- .../java/emu/grasscutter/utils/JsonUtils.java | 15 +- .../grasscutter/utils/StartupArguments.java | 17 +- .../java/emu/grasscutter/utils/TsvUtils.java | 17 +- .../java/emu/grasscutter/utils/Utils.java | 11 +- .../grasscutter/utils/helpers/DateHelper.java | 3 +- .../emu/grasscutter/utils/lang/Language.java | 9 +- .../grasscutter/utils/objects/FieldFetch.java | 3 +- .../utils/objects/HandbookBody.java | 3 +- .../utils/objects/JLineLogbackAppender.java | 1 + .../grasscutter/utils/objects/JObject.java | 4 +- .../grasscutter/utils/objects/KahnsSort.java | 6 +- .../utils/objects/ServerLogEventAppender.java | 1 + .../grasscutter/utils/objects/SparseSet.java | 5 +- .../utils/objects/WeightedList.java | 3 +- .../grasscutter/utils/objects/text/Style.java | 7 +- .../grasscutter/utils/objects/text/Text.java | 4 +- 1175 files changed, 3512 insertions(+), 5070 deletions(-) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AbilityFireworkBornTypeOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AbilityFireworkBornTypeOuterClass.java index b09f87f12..c08ce8a10 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/AbilityFireworkBornTypeOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/AbilityFireworkBornTypeOuterClass.java @@ -19,59 +19,59 @@ public final class AbilityFireworkBornTypeOuterClass { com.google.protobuf.MessageOrBuilder { /** - * .Vector move_dir = 4; - * @return Whether the moveDir field is set. - */ - boolean hasMoveDir(); - /** - * .Vector move_dir = 4; - * @return The moveDir. - */ - emu.grasscutter.net.proto.VectorOuterClass.Vector getMoveDir(); - /** - * .Vector move_dir = 4; - */ - emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getMoveDirOrBuilder(); - - /** - * uint32 effect_index = 7; + * uint32 effect_index = 14; * @return The effectIndex. */ int getEffectIndex(); /** - * .Vector pos = 2; - * @return Whether the pos field is set. - */ - boolean hasPos(); - /** - * .Vector pos = 2; - * @return The pos. - */ - emu.grasscutter.net.proto.VectorOuterClass.Vector getPos(); - /** - * .Vector pos = 2; - */ - emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder(); - - /** - * .Vector rot = 6; + * .Vector rot = 5; * @return Whether the rot field is set. */ boolean hasRot(); /** - * .Vector rot = 6; + * .Vector rot = 5; * @return The rot. */ emu.grasscutter.net.proto.VectorOuterClass.Vector getRot(); /** - * .Vector rot = 6; + * .Vector rot = 5; */ emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRotOrBuilder(); + + /** + * .Vector pos = 12; + * @return Whether the pos field is set. + */ + boolean hasPos(); + /** + * .Vector pos = 12; + * @return The pos. + */ + emu.grasscutter.net.proto.VectorOuterClass.Vector getPos(); + /** + * .Vector pos = 12; + */ + emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder(); + + /** + * .Vector move_dir = 15; + * @return Whether the moveDir field is set. + */ + boolean hasMoveDir(); + /** + * .Vector move_dir = 15; + * @return The moveDir. + */ + emu.grasscutter.net.proto.VectorOuterClass.Vector getMoveDir(); + /** + * .Vector move_dir = 15; + */ + emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getMoveDirOrBuilder(); } /** * 
-   * Obf: IEELHDCPPBO
+   * Obf: KNMNMIBIHEK
    *
* * Protobuf type {@code AbilityFireworkBornType} @@ -118,33 +118,7 @@ public final class AbilityFireworkBornTypeOuterClass { case 0: done = true; break; - case 18: { - emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null; - if (pos_ != null) { - subBuilder = pos_.toBuilder(); - } - pos_ = input.readMessage(emu.grasscutter.net.proto.VectorOuterClass.Vector.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(pos_); - pos_ = subBuilder.buildPartial(); - } - - break; - } - case 34: { - emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null; - if (moveDir_ != null) { - subBuilder = moveDir_.toBuilder(); - } - moveDir_ = input.readMessage(emu.grasscutter.net.proto.VectorOuterClass.Vector.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(moveDir_); - moveDir_ = subBuilder.buildPartial(); - } - - break; - } - case 50: { + case 42: { emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null; if (rot_ != null) { subBuilder = rot_.toBuilder(); @@ -157,11 +131,37 @@ public final class AbilityFireworkBornTypeOuterClass { break; } - case 56: { + case 98: { + emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null; + if (pos_ != null) { + subBuilder = pos_.toBuilder(); + } + pos_ = input.readMessage(emu.grasscutter.net.proto.VectorOuterClass.Vector.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(pos_); + pos_ = subBuilder.buildPartial(); + } + + break; + } + case 112: { effectIndex_ = input.readUInt32(); break; } + case 122: { + emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null; + if (moveDir_ != null) { + subBuilder = moveDir_.toBuilder(); + } + moveDir_ = input.readMessage(emu.grasscutter.net.proto.VectorOuterClass.Vector.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(moveDir_); + moveDir_ = subBuilder.buildPartial(); + } + + break; + } default: { if (!parseUnknownField( input, unknownFields, extensionRegistry, tag)) { @@ -194,36 +194,10 @@ public final class AbilityFireworkBornTypeOuterClass { emu.grasscutter.net.proto.AbilityFireworkBornTypeOuterClass.AbilityFireworkBornType.class, emu.grasscutter.net.proto.AbilityFireworkBornTypeOuterClass.AbilityFireworkBornType.Builder.class); } - public static final int MOVE_DIR_FIELD_NUMBER = 4; - private emu.grasscutter.net.proto.VectorOuterClass.Vector moveDir_; - /** - * .Vector move_dir = 4; - * @return Whether the moveDir field is set. - */ - @java.lang.Override - public boolean hasMoveDir() { - return moveDir_ != null; - } - /** - * .Vector move_dir = 4; - * @return The moveDir. - */ - @java.lang.Override - public emu.grasscutter.net.proto.VectorOuterClass.Vector getMoveDir() { - return moveDir_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : moveDir_; - } - /** - * .Vector move_dir = 4; - */ - @java.lang.Override - public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getMoveDirOrBuilder() { - return getMoveDir(); - } - - public static final int EFFECT_INDEX_FIELD_NUMBER = 7; + public static final int EFFECT_INDEX_FIELD_NUMBER = 14; private int effectIndex_; /** - * uint32 effect_index = 7; + * uint32 effect_index = 14; * @return The effectIndex. */ @java.lang.Override @@ -231,36 +205,10 @@ public final class AbilityFireworkBornTypeOuterClass { return effectIndex_; } - public static final int POS_FIELD_NUMBER = 2; - private emu.grasscutter.net.proto.VectorOuterClass.Vector pos_; - /** - * .Vector pos = 2; - * @return Whether the pos field is set. - */ - @java.lang.Override - public boolean hasPos() { - return pos_ != null; - } - /** - * .Vector pos = 2; - * @return The pos. - */ - @java.lang.Override - public emu.grasscutter.net.proto.VectorOuterClass.Vector getPos() { - return pos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : pos_; - } - /** - * .Vector pos = 2; - */ - @java.lang.Override - public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder() { - return getPos(); - } - - public static final int ROT_FIELD_NUMBER = 6; + public static final int ROT_FIELD_NUMBER = 5; private emu.grasscutter.net.proto.VectorOuterClass.Vector rot_; /** - * .Vector rot = 6; + * .Vector rot = 5; * @return Whether the rot field is set. */ @java.lang.Override @@ -268,7 +216,7 @@ public final class AbilityFireworkBornTypeOuterClass { return rot_ != null; } /** - * .Vector rot = 6; + * .Vector rot = 5; * @return The rot. */ @java.lang.Override @@ -276,13 +224,65 @@ public final class AbilityFireworkBornTypeOuterClass { return rot_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : rot_; } /** - * .Vector rot = 6; + * .Vector rot = 5; */ @java.lang.Override public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRotOrBuilder() { return getRot(); } + public static final int POS_FIELD_NUMBER = 12; + private emu.grasscutter.net.proto.VectorOuterClass.Vector pos_; + /** + * .Vector pos = 12; + * @return Whether the pos field is set. + */ + @java.lang.Override + public boolean hasPos() { + return pos_ != null; + } + /** + * .Vector pos = 12; + * @return The pos. + */ + @java.lang.Override + public emu.grasscutter.net.proto.VectorOuterClass.Vector getPos() { + return pos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : pos_; + } + /** + * .Vector pos = 12; + */ + @java.lang.Override + public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder() { + return getPos(); + } + + public static final int MOVE_DIR_FIELD_NUMBER = 15; + private emu.grasscutter.net.proto.VectorOuterClass.Vector moveDir_; + /** + * .Vector move_dir = 15; + * @return Whether the moveDir field is set. + */ + @java.lang.Override + public boolean hasMoveDir() { + return moveDir_ != null; + } + /** + * .Vector move_dir = 15; + * @return The moveDir. + */ + @java.lang.Override + public emu.grasscutter.net.proto.VectorOuterClass.Vector getMoveDir() { + return moveDir_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : moveDir_; + } + /** + * .Vector move_dir = 15; + */ + @java.lang.Override + public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getMoveDirOrBuilder() { + return getMoveDir(); + } + private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -297,17 +297,17 @@ public final class AbilityFireworkBornTypeOuterClass { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (pos_ != null) { - output.writeMessage(2, getPos()); - } - if (moveDir_ != null) { - output.writeMessage(4, getMoveDir()); - } if (rot_ != null) { - output.writeMessage(6, getRot()); + output.writeMessage(5, getRot()); + } + if (pos_ != null) { + output.writeMessage(12, getPos()); } if (effectIndex_ != 0) { - output.writeUInt32(7, effectIndex_); + output.writeUInt32(14, effectIndex_); + } + if (moveDir_ != null) { + output.writeMessage(15, getMoveDir()); } unknownFields.writeTo(output); } @@ -318,21 +318,21 @@ public final class AbilityFireworkBornTypeOuterClass { if (size != -1) return size; size = 0; - if (pos_ != null) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(2, getPos()); - } - if (moveDir_ != null) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(4, getMoveDir()); - } if (rot_ != null) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(6, getRot()); + .computeMessageSize(5, getRot()); + } + if (pos_ != null) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(12, getPos()); } if (effectIndex_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(7, effectIndex_); + .computeUInt32Size(14, effectIndex_); + } + if (moveDir_ != null) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(15, getMoveDir()); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -349,22 +349,22 @@ public final class AbilityFireworkBornTypeOuterClass { } emu.grasscutter.net.proto.AbilityFireworkBornTypeOuterClass.AbilityFireworkBornType other = (emu.grasscutter.net.proto.AbilityFireworkBornTypeOuterClass.AbilityFireworkBornType) obj; - if (hasMoveDir() != other.hasMoveDir()) return false; - if (hasMoveDir()) { - if (!getMoveDir() - .equals(other.getMoveDir())) return false; - } if (getEffectIndex() != other.getEffectIndex()) return false; + if (hasRot() != other.hasRot()) return false; + if (hasRot()) { + if (!getRot() + .equals(other.getRot())) return false; + } if (hasPos() != other.hasPos()) return false; if (hasPos()) { if (!getPos() .equals(other.getPos())) return false; } - if (hasRot() != other.hasRot()) return false; - if (hasRot()) { - if (!getRot() - .equals(other.getRot())) return false; + if (hasMoveDir() != other.hasMoveDir()) return false; + if (hasMoveDir()) { + if (!getMoveDir() + .equals(other.getMoveDir())) return false; } if (!unknownFields.equals(other.unknownFields)) return false; return true; @@ -377,19 +377,19 @@ public final class AbilityFireworkBornTypeOuterClass { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - if (hasMoveDir()) { - hash = (37 * hash) + MOVE_DIR_FIELD_NUMBER; - hash = (53 * hash) + getMoveDir().hashCode(); - } hash = (37 * hash) + EFFECT_INDEX_FIELD_NUMBER; hash = (53 * hash) + getEffectIndex(); + if (hasRot()) { + hash = (37 * hash) + ROT_FIELD_NUMBER; + hash = (53 * hash) + getRot().hashCode(); + } if (hasPos()) { hash = (37 * hash) + POS_FIELD_NUMBER; hash = (53 * hash) + getPos().hashCode(); } - if (hasRot()) { - hash = (37 * hash) + ROT_FIELD_NUMBER; - hash = (53 * hash) + getRot().hashCode(); + if (hasMoveDir()) { + hash = (37 * hash) + MOVE_DIR_FIELD_NUMBER; + hash = (53 * hash) + getMoveDir().hashCode(); } hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; @@ -488,7 +488,7 @@ public final class AbilityFireworkBornTypeOuterClass { } /** * 
-     * Obf: IEELHDCPPBO
+     * Obf: KNMNMIBIHEK
      *
* * Protobuf type {@code AbilityFireworkBornType} @@ -528,25 +528,25 @@ public final class AbilityFireworkBornTypeOuterClass { @java.lang.Override public Builder clear() { super.clear(); - if (moveDirBuilder_ == null) { - moveDir_ = null; - } else { - moveDir_ = null; - moveDirBuilder_ = null; - } effectIndex_ = 0; + if (rotBuilder_ == null) { + rot_ = null; + } else { + rot_ = null; + rotBuilder_ = null; + } if (posBuilder_ == null) { pos_ = null; } else { pos_ = null; posBuilder_ = null; } - if (rotBuilder_ == null) { - rot_ = null; + if (moveDirBuilder_ == null) { + moveDir_ = null; } else { - rot_ = null; - rotBuilder_ = null; + moveDir_ = null; + moveDirBuilder_ = null; } return this; } @@ -574,21 +574,21 @@ public final class AbilityFireworkBornTypeOuterClass { @java.lang.Override public emu.grasscutter.net.proto.AbilityFireworkBornTypeOuterClass.AbilityFireworkBornType buildPartial() { emu.grasscutter.net.proto.AbilityFireworkBornTypeOuterClass.AbilityFireworkBornType result = new emu.grasscutter.net.proto.AbilityFireworkBornTypeOuterClass.AbilityFireworkBornType(this); - if (moveDirBuilder_ == null) { - result.moveDir_ = moveDir_; - } else { - result.moveDir_ = moveDirBuilder_.build(); - } result.effectIndex_ = effectIndex_; + if (rotBuilder_ == null) { + result.rot_ = rot_; + } else { + result.rot_ = rotBuilder_.build(); + } if (posBuilder_ == null) { result.pos_ = pos_; } else { result.pos_ = posBuilder_.build(); } - if (rotBuilder_ == null) { - result.rot_ = rot_; + if (moveDirBuilder_ == null) { + result.moveDir_ = moveDir_; } else { - result.rot_ = rotBuilder_.build(); + result.moveDir_ = moveDirBuilder_.build(); } onBuilt(); return result; @@ -638,17 +638,17 @@ public final class AbilityFireworkBornTypeOuterClass { public Builder mergeFrom(emu.grasscutter.net.proto.AbilityFireworkBornTypeOuterClass.AbilityFireworkBornType other) { if (other == emu.grasscutter.net.proto.AbilityFireworkBornTypeOuterClass.AbilityFireworkBornType.getDefaultInstance()) return this; - if (other.hasMoveDir()) { - mergeMoveDir(other.getMoveDir()); - } if (other.getEffectIndex() != 0) { setEffectIndex(other.getEffectIndex()); } + if (other.hasRot()) { + mergeRot(other.getRot()); + } if (other.hasPos()) { mergePos(other.getPos()); } - if (other.hasRot()) { - mergeRot(other.getRot()); + if (other.hasMoveDir()) { + mergeMoveDir(other.getMoveDir()); } this.mergeUnknownFields(other.unknownFields); onChanged(); @@ -679,128 +679,9 @@ public final class AbilityFireworkBornTypeOuterClass { return this; } - private emu.grasscutter.net.proto.VectorOuterClass.Vector moveDir_; - private com.google.protobuf.SingleFieldBuilderV3< - emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> moveDirBuilder_; - /** - * .Vector move_dir = 4; - * @return Whether the moveDir field is set. - */ - public boolean hasMoveDir() { - return moveDirBuilder_ != null || moveDir_ != null; - } - /** - * .Vector move_dir = 4; - * @return The moveDir. - */ - public emu.grasscutter.net.proto.VectorOuterClass.Vector getMoveDir() { - if (moveDirBuilder_ == null) { - return moveDir_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : moveDir_; - } else { - return moveDirBuilder_.getMessage(); - } - } - /** - * .Vector move_dir = 4; - */ - public Builder setMoveDir(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { - if (moveDirBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - moveDir_ = value; - onChanged(); - } else { - moveDirBuilder_.setMessage(value); - } - - return this; - } - /** - * .Vector move_dir = 4; - */ - public Builder setMoveDir( - emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) { - if (moveDirBuilder_ == null) { - moveDir_ = builderForValue.build(); - onChanged(); - } else { - moveDirBuilder_.setMessage(builderForValue.build()); - } - - return this; - } - /** - * .Vector move_dir = 4; - */ - public Builder mergeMoveDir(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { - if (moveDirBuilder_ == null) { - if (moveDir_ != null) { - moveDir_ = - emu.grasscutter.net.proto.VectorOuterClass.Vector.newBuilder(moveDir_).mergeFrom(value).buildPartial(); - } else { - moveDir_ = value; - } - onChanged(); - } else { - moveDirBuilder_.mergeFrom(value); - } - - return this; - } - /** - * .Vector move_dir = 4; - */ - public Builder clearMoveDir() { - if (moveDirBuilder_ == null) { - moveDir_ = null; - onChanged(); - } else { - moveDir_ = null; - moveDirBuilder_ = null; - } - - return this; - } - /** - * .Vector move_dir = 4; - */ - public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getMoveDirBuilder() { - - onChanged(); - return getMoveDirFieldBuilder().getBuilder(); - } - /** - * .Vector move_dir = 4; - */ - public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getMoveDirOrBuilder() { - if (moveDirBuilder_ != null) { - return moveDirBuilder_.getMessageOrBuilder(); - } else { - return moveDir_ == null ? - emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : moveDir_; - } - } - /** - * .Vector move_dir = 4; - */ - private com.google.protobuf.SingleFieldBuilderV3< - emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> - getMoveDirFieldBuilder() { - if (moveDirBuilder_ == null) { - moveDirBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>( - getMoveDir(), - getParentForChildren(), - isClean()); - moveDir_ = null; - } - return moveDirBuilder_; - } - private int effectIndex_ ; /** - * uint32 effect_index = 7; + * uint32 effect_index = 14; * @return The effectIndex. */ @java.lang.Override @@ -808,7 +689,7 @@ public final class AbilityFireworkBornTypeOuterClass { return effectIndex_; } /** - * uint32 effect_index = 7; + * uint32 effect_index = 14; * @param value The effectIndex to set. * @return This builder for chaining. */ @@ -819,7 +700,7 @@ public final class AbilityFireworkBornTypeOuterClass { return this; } /** - * uint32 effect_index = 7; + * uint32 effect_index = 14; * @return This builder for chaining. */ public Builder clearEffectIndex() { @@ -829,137 +710,18 @@ public final class AbilityFireworkBornTypeOuterClass { return this; } - private emu.grasscutter.net.proto.VectorOuterClass.Vector pos_; - private com.google.protobuf.SingleFieldBuilderV3< - emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> posBuilder_; - /** - * .Vector pos = 2; - * @return Whether the pos field is set. - */ - public boolean hasPos() { - return posBuilder_ != null || pos_ != null; - } - /** - * .Vector pos = 2; - * @return The pos. - */ - public emu.grasscutter.net.proto.VectorOuterClass.Vector getPos() { - if (posBuilder_ == null) { - return pos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : pos_; - } else { - return posBuilder_.getMessage(); - } - } - /** - * .Vector pos = 2; - */ - public Builder setPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { - if (posBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - pos_ = value; - onChanged(); - } else { - posBuilder_.setMessage(value); - } - - return this; - } - /** - * .Vector pos = 2; - */ - public Builder setPos( - emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) { - if (posBuilder_ == null) { - pos_ = builderForValue.build(); - onChanged(); - } else { - posBuilder_.setMessage(builderForValue.build()); - } - - return this; - } - /** - * .Vector pos = 2; - */ - public Builder mergePos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { - if (posBuilder_ == null) { - if (pos_ != null) { - pos_ = - emu.grasscutter.net.proto.VectorOuterClass.Vector.newBuilder(pos_).mergeFrom(value).buildPartial(); - } else { - pos_ = value; - } - onChanged(); - } else { - posBuilder_.mergeFrom(value); - } - - return this; - } - /** - * .Vector pos = 2; - */ - public Builder clearPos() { - if (posBuilder_ == null) { - pos_ = null; - onChanged(); - } else { - pos_ = null; - posBuilder_ = null; - } - - return this; - } - /** - * .Vector pos = 2; - */ - public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getPosBuilder() { - - onChanged(); - return getPosFieldBuilder().getBuilder(); - } - /** - * .Vector pos = 2; - */ - public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder() { - if (posBuilder_ != null) { - return posBuilder_.getMessageOrBuilder(); - } else { - return pos_ == null ? - emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : pos_; - } - } - /** - * .Vector pos = 2; - */ - private com.google.protobuf.SingleFieldBuilderV3< - emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> - getPosFieldBuilder() { - if (posBuilder_ == null) { - posBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>( - getPos(), - getParentForChildren(), - isClean()); - pos_ = null; - } - return posBuilder_; - } - private emu.grasscutter.net.proto.VectorOuterClass.Vector rot_; private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> rotBuilder_; /** - * .Vector rot = 6; + * .Vector rot = 5; * @return Whether the rot field is set. */ public boolean hasRot() { return rotBuilder_ != null || rot_ != null; } /** - * .Vector rot = 6; + * .Vector rot = 5; * @return The rot. */ public emu.grasscutter.net.proto.VectorOuterClass.Vector getRot() { @@ -970,7 +732,7 @@ public final class AbilityFireworkBornTypeOuterClass { } } /** - * .Vector rot = 6; + * .Vector rot = 5; */ public Builder setRot(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { if (rotBuilder_ == null) { @@ -986,7 +748,7 @@ public final class AbilityFireworkBornTypeOuterClass { return this; } /** - * .Vector rot = 6; + * .Vector rot = 5; */ public Builder setRot( emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) { @@ -1000,7 +762,7 @@ public final class AbilityFireworkBornTypeOuterClass { return this; } /** - * .Vector rot = 6; + * .Vector rot = 5; */ public Builder mergeRot(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { if (rotBuilder_ == null) { @@ -1018,7 +780,7 @@ public final class AbilityFireworkBornTypeOuterClass { return this; } /** - * .Vector rot = 6; + * .Vector rot = 5; */ public Builder clearRot() { if (rotBuilder_ == null) { @@ -1032,7 +794,7 @@ public final class AbilityFireworkBornTypeOuterClass { return this; } /** - * .Vector rot = 6; + * .Vector rot = 5; */ public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getRotBuilder() { @@ -1040,7 +802,7 @@ public final class AbilityFireworkBornTypeOuterClass { return getRotFieldBuilder().getBuilder(); } /** - * .Vector rot = 6; + * .Vector rot = 5; */ public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRotOrBuilder() { if (rotBuilder_ != null) { @@ -1051,7 +813,7 @@ public final class AbilityFireworkBornTypeOuterClass { } } /** - * .Vector rot = 6; + * .Vector rot = 5; */ private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> @@ -1066,6 +828,244 @@ public final class AbilityFireworkBornTypeOuterClass { } return rotBuilder_; } + + private emu.grasscutter.net.proto.VectorOuterClass.Vector pos_; + private com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> posBuilder_; + /** + * .Vector pos = 12; + * @return Whether the pos field is set. + */ + public boolean hasPos() { + return posBuilder_ != null || pos_ != null; + } + /** + * .Vector pos = 12; + * @return The pos. + */ + public emu.grasscutter.net.proto.VectorOuterClass.Vector getPos() { + if (posBuilder_ == null) { + return pos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : pos_; + } else { + return posBuilder_.getMessage(); + } + } + /** + * .Vector pos = 12; + */ + public Builder setPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { + if (posBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + pos_ = value; + onChanged(); + } else { + posBuilder_.setMessage(value); + } + + return this; + } + /** + * .Vector pos = 12; + */ + public Builder setPos( + emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) { + if (posBuilder_ == null) { + pos_ = builderForValue.build(); + onChanged(); + } else { + posBuilder_.setMessage(builderForValue.build()); + } + + return this; + } + /** + * .Vector pos = 12; + */ + public Builder mergePos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { + if (posBuilder_ == null) { + if (pos_ != null) { + pos_ = + emu.grasscutter.net.proto.VectorOuterClass.Vector.newBuilder(pos_).mergeFrom(value).buildPartial(); + } else { + pos_ = value; + } + onChanged(); + } else { + posBuilder_.mergeFrom(value); + } + + return this; + } + /** + * .Vector pos = 12; + */ + public Builder clearPos() { + if (posBuilder_ == null) { + pos_ = null; + onChanged(); + } else { + pos_ = null; + posBuilder_ = null; + } + + return this; + } + /** + * .Vector pos = 12; + */ + public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getPosBuilder() { + + onChanged(); + return getPosFieldBuilder().getBuilder(); + } + /** + * .Vector pos = 12; + */ + public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder() { + if (posBuilder_ != null) { + return posBuilder_.getMessageOrBuilder(); + } else { + return pos_ == null ? + emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : pos_; + } + } + /** + * .Vector pos = 12; + */ + private com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> + getPosFieldBuilder() { + if (posBuilder_ == null) { + posBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>( + getPos(), + getParentForChildren(), + isClean()); + pos_ = null; + } + return posBuilder_; + } + + private emu.grasscutter.net.proto.VectorOuterClass.Vector moveDir_; + private com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> moveDirBuilder_; + /** + * .Vector move_dir = 15; + * @return Whether the moveDir field is set. + */ + public boolean hasMoveDir() { + return moveDirBuilder_ != null || moveDir_ != null; + } + /** + * .Vector move_dir = 15; + * @return The moveDir. + */ + public emu.grasscutter.net.proto.VectorOuterClass.Vector getMoveDir() { + if (moveDirBuilder_ == null) { + return moveDir_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : moveDir_; + } else { + return moveDirBuilder_.getMessage(); + } + } + /** + * .Vector move_dir = 15; + */ + public Builder setMoveDir(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { + if (moveDirBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + moveDir_ = value; + onChanged(); + } else { + moveDirBuilder_.setMessage(value); + } + + return this; + } + /** + * .Vector move_dir = 15; + */ + public Builder setMoveDir( + emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) { + if (moveDirBuilder_ == null) { + moveDir_ = builderForValue.build(); + onChanged(); + } else { + moveDirBuilder_.setMessage(builderForValue.build()); + } + + return this; + } + /** + * .Vector move_dir = 15; + */ + public Builder mergeMoveDir(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { + if (moveDirBuilder_ == null) { + if (moveDir_ != null) { + moveDir_ = + emu.grasscutter.net.proto.VectorOuterClass.Vector.newBuilder(moveDir_).mergeFrom(value).buildPartial(); + } else { + moveDir_ = value; + } + onChanged(); + } else { + moveDirBuilder_.mergeFrom(value); + } + + return this; + } + /** + * .Vector move_dir = 15; + */ + public Builder clearMoveDir() { + if (moveDirBuilder_ == null) { + moveDir_ = null; + onChanged(); + } else { + moveDir_ = null; + moveDirBuilder_ = null; + } + + return this; + } + /** + * .Vector move_dir = 15; + */ + public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getMoveDirBuilder() { + + onChanged(); + return getMoveDirFieldBuilder().getBuilder(); + } + /** + * .Vector move_dir = 15; + */ + public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getMoveDirOrBuilder() { + if (moveDirBuilder_ != null) { + return moveDirBuilder_.getMessageOrBuilder(); + } else { + return moveDir_ == null ? + emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : moveDir_; + } + } + /** + * .Vector move_dir = 15; + */ + private com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> + getMoveDirFieldBuilder() { + if (moveDirBuilder_ == null) { + moveDirBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>( + getMoveDir(), + getParentForChildren(), + isClean()); + moveDir_ = null; + } + return moveDirBuilder_; + } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -1134,9 +1134,9 @@ public final class AbilityFireworkBornTypeOuterClass { static { java.lang.String[] descriptorData = { "\n\035AbilityFireworkBornType.proto\032\014Vector." + - "proto\"v\n\027AbilityFireworkBornType\022\031\n\010move" + - "_dir\030\004 \001(\0132\007.Vector\022\024\n\014effect_index\030\007 \001(" + - "\r\022\024\n\003pos\030\002 \001(\0132\007.Vector\022\024\n\003rot\030\006 \001(\0132\007.V" + + "proto\"v\n\027AbilityFireworkBornType\022\024\n\014effe" + + "ct_index\030\016 \001(\r\022\024\n\003rot\030\005 \001(\0132\007.Vector\022\024\n\003" + + "pos\030\014 \001(\0132\007.Vector\022\031\n\010move_dir\030\017 \001(\0132\007.V" + "ectorB\033\n\031emu.grasscutter.net.protob\006prot" + "o3" }; @@ -1150,7 +1150,7 @@ public final class AbilityFireworkBornTypeOuterClass { internal_static_AbilityFireworkBornType_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_AbilityFireworkBornType_descriptor, - new java.lang.String[] { "MoveDir", "EffectIndex", "Pos", "Rot", }); + new java.lang.String[] { "EffectIndex", "Rot", "Pos", "MoveDir", }); emu.grasscutter.net.proto.VectorOuterClass.getDescriptor(); } diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AbilityMetaSetPoseParameterOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AbilityMetaSetPoseParameterOuterClass.java index c83f9778c..861b526e8 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/AbilityMetaSetPoseParameterOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/AbilityMetaSetPoseParameterOuterClass.java @@ -19,23 +19,23 @@ public final class AbilityMetaSetPoseParameterOuterClass { com.google.protobuf.MessageOrBuilder { /** - * .AnimatorParameterValueInfoPair value = 15; + * .AnimatorParameterValueInfoPair value = 1; * @return Whether the value field is set. */ boolean hasValue(); /** - * .AnimatorParameterValueInfoPair value = 15; + * .AnimatorParameterValueInfoPair value = 1; * @return The value. */ emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPair getValue(); /** - * .AnimatorParameterValueInfoPair value = 15; + * .AnimatorParameterValueInfoPair value = 1; */ emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPairOrBuilder getValueOrBuilder(); } /** * 
-   * Obf: FOHAAJOMMPL
+   * Obf: AFDPLNIIALH
    *
* * Protobuf type {@code AbilityMetaSetPoseParameter} @@ -82,7 +82,7 @@ public final class AbilityMetaSetPoseParameterOuterClass { case 0: done = true; break; - case 122: { + case 10: { emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPair.Builder subBuilder = null; if (value_ != null) { subBuilder = value_.toBuilder(); @@ -127,10 +127,10 @@ public final class AbilityMetaSetPoseParameterOuterClass { emu.grasscutter.net.proto.AbilityMetaSetPoseParameterOuterClass.AbilityMetaSetPoseParameter.class, emu.grasscutter.net.proto.AbilityMetaSetPoseParameterOuterClass.AbilityMetaSetPoseParameter.Builder.class); } - public static final int VALUE_FIELD_NUMBER = 15; + public static final int VALUE_FIELD_NUMBER = 1; private emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPair value_; /** - * .AnimatorParameterValueInfoPair value = 15; + * .AnimatorParameterValueInfoPair value = 1; * @return Whether the value field is set. */ @java.lang.Override @@ -138,7 +138,7 @@ public final class AbilityMetaSetPoseParameterOuterClass { return value_ != null; } /** - * .AnimatorParameterValueInfoPair value = 15; + * .AnimatorParameterValueInfoPair value = 1; * @return The value. */ @java.lang.Override @@ -146,7 +146,7 @@ public final class AbilityMetaSetPoseParameterOuterClass { return value_ == null ? emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPair.getDefaultInstance() : value_; } /** - * .AnimatorParameterValueInfoPair value = 15; + * .AnimatorParameterValueInfoPair value = 1; */ @java.lang.Override public emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPairOrBuilder getValueOrBuilder() { @@ -168,7 +168,7 @@ public final class AbilityMetaSetPoseParameterOuterClass { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (value_ != null) { - output.writeMessage(15, getValue()); + output.writeMessage(1, getValue()); } unknownFields.writeTo(output); } @@ -181,7 +181,7 @@ public final class AbilityMetaSetPoseParameterOuterClass { size = 0; if (value_ != null) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(15, getValue()); + .computeMessageSize(1, getValue()); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -315,7 +315,7 @@ public final class AbilityMetaSetPoseParameterOuterClass { } /** * 
-     * Obf: FOHAAJOMMPL
+     * Obf: AFDPLNIIALH
      *
* * Protobuf type {@code AbilityMetaSetPoseParameter} @@ -476,14 +476,14 @@ public final class AbilityMetaSetPoseParameterOuterClass { private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPair, emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPair.Builder, emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPairOrBuilder> valueBuilder_; /** - * .AnimatorParameterValueInfoPair value = 15; + * .AnimatorParameterValueInfoPair value = 1; * @return Whether the value field is set. */ public boolean hasValue() { return valueBuilder_ != null || value_ != null; } /** - * .AnimatorParameterValueInfoPair value = 15; + * .AnimatorParameterValueInfoPair value = 1; * @return The value. */ public emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPair getValue() { @@ -494,7 +494,7 @@ public final class AbilityMetaSetPoseParameterOuterClass { } } /** - * .AnimatorParameterValueInfoPair value = 15; + * .AnimatorParameterValueInfoPair value = 1; */ public Builder setValue(emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPair value) { if (valueBuilder_ == null) { @@ -510,7 +510,7 @@ public final class AbilityMetaSetPoseParameterOuterClass { return this; } /** - * .AnimatorParameterValueInfoPair value = 15; + * .AnimatorParameterValueInfoPair value = 1; */ public Builder setValue( emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPair.Builder builderForValue) { @@ -524,7 +524,7 @@ public final class AbilityMetaSetPoseParameterOuterClass { return this; } /** - * .AnimatorParameterValueInfoPair value = 15; + * .AnimatorParameterValueInfoPair value = 1; */ public Builder mergeValue(emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPair value) { if (valueBuilder_ == null) { @@ -542,7 +542,7 @@ public final class AbilityMetaSetPoseParameterOuterClass { return this; } /** - * .AnimatorParameterValueInfoPair value = 15; + * .AnimatorParameterValueInfoPair value = 1; */ public Builder clearValue() { if (valueBuilder_ == null) { @@ -556,7 +556,7 @@ public final class AbilityMetaSetPoseParameterOuterClass { return this; } /** - * .AnimatorParameterValueInfoPair value = 15; + * .AnimatorParameterValueInfoPair value = 1; */ public emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPair.Builder getValueBuilder() { @@ -564,7 +564,7 @@ public final class AbilityMetaSetPoseParameterOuterClass { return getValueFieldBuilder().getBuilder(); } /** - * .AnimatorParameterValueInfoPair value = 15; + * .AnimatorParameterValueInfoPair value = 1; */ public emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPairOrBuilder getValueOrBuilder() { if (valueBuilder_ != null) { @@ -575,7 +575,7 @@ public final class AbilityMetaSetPoseParameterOuterClass { } } /** - * .AnimatorParameterValueInfoPair value = 15; + * .AnimatorParameterValueInfoPair value = 1; */ private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPair, emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPair.Builder, emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPairOrBuilder> @@ -659,7 +659,7 @@ public final class AbilityMetaSetPoseParameterOuterClass { java.lang.String[] descriptorData = { "\n!AbilityMetaSetPoseParameter.proto\032$Ani" + "matorParameterValueInfoPair.proto\"M\n\033Abi" + - "lityMetaSetPoseParameter\022.\n\005value\030\017 \001(\0132" + + "lityMetaSetPoseParameter\022.\n\005value\030\001 \001(\0132" + "\037.AnimatorParameterValueInfoPairB\033\n\031emu." + "grasscutter.net.protob\006proto3" }; diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ActivityGetFriendGiftWishListReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ActivityGetFriendGiftWishListReqOuterClass.java index b5de9ab1c..c89788826 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/ActivityGetFriendGiftWishListReqOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/ActivityGetFriendGiftWishListReqOuterClass.java @@ -19,15 +19,15 @@ public final class ActivityGetFriendGiftWishListReqOuterClass { com.google.protobuf.MessageOrBuilder { /** - * uint32 schedule_id = 6; + * uint32 schedule_id = 14; * @return The scheduleId. */ int getScheduleId(); } /** * 
-   * CmdId: 8127
-   * Obf: KMIKAFFCKAL
+   * CmdId: 4453
+   * Obf: FKDKFJNGBMH
    *
* * Protobuf type {@code ActivityGetFriendGiftWishListReq} @@ -74,7 +74,7 @@ public final class ActivityGetFriendGiftWishListReqOuterClass { case 0: done = true; break; - case 48: { + case 112: { scheduleId_ = input.readUInt32(); break; @@ -111,10 +111,10 @@ public final class ActivityGetFriendGiftWishListReqOuterClass { emu.grasscutter.net.proto.ActivityGetFriendGiftWishListReqOuterClass.ActivityGetFriendGiftWishListReq.class, emu.grasscutter.net.proto.ActivityGetFriendGiftWishListReqOuterClass.ActivityGetFriendGiftWishListReq.Builder.class); } - public static final int SCHEDULE_ID_FIELD_NUMBER = 6; + public static final int SCHEDULE_ID_FIELD_NUMBER = 14; private int scheduleId_; /** - * uint32 schedule_id = 6; + * uint32 schedule_id = 14; * @return The scheduleId. */ @java.lang.Override @@ -137,7 +137,7 @@ public final class ActivityGetFriendGiftWishListReqOuterClass { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (scheduleId_ != 0) { - output.writeUInt32(6, scheduleId_); + output.writeUInt32(14, scheduleId_); } unknownFields.writeTo(output); } @@ -150,7 +150,7 @@ public final class ActivityGetFriendGiftWishListReqOuterClass { size = 0; if (scheduleId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(6, scheduleId_); + .computeUInt32Size(14, scheduleId_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -279,8 +279,8 @@ public final class ActivityGetFriendGiftWishListReqOuterClass { } /** * 
-     * CmdId: 8127
-     * Obf: KMIKAFFCKAL
+     * CmdId: 4453
+     * Obf: FKDKFJNGBMH
      *
* * Protobuf type {@code ActivityGetFriendGiftWishListReq} @@ -431,7 +431,7 @@ public final class ActivityGetFriendGiftWishListReqOuterClass { private int scheduleId_ ; /** - * uint32 schedule_id = 6; + * uint32 schedule_id = 14; * @return The scheduleId. */ @java.lang.Override @@ -439,7 +439,7 @@ public final class ActivityGetFriendGiftWishListReqOuterClass { return scheduleId_; } /** - * uint32 schedule_id = 6; + * uint32 schedule_id = 14; * @param value The scheduleId to set. * @return This builder for chaining. */ @@ -450,7 +450,7 @@ public final class ActivityGetFriendGiftWishListReqOuterClass { return this; } /** - * uint32 schedule_id = 6; + * uint32 schedule_id = 14; * @return This builder for chaining. */ public Builder clearScheduleId() { @@ -528,7 +528,7 @@ public final class ActivityGetFriendGiftWishListReqOuterClass { java.lang.String[] descriptorData = { "\n&ActivityGetFriendGiftWishListReq.proto" + "\"7\n ActivityGetFriendGiftWishListReq\022\023\n\013" + - "schedule_id\030\006 \001(\rB\033\n\031emu.grasscutter.net" + + "schedule_id\030\016 \001(\rB\033\n\031emu.grasscutter.net" + ".protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ForgeQueueDataOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ForgeQueueDataOuterClass.java index de23757e8..52391b233 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/ForgeQueueDataOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/ForgeQueueDataOuterClass.java @@ -31,29 +31,29 @@ public final class ForgeQueueDataOuterClass { int getAvatarId(); /** - * uint32 queue_id = 3; - * @return The queueId. - */ - int getQueueId(); - - /** - * uint32 finish_count = 14; + * uint32 finish_count = 3; * @return The finishCount. */ int getFinishCount(); /** - * uint32 next_finish_timestamp = 11; - * @return The nextFinishTimestamp. + * uint32 queueId = 14; + * @return The queueId. */ - int getNextFinishTimestamp(); + int getQueueId(); /** - * uint32 unfinish_count = 4; + * uint32 unfinishCount = 11; * @return The unfinishCount. */ int getUnfinishCount(); + /** + * uint32 next_finish_timestamp = 4; + * @return The nextFinishTimestamp. + */ + int getNextFinishTimestamp(); + /** * uint32 forge_id = 15; * @return The forgeId. @@ -111,12 +111,12 @@ public final class ForgeQueueDataOuterClass { break; case 24: { - queueId_ = input.readUInt32(); + finishCount_ = input.readUInt32(); break; } case 32: { - unfinishCount_ = input.readUInt32(); + nextFinishTimestamp_ = input.readUInt32(); break; } case 64: { @@ -126,7 +126,7 @@ public final class ForgeQueueDataOuterClass { } case 88: { - nextFinishTimestamp_ = input.readUInt32(); + unfinishCount_ = input.readUInt32(); break; } case 104: { @@ -136,7 +136,7 @@ public final class ForgeQueueDataOuterClass { } case 112: { - finishCount_ = input.readUInt32(); + queueId_ = input.readUInt32(); break; } case 120: { @@ -198,21 +198,10 @@ public final class ForgeQueueDataOuterClass { return avatarId_; } - public static final int QUEUE_ID_FIELD_NUMBER = 3; - private int queueId_; - /** - * uint32 queue_id = 3; - * @return The queueId. - */ - @java.lang.Override - public int getQueueId() { - return queueId_; - } - - public static final int FINISH_COUNT_FIELD_NUMBER = 14; + public static final int FINISH_COUNT_FIELD_NUMBER = 3; private int finishCount_; /** - * uint32 finish_count = 14; + * uint32 finish_count = 3; * @return The finishCount. */ @java.lang.Override @@ -220,21 +209,21 @@ public final class ForgeQueueDataOuterClass { return finishCount_; } - public static final int NEXT_FINISH_TIMESTAMP_FIELD_NUMBER = 11; - private int nextFinishTimestamp_; + public static final int QUEUEID_FIELD_NUMBER = 14; + private int queueId_; /** - * uint32 next_finish_timestamp = 11; - * @return The nextFinishTimestamp. + * uint32 queueId = 14; + * @return The queueId. */ @java.lang.Override - public int getNextFinishTimestamp() { - return nextFinishTimestamp_; + public int getQueueId() { + return queueId_; } - public static final int UNFINISH_COUNT_FIELD_NUMBER = 4; + public static final int UNFINISHCOUNT_FIELD_NUMBER = 11; private int unfinishCount_; /** - * uint32 unfinish_count = 4; + * uint32 unfinishCount = 11; * @return The unfinishCount. */ @java.lang.Override @@ -242,6 +231,17 @@ public final class ForgeQueueDataOuterClass { return unfinishCount_; } + public static final int NEXT_FINISH_TIMESTAMP_FIELD_NUMBER = 4; + private int nextFinishTimestamp_; + /** + * uint32 next_finish_timestamp = 4; + * @return The nextFinishTimestamp. + */ + @java.lang.Override + public int getNextFinishTimestamp() { + return nextFinishTimestamp_; + } + public static final int FORGE_ID_FIELD_NUMBER = 15; private int forgeId_; /** @@ -267,23 +267,23 @@ public final class ForgeQueueDataOuterClass { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (queueId_ != 0) { - output.writeUInt32(3, queueId_); + if (finishCount_ != 0) { + output.writeUInt32(3, finishCount_); } - if (unfinishCount_ != 0) { - output.writeUInt32(4, unfinishCount_); + if (nextFinishTimestamp_ != 0) { + output.writeUInt32(4, nextFinishTimestamp_); } if (avatarId_ != 0) { output.writeUInt32(8, avatarId_); } - if (nextFinishTimestamp_ != 0) { - output.writeUInt32(11, nextFinishTimestamp_); + if (unfinishCount_ != 0) { + output.writeUInt32(11, unfinishCount_); } if (totalFinishTimestamp_ != 0) { output.writeUInt32(13, totalFinishTimestamp_); } - if (finishCount_ != 0) { - output.writeUInt32(14, finishCount_); + if (queueId_ != 0) { + output.writeUInt32(14, queueId_); } if (forgeId_ != 0) { output.writeUInt32(15, forgeId_); @@ -297,29 +297,29 @@ public final class ForgeQueueDataOuterClass { if (size != -1) return size; size = 0; - if (queueId_ != 0) { + if (finishCount_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(3, queueId_); + .computeUInt32Size(3, finishCount_); } - if (unfinishCount_ != 0) { + if (nextFinishTimestamp_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(4, unfinishCount_); + .computeUInt32Size(4, nextFinishTimestamp_); } if (avatarId_ != 0) { size += com.google.protobuf.CodedOutputStream .computeUInt32Size(8, avatarId_); } - if (nextFinishTimestamp_ != 0) { + if (unfinishCount_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(11, nextFinishTimestamp_); + .computeUInt32Size(11, unfinishCount_); } if (totalFinishTimestamp_ != 0) { size += com.google.protobuf.CodedOutputStream .computeUInt32Size(13, totalFinishTimestamp_); } - if (finishCount_ != 0) { + if (queueId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(14, finishCount_); + .computeUInt32Size(14, queueId_); } if (forgeId_ != 0) { size += com.google.protobuf.CodedOutputStream @@ -344,14 +344,14 @@ public final class ForgeQueueDataOuterClass { != other.getTotalFinishTimestamp()) return false; if (getAvatarId() != other.getAvatarId()) return false; - if (getQueueId() - != other.getQueueId()) return false; if (getFinishCount() != other.getFinishCount()) return false; - if (getNextFinishTimestamp() - != other.getNextFinishTimestamp()) return false; + if (getQueueId() + != other.getQueueId()) return false; if (getUnfinishCount() != other.getUnfinishCount()) return false; + if (getNextFinishTimestamp() + != other.getNextFinishTimestamp()) return false; if (getForgeId() != other.getForgeId()) return false; if (!unknownFields.equals(other.unknownFields)) return false; @@ -369,14 +369,14 @@ public final class ForgeQueueDataOuterClass { hash = (53 * hash) + getTotalFinishTimestamp(); hash = (37 * hash) + AVATAR_ID_FIELD_NUMBER; hash = (53 * hash) + getAvatarId(); - hash = (37 * hash) + QUEUE_ID_FIELD_NUMBER; - hash = (53 * hash) + getQueueId(); hash = (37 * hash) + FINISH_COUNT_FIELD_NUMBER; hash = (53 * hash) + getFinishCount(); + hash = (37 * hash) + QUEUEID_FIELD_NUMBER; + hash = (53 * hash) + getQueueId(); + hash = (37 * hash) + UNFINISHCOUNT_FIELD_NUMBER; + hash = (53 * hash) + getUnfinishCount(); hash = (37 * hash) + NEXT_FINISH_TIMESTAMP_FIELD_NUMBER; hash = (53 * hash) + getNextFinishTimestamp(); - hash = (37 * hash) + UNFINISH_COUNT_FIELD_NUMBER; - hash = (53 * hash) + getUnfinishCount(); hash = (37 * hash) + FORGE_ID_FIELD_NUMBER; hash = (53 * hash) + getForgeId(); hash = (29 * hash) + unknownFields.hashCode(); @@ -520,14 +520,14 @@ public final class ForgeQueueDataOuterClass { avatarId_ = 0; - queueId_ = 0; - finishCount_ = 0; - nextFinishTimestamp_ = 0; + queueId_ = 0; unfinishCount_ = 0; + nextFinishTimestamp_ = 0; + forgeId_ = 0; return this; @@ -558,10 +558,10 @@ public final class ForgeQueueDataOuterClass { emu.grasscutter.net.proto.ForgeQueueDataOuterClass.ForgeQueueData result = new emu.grasscutter.net.proto.ForgeQueueDataOuterClass.ForgeQueueData(this); result.totalFinishTimestamp_ = totalFinishTimestamp_; result.avatarId_ = avatarId_; - result.queueId_ = queueId_; result.finishCount_ = finishCount_; - result.nextFinishTimestamp_ = nextFinishTimestamp_; + result.queueId_ = queueId_; result.unfinishCount_ = unfinishCount_; + result.nextFinishTimestamp_ = nextFinishTimestamp_; result.forgeId_ = forgeId_; onBuilt(); return result; @@ -617,18 +617,18 @@ public final class ForgeQueueDataOuterClass { if (other.getAvatarId() != 0) { setAvatarId(other.getAvatarId()); } - if (other.getQueueId() != 0) { - setQueueId(other.getQueueId()); - } if (other.getFinishCount() != 0) { setFinishCount(other.getFinishCount()); } - if (other.getNextFinishTimestamp() != 0) { - setNextFinishTimestamp(other.getNextFinishTimestamp()); + if (other.getQueueId() != 0) { + setQueueId(other.getQueueId()); } if (other.getUnfinishCount() != 0) { setUnfinishCount(other.getUnfinishCount()); } + if (other.getNextFinishTimestamp() != 0) { + setNextFinishTimestamp(other.getNextFinishTimestamp()); + } if (other.getForgeId() != 0) { setForgeId(other.getForgeId()); } @@ -723,40 +723,9 @@ public final class ForgeQueueDataOuterClass { return this; } - private int queueId_ ; - /** - * uint32 queue_id = 3; - * @return The queueId. - */ - @java.lang.Override - public int getQueueId() { - return queueId_; - } - /** - * uint32 queue_id = 3; - * @param value The queueId to set. - * @return This builder for chaining. - */ - public Builder setQueueId(int value) { - - queueId_ = value; - onChanged(); - return this; - } - /** - * uint32 queue_id = 3; - * @return This builder for chaining. - */ - public Builder clearQueueId() { - - queueId_ = 0; - onChanged(); - return this; - } - private int finishCount_ ; /** - * uint32 finish_count = 14; + * uint32 finish_count = 3; * @return The finishCount. */ @java.lang.Override @@ -764,7 +733,7 @@ public final class ForgeQueueDataOuterClass { return finishCount_; } /** - * uint32 finish_count = 14; + * uint32 finish_count = 3; * @param value The finishCount to set. * @return This builder for chaining. */ @@ -775,7 +744,7 @@ public final class ForgeQueueDataOuterClass { return this; } /** - * uint32 finish_count = 14; + * uint32 finish_count = 3; * @return This builder for chaining. */ public Builder clearFinishCount() { @@ -785,40 +754,40 @@ public final class ForgeQueueDataOuterClass { return this; } - private int nextFinishTimestamp_ ; + private int queueId_ ; /** - * uint32 next_finish_timestamp = 11; - * @return The nextFinishTimestamp. + * uint32 queueId = 14; + * @return The queueId. */ @java.lang.Override - public int getNextFinishTimestamp() { - return nextFinishTimestamp_; + public int getQueueId() { + return queueId_; } /** - * uint32 next_finish_timestamp = 11; - * @param value The nextFinishTimestamp to set. + * uint32 queueId = 14; + * @param value The queueId to set. * @return This builder for chaining. */ - public Builder setNextFinishTimestamp(int value) { + public Builder setQueueId(int value) { - nextFinishTimestamp_ = value; + queueId_ = value; onChanged(); return this; } /** - * uint32 next_finish_timestamp = 11; + * uint32 queueId = 14; * @return This builder for chaining. */ - public Builder clearNextFinishTimestamp() { + public Builder clearQueueId() { - nextFinishTimestamp_ = 0; + queueId_ = 0; onChanged(); return this; } private int unfinishCount_ ; /** - * uint32 unfinish_count = 4; + * uint32 unfinishCount = 11; * @return The unfinishCount. */ @java.lang.Override @@ -826,7 +795,7 @@ public final class ForgeQueueDataOuterClass { return unfinishCount_; } /** - * uint32 unfinish_count = 4; + * uint32 unfinishCount = 11; * @param value The unfinishCount to set. * @return This builder for chaining. */ @@ -837,7 +806,7 @@ public final class ForgeQueueDataOuterClass { return this; } /** - * uint32 unfinish_count = 4; + * uint32 unfinishCount = 11; * @return This builder for chaining. */ public Builder clearUnfinishCount() { @@ -847,6 +816,37 @@ public final class ForgeQueueDataOuterClass { return this; } + private int nextFinishTimestamp_ ; + /** + * uint32 next_finish_timestamp = 4; + * @return The nextFinishTimestamp. + */ + @java.lang.Override + public int getNextFinishTimestamp() { + return nextFinishTimestamp_; + } + /** + * uint32 next_finish_timestamp = 4; + * @param value The nextFinishTimestamp to set. + * @return This builder for chaining. + */ + public Builder setNextFinishTimestamp(int value) { + + nextFinishTimestamp_ = value; + onChanged(); + return this; + } + /** + * uint32 next_finish_timestamp = 4; + * @return This builder for chaining. + */ + public Builder clearNextFinishTimestamp() { + + nextFinishTimestamp_ = 0; + onChanged(); + return this; + } + private int forgeId_ ; /** * uint32 forge_id = 15; @@ -944,13 +944,12 @@ public final class ForgeQueueDataOuterClass { descriptor; static { java.lang.String[] descriptorData = { - "\n\024ForgeQueueData.proto\"\264\001\n\016ForgeQueueDat" + + "\n\024ForgeQueueData.proto\"\262\001\n\016ForgeQueueDat" + "a\022\036\n\026total_finish_timestamp\030\r \001(\r\022\021\n\tava" + - "tar_id\030\010 \001(\r\022\020\n\010queue_id\030\003 \001(\r\022\024\n\014finish" + - "_count\030\016 \001(\r\022\035\n\025next_finish_timestamp\030\013 " + - "\001(\r\022\026\n\016unfinish_count\030\004 \001(\r\022\020\n\010forge_id\030" + - "\017 \001(\rB\033\n\031emu.grasscutter.net.protob\006prot" + - "o3" + "tar_id\030\010 \001(\r\022\024\n\014finish_count\030\003 \001(\r\022\017\n\007qu" + + "eueId\030\016 \001(\r\022\025\n\runfinishCount\030\013 \001(\r\022\035\n\025ne" + + "xt_finish_timestamp\030\004 \001(\r\022\020\n\010forge_id\030\017 " + + "\001(\rB\033\n\031emu.grasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, @@ -961,7 +960,7 @@ public final class ForgeQueueDataOuterClass { internal_static_ForgeQueueData_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_ForgeQueueData_descriptor, - new java.lang.String[] { "TotalFinishTimestamp", "AvatarId", "QueueId", "FinishCount", "NextFinishTimestamp", "UnfinishCount", "ForgeId", }); + new java.lang.String[] { "TotalFinishTimestamp", "AvatarId", "FinishCount", "QueueId", "UnfinishCount", "NextFinishTimestamp", "ForgeId", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GetScenePointRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GetScenePointRspOuterClass.java index 9d060ff87..3eac65540 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/GetScenePointRspOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/GetScenePointRspOuterClass.java @@ -36,21 +36,21 @@ public final class GetScenePointRspOuterClass { int getUnlockedPointList(int index); /** - * repeated uint32 ELDLGKEKABI = 6; - * @return A list containing the eLDLGKEKABI. + * repeated uint32 unhide_point_list = 6; + * @return A list containing the unhidePointList. */ - java.util.List getELDLGKEKABIList(); + java.util.List getUnhidePointListList(); /** - * repeated uint32 ELDLGKEKABI = 6; - * @return The count of eLDLGKEKABI. + * repeated uint32 unhide_point_list = 6; + * @return The count of unhidePointList. */ - int getELDLGKEKABICount(); + int getUnhidePointListCount(); /** - * repeated uint32 ELDLGKEKABI = 6; + * repeated uint32 unhide_point_list = 6; * @param index The index of the element to return. - * @return The eLDLGKEKABI at the given index. + * @return The unhidePointList at the given index. */ - int getELDLGKEKABI(int index); + int getUnhidePointList(int index); /** * bool FBFJPEPMAOF = 9; @@ -65,21 +65,21 @@ public final class GetScenePointRspOuterClass { int getRetcode(); /** - * repeated uint32 GILIFDOOHFF = 12; - * @return A list containing the gILIFDOOHFF. + * repeated uint32 unlock_area_list = 12; + * @return A list containing the unlockAreaList. */ - java.util.List getGILIFDOOHFFList(); + java.util.List getUnlockAreaListList(); /** - * repeated uint32 GILIFDOOHFF = 12; - * @return The count of gILIFDOOHFF. + * repeated uint32 unlock_area_list = 12; + * @return The count of unlockAreaList. */ - int getGILIFDOOHFFCount(); + int getUnlockAreaListCount(); /** - * repeated uint32 GILIFDOOHFF = 12; + * repeated uint32 unlock_area_list = 12; * @param index The index of the element to return. - * @return The gILIFDOOHFF at the given index. + * @return The unlockAreaList at the given index. */ - int getGILIFDOOHFF(int index); + int getUnlockAreaList(int index); /** * repeated uint32 PPDDIADEDIC = 8; @@ -156,21 +156,21 @@ public final class GetScenePointRspOuterClass { int getBelongUid(); /** - * repeated uint32 unlockAreaList = 13; - * @return A list containing the unlockAreaList. + * repeated uint32 JCLHNODLPOH = 13; + * @return A list containing the jCLHNODLPOH. */ - java.util.List getUnlockAreaListList(); + java.util.List getJCLHNODLPOHList(); /** - * repeated uint32 unlockAreaList = 13; - * @return The count of unlockAreaList. + * repeated uint32 JCLHNODLPOH = 13; + * @return The count of jCLHNODLPOH. */ - int getUnlockAreaListCount(); + int getJCLHNODLPOHCount(); /** - * repeated uint32 unlockAreaList = 13; + * repeated uint32 JCLHNODLPOH = 13; * @param index The index of the element to return. - * @return The unlockAreaList at the given index. + * @return The jCLHNODLPOH at the given index. */ - int getUnlockAreaList(int index); + int getJCLHNODLPOH(int index); /** * uint32 scene_id = 2; @@ -179,21 +179,21 @@ public final class GetScenePointRspOuterClass { int getSceneId(); /** - * repeated uint32 unhide_point_list = 3; - * @return A list containing the unhidePointList. + * repeated uint32 KOPAHGHMECF = 3; + * @return A list containing the kOPAHGHMECF. */ - java.util.List getUnhidePointListList(); + java.util.List getKOPAHGHMECFList(); /** - * repeated uint32 unhide_point_list = 3; - * @return The count of unhidePointList. + * repeated uint32 KOPAHGHMECF = 3; + * @return The count of kOPAHGHMECF. */ - int getUnhidePointListCount(); + int getKOPAHGHMECFCount(); /** - * repeated uint32 unhide_point_list = 3; + * repeated uint32 KOPAHGHMECF = 3; * @param index The index of the element to return. - * @return The unhidePointList at the given index. + * @return The kOPAHGHMECF at the given index. */ - int getUnhidePointList(int index); + int getKOPAHGHMECF(int index); } /** * 
@@ -214,14 +214,14 @@ public final class GetScenePointRspOuterClass {
     }
     private GetScenePointRsp() {
       unlockedPointList_ = emptyIntList();
-      eLDLGKEKABI_ = emptyIntList();
-      gILIFDOOHFF_ = emptyIntList();
+      unhidePointList_ = emptyIntList();
+      unlockAreaList_ = emptyIntList();
       pPDDIADEDIC_ = emptyIntList();
       oGKCOCBLNLF_ = emptyIntList();
       eBIFELCKPEA_ = emptyIntList();
       jJOHJDFINFN_ = emptyIntList();
-      unlockAreaList_ = emptyIntList();
-      unhidePointList_ = emptyIntList();
+      jCLHNODLPOH_ = emptyIntList();
+      kOPAHGHMECF_ = emptyIntList();
     }
 
     @java.lang.Override
@@ -283,21 +283,21 @@ public final class GetScenePointRspOuterClass {
             }
             case 24: {
               if (!((mutable_bitField0_ & 0x00000100) != 0)) {
-                unhidePointList_ = newIntList();
+                kOPAHGHMECF_ = newIntList();
                 mutable_bitField0_ |= 0x00000100;
               }
-              unhidePointList_.addInt(input.readUInt32());
+              kOPAHGHMECF_.addInt(input.readUInt32());
               break;
             }
             case 26: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000100) != 0) && input.getBytesUntilLimit() > 0) {
-                unhidePointList_ = newIntList();
+                kOPAHGHMECF_ = newIntList();
                 mutable_bitField0_ |= 0x00000100;
               }
               while (input.getBytesUntilLimit() > 0) {
-                unhidePointList_.addInt(input.readUInt32());
+                kOPAHGHMECF_.addInt(input.readUInt32());
               }
               input.popLimit(limit);
               break;
@@ -325,21 +325,21 @@ public final class GetScenePointRspOuterClass {
             }
             case 48: {
               if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                eLDLGKEKABI_ = newIntList();
+                unhidePointList_ = newIntList();
                 mutable_bitField0_ |= 0x00000002;
               }
-              eLDLGKEKABI_.addInt(input.readUInt32());
+              unhidePointList_.addInt(input.readUInt32());
               break;
             }
             case 50: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) {
-                eLDLGKEKABI_ = newIntList();
+                unhidePointList_ = newIntList();
                 mutable_bitField0_ |= 0x00000002;
               }
               while (input.getBytesUntilLimit() > 0) {
-                eLDLGKEKABI_.addInt(input.readUInt32());
+                unhidePointList_.addInt(input.readUInt32());
               }
               input.popLimit(limit);
               break;
@@ -419,42 +419,42 @@ public final class GetScenePointRspOuterClass {
             }
             case 96: {
               if (!((mutable_bitField0_ & 0x00000004) != 0)) {
-                gILIFDOOHFF_ = newIntList();
+                unlockAreaList_ = newIntList();
                 mutable_bitField0_ |= 0x00000004;
               }
-              gILIFDOOHFF_.addInt(input.readUInt32());
+              unlockAreaList_.addInt(input.readUInt32());
               break;
             }
             case 98: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000004) != 0) && input.getBytesUntilLimit() > 0) {
-                gILIFDOOHFF_ = newIntList();
+                unlockAreaList_ = newIntList();
                 mutable_bitField0_ |= 0x00000004;
               }
               while (input.getBytesUntilLimit() > 0) {
-                gILIFDOOHFF_.addInt(input.readUInt32());
+                unlockAreaList_.addInt(input.readUInt32());
               }
               input.popLimit(limit);
               break;
             }
             case 104: {
               if (!((mutable_bitField0_ & 0x00000080) != 0)) {
-                unlockAreaList_ = newIntList();
+                jCLHNODLPOH_ = newIntList();
                 mutable_bitField0_ |= 0x00000080;
               }
-              unlockAreaList_.addInt(input.readUInt32());
+              jCLHNODLPOH_.addInt(input.readUInt32());
               break;
             }
             case 106: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000080) != 0) && input.getBytesUntilLimit() > 0) {
-                unlockAreaList_ = newIntList();
+                jCLHNODLPOH_ = newIntList();
                 mutable_bitField0_ |= 0x00000080;
               }
               while (input.getBytesUntilLimit() > 0) {
-                unlockAreaList_.addInt(input.readUInt32());
+                jCLHNODLPOH_.addInt(input.readUInt32());
               }
               input.popLimit(limit);
               break;
@@ -483,13 +483,13 @@ public final class GetScenePointRspOuterClass {
           unlockedPointList_.makeImmutable(); // C
         }
         if (((mutable_bitField0_ & 0x00000100) != 0)) {
-          unhidePointList_.makeImmutable(); // C
+          kOPAHGHMECF_.makeImmutable(); // C
         }
         if (((mutable_bitField0_ & 0x00000040) != 0)) {
           jJOHJDFINFN_.makeImmutable(); // C
         }
         if (((mutable_bitField0_ & 0x00000002) != 0)) {
-          eLDLGKEKABI_.makeImmutable(); // C
+          unhidePointList_.makeImmutable(); // C
         }
         if (((mutable_bitField0_ & 0x00000020) != 0)) {
           eBIFELCKPEA_.makeImmutable(); // C
@@ -501,10 +501,10 @@ public final class GetScenePointRspOuterClass {
           oGKCOCBLNLF_.makeImmutable(); // C
         }
         if (((mutable_bitField0_ & 0x00000004) != 0)) {
-          gILIFDOOHFF_.makeImmutable(); // C
+          unlockAreaList_.makeImmutable(); // C
         }
         if (((mutable_bitField0_ & 0x00000080) != 0)) {
-          unlockAreaList_.makeImmutable(); // C
+          jCLHNODLPOH_.makeImmutable(); // C
         }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
@@ -551,33 +551,33 @@ public final class GetScenePointRspOuterClass {
     }
     private int unlockedPointListMemoizedSerializedSize = -1;
 
-    public static final int ELDLGKEKABI_FIELD_NUMBER = 6;
-    private com.google.protobuf.Internal.IntList eLDLGKEKABI_;
+    public static final int UNHIDE_POINT_LIST_FIELD_NUMBER = 6;
+    private com.google.protobuf.Internal.IntList unhidePointList_;
     /**
-     * repeated uint32 ELDLGKEKABI = 6;
-     * @return A list containing the eLDLGKEKABI.
+     * repeated uint32 unhide_point_list = 6;
+     * @return A list containing the unhidePointList.
      */
     @java.lang.Override
     public java.util.List
-        getELDLGKEKABIList() {
-      return eLDLGKEKABI_;
+        getUnhidePointListList() {
+      return unhidePointList_;
     }
     /**
-     * repeated uint32 ELDLGKEKABI = 6;
-     * @return The count of eLDLGKEKABI.
+     * repeated uint32 unhide_point_list = 6;
+     * @return The count of unhidePointList.
      */
-    public int getELDLGKEKABICount() {
-      return eLDLGKEKABI_.size();
+    public int getUnhidePointListCount() {
+      return unhidePointList_.size();
     }
     /**
-     * repeated uint32 ELDLGKEKABI = 6;
+     * repeated uint32 unhide_point_list = 6;
      * @param index The index of the element to return.
-     * @return The eLDLGKEKABI at the given index.
+     * @return The unhidePointList at the given index.
      */
-    public int getELDLGKEKABI(int index) {
-      return eLDLGKEKABI_.getInt(index);
+    public int getUnhidePointList(int index) {
+      return unhidePointList_.getInt(index);
     }
-    private int eLDLGKEKABIMemoizedSerializedSize = -1;
+    private int unhidePointListMemoizedSerializedSize = -1;
 
     public static final int FBFJPEPMAOF_FIELD_NUMBER = 9;
     private boolean fBFJPEPMAOF_;
@@ -601,33 +601,33 @@ public final class GetScenePointRspOuterClass {
       return retcode_;
     }
 
-    public static final int GILIFDOOHFF_FIELD_NUMBER = 12;
-    private com.google.protobuf.Internal.IntList gILIFDOOHFF_;
+    public static final int UNLOCK_AREA_LIST_FIELD_NUMBER = 12;
+    private com.google.protobuf.Internal.IntList unlockAreaList_;
     /**
-     * repeated uint32 GILIFDOOHFF = 12;
-     * @return A list containing the gILIFDOOHFF.
+     * repeated uint32 unlock_area_list = 12;
+     * @return A list containing the unlockAreaList.
      */
     @java.lang.Override
     public java.util.List
-        getGILIFDOOHFFList() {
-      return gILIFDOOHFF_;
+        getUnlockAreaListList() {
+      return unlockAreaList_;
     }
     /**
-     * repeated uint32 GILIFDOOHFF = 12;
-     * @return The count of gILIFDOOHFF.
+     * repeated uint32 unlock_area_list = 12;
+     * @return The count of unlockAreaList.
      */
-    public int getGILIFDOOHFFCount() {
-      return gILIFDOOHFF_.size();
+    public int getUnlockAreaListCount() {
+      return unlockAreaList_.size();
     }
     /**
-     * repeated uint32 GILIFDOOHFF = 12;
+     * repeated uint32 unlock_area_list = 12;
      * @param index The index of the element to return.
-     * @return The gILIFDOOHFF at the given index.
+     * @return The unlockAreaList at the given index.
      */
-    public int getGILIFDOOHFF(int index) {
-      return gILIFDOOHFF_.getInt(index);
+    public int getUnlockAreaList(int index) {
+      return unlockAreaList_.getInt(index);
     }
-    private int gILIFDOOHFFMemoizedSerializedSize = -1;
+    private int unlockAreaListMemoizedSerializedSize = -1;
 
     public static final int PPDDIADEDIC_FIELD_NUMBER = 8;
     private com.google.protobuf.Internal.IntList pPDDIADEDIC_;
@@ -752,33 +752,33 @@ public final class GetScenePointRspOuterClass {
       return belongUid_;
     }
 
-    public static final int UNLOCKAREALIST_FIELD_NUMBER = 13;
-    private com.google.protobuf.Internal.IntList unlockAreaList_;
+    public static final int JCLHNODLPOH_FIELD_NUMBER = 13;
+    private com.google.protobuf.Internal.IntList jCLHNODLPOH_;
     /**
-     * repeated uint32 unlockAreaList = 13;
-     * @return A list containing the unlockAreaList.
+     * repeated uint32 JCLHNODLPOH = 13;
+     * @return A list containing the jCLHNODLPOH.
      */
     @java.lang.Override
     public java.util.List
-        getUnlockAreaListList() {
-      return unlockAreaList_;
+        getJCLHNODLPOHList() {
+      return jCLHNODLPOH_;
     }
     /**
-     * repeated uint32 unlockAreaList = 13;
-     * @return The count of unlockAreaList.
+     * repeated uint32 JCLHNODLPOH = 13;
+     * @return The count of jCLHNODLPOH.
      */
-    public int getUnlockAreaListCount() {
-      return unlockAreaList_.size();
+    public int getJCLHNODLPOHCount() {
+      return jCLHNODLPOH_.size();
     }
     /**
-     * repeated uint32 unlockAreaList = 13;
+     * repeated uint32 JCLHNODLPOH = 13;
      * @param index The index of the element to return.
-     * @return The unlockAreaList at the given index.
+     * @return The jCLHNODLPOH at the given index.
      */
-    public int getUnlockAreaList(int index) {
-      return unlockAreaList_.getInt(index);
+    public int getJCLHNODLPOH(int index) {
+      return jCLHNODLPOH_.getInt(index);
     }
-    private int unlockAreaListMemoizedSerializedSize = -1;
+    private int jCLHNODLPOHMemoizedSerializedSize = -1;
 
     public static final int SCENE_ID_FIELD_NUMBER = 2;
     private int sceneId_;
@@ -791,33 +791,33 @@ public final class GetScenePointRspOuterClass {
       return sceneId_;
     }
 
-    public static final int UNHIDE_POINT_LIST_FIELD_NUMBER = 3;
-    private com.google.protobuf.Internal.IntList unhidePointList_;
+    public static final int KOPAHGHMECF_FIELD_NUMBER = 3;
+    private com.google.protobuf.Internal.IntList kOPAHGHMECF_;
     /**
-     * repeated uint32 unhide_point_list = 3;
-     * @return A list containing the unhidePointList.
+     * repeated uint32 KOPAHGHMECF = 3;
+     * @return A list containing the kOPAHGHMECF.
      */
     @java.lang.Override
     public java.util.List
-        getUnhidePointListList() {
-      return unhidePointList_;
+        getKOPAHGHMECFList() {
+      return kOPAHGHMECF_;
     }
     /**
-     * repeated uint32 unhide_point_list = 3;
-     * @return The count of unhidePointList.
+     * repeated uint32 KOPAHGHMECF = 3;
+     * @return The count of kOPAHGHMECF.
      */
-    public int getUnhidePointListCount() {
-      return unhidePointList_.size();
+    public int getKOPAHGHMECFCount() {
+      return kOPAHGHMECF_.size();
     }
     /**
-     * repeated uint32 unhide_point_list = 3;
+     * repeated uint32 KOPAHGHMECF = 3;
      * @param index The index of the element to return.
-     * @return The unhidePointList at the given index.
+     * @return The kOPAHGHMECF at the given index.
      */
-    public int getUnhidePointList(int index) {
-      return unhidePointList_.getInt(index);
+    public int getKOPAHGHMECF(int index) {
+      return kOPAHGHMECF_.getInt(index);
     }
-    private int unhidePointListMemoizedSerializedSize = -1;
+    private int kOPAHGHMECFMemoizedSerializedSize = -1;
 
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
@@ -844,12 +844,12 @@ public final class GetScenePointRspOuterClass {
       if (sceneId_ != 0) {
         output.writeUInt32(2, sceneId_);
       }
-      if (getUnhidePointListList().size() > 0) {
+      if (getKOPAHGHMECFList().size() > 0) {
         output.writeUInt32NoTag(26);
-        output.writeUInt32NoTag(unhidePointListMemoizedSerializedSize);
+        output.writeUInt32NoTag(kOPAHGHMECFMemoizedSerializedSize);
       }
-      for (int i = 0; i < unhidePointList_.size(); i++) {
-        output.writeUInt32NoTag(unhidePointList_.getInt(i));
+      for (int i = 0; i < kOPAHGHMECF_.size(); i++) {
+        output.writeUInt32NoTag(kOPAHGHMECF_.getInt(i));
       }
       if (getJJOHJDFINFNList().size() > 0) {
         output.writeUInt32NoTag(34);
@@ -858,12 +858,12 @@ public final class GetScenePointRspOuterClass {
       for (int i = 0; i < jJOHJDFINFN_.size(); i++) {
         output.writeUInt32NoTag(jJOHJDFINFN_.getInt(i));
       }
-      if (getELDLGKEKABIList().size() > 0) {
+      if (getUnhidePointListList().size() > 0) {
         output.writeUInt32NoTag(50);
-        output.writeUInt32NoTag(eLDLGKEKABIMemoizedSerializedSize);
+        output.writeUInt32NoTag(unhidePointListMemoizedSerializedSize);
       }
-      for (int i = 0; i < eLDLGKEKABI_.size(); i++) {
-        output.writeUInt32NoTag(eLDLGKEKABI_.getInt(i));
+      for (int i = 0; i < unhidePointList_.size(); i++) {
+        output.writeUInt32NoTag(unhidePointList_.getInt(i));
       }
       if (getEBIFELCKPEAList().size() > 0) {
         output.writeUInt32NoTag(58);
@@ -892,20 +892,20 @@ public final class GetScenePointRspOuterClass {
       if (retcode_ != 0) {
         output.writeInt32(11, retcode_);
       }
-      if (getGILIFDOOHFFList().size() > 0) {
-        output.writeUInt32NoTag(98);
-        output.writeUInt32NoTag(gILIFDOOHFFMemoizedSerializedSize);
-      }
-      for (int i = 0; i < gILIFDOOHFF_.size(); i++) {
-        output.writeUInt32NoTag(gILIFDOOHFF_.getInt(i));
-      }
       if (getUnlockAreaListList().size() > 0) {
-        output.writeUInt32NoTag(106);
+        output.writeUInt32NoTag(98);
         output.writeUInt32NoTag(unlockAreaListMemoizedSerializedSize);
       }
       for (int i = 0; i < unlockAreaList_.size(); i++) {
         output.writeUInt32NoTag(unlockAreaList_.getInt(i));
       }
+      if (getJCLHNODLPOHList().size() > 0) {
+        output.writeUInt32NoTag(106);
+        output.writeUInt32NoTag(jCLHNODLPOHMemoizedSerializedSize);
+      }
+      for (int i = 0; i < jCLHNODLPOH_.size(); i++) {
+        output.writeUInt32NoTag(jCLHNODLPOH_.getInt(i));
+      }
       if (belongUid_ != 0) {
         output.writeUInt32(14, belongUid_);
       }
@@ -938,17 +938,17 @@ public final class GetScenePointRspOuterClass {
       }
       {
         int dataSize = 0;
-        for (int i = 0; i < unhidePointList_.size(); i++) {
+        for (int i = 0; i < kOPAHGHMECF_.size(); i++) {
           dataSize += com.google.protobuf.CodedOutputStream
-            .computeUInt32SizeNoTag(unhidePointList_.getInt(i));
+            .computeUInt32SizeNoTag(kOPAHGHMECF_.getInt(i));
         }
         size += dataSize;
-        if (!getUnhidePointListList().isEmpty()) {
+        if (!getKOPAHGHMECFList().isEmpty()) {
           size += 1;
           size += com.google.protobuf.CodedOutputStream
               .computeInt32SizeNoTag(dataSize);
         }
-        unhidePointListMemoizedSerializedSize = dataSize;
+        kOPAHGHMECFMemoizedSerializedSize = dataSize;
       }
       {
         int dataSize = 0;
@@ -966,17 +966,17 @@ public final class GetScenePointRspOuterClass {
       }
       {
         int dataSize = 0;
-        for (int i = 0; i < eLDLGKEKABI_.size(); i++) {
+        for (int i = 0; i < unhidePointList_.size(); i++) {
           dataSize += com.google.protobuf.CodedOutputStream
-            .computeUInt32SizeNoTag(eLDLGKEKABI_.getInt(i));
+            .computeUInt32SizeNoTag(unhidePointList_.getInt(i));
         }
         size += dataSize;
-        if (!getELDLGKEKABIList().isEmpty()) {
+        if (!getUnhidePointListList().isEmpty()) {
           size += 1;
           size += com.google.protobuf.CodedOutputStream
               .computeInt32SizeNoTag(dataSize);
         }
-        eLDLGKEKABIMemoizedSerializedSize = dataSize;
+        unhidePointListMemoizedSerializedSize = dataSize;
       }
       {
         int dataSize = 0;
@@ -1028,20 +1028,6 @@ public final class GetScenePointRspOuterClass {
         size += com.google.protobuf.CodedOutputStream
           .computeInt32Size(11, retcode_);
       }
-      {
-        int dataSize = 0;
-        for (int i = 0; i < gILIFDOOHFF_.size(); i++) {
-          dataSize += com.google.protobuf.CodedOutputStream
-            .computeUInt32SizeNoTag(gILIFDOOHFF_.getInt(i));
-        }
-        size += dataSize;
-        if (!getGILIFDOOHFFList().isEmpty()) {
-          size += 1;
-          size += com.google.protobuf.CodedOutputStream
-              .computeInt32SizeNoTag(dataSize);
-        }
-        gILIFDOOHFFMemoizedSerializedSize = dataSize;
-      }
       {
         int dataSize = 0;
         for (int i = 0; i < unlockAreaList_.size(); i++) {
@@ -1056,6 +1042,20 @@ public final class GetScenePointRspOuterClass {
         }
         unlockAreaListMemoizedSerializedSize = dataSize;
       }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < jCLHNODLPOH_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeUInt32SizeNoTag(jCLHNODLPOH_.getInt(i));
+        }
+        size += dataSize;
+        if (!getJCLHNODLPOHList().isEmpty()) {
+          size += 1;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        jCLHNODLPOHMemoizedSerializedSize = dataSize;
+      }
       if (belongUid_ != 0) {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(14, belongUid_);
@@ -1077,14 +1077,14 @@ public final class GetScenePointRspOuterClass {
 
       if (!getUnlockedPointListList()
           .equals(other.getUnlockedPointListList())) return false;
-      if (!getELDLGKEKABIList()
-          .equals(other.getELDLGKEKABIList())) return false;
+      if (!getUnhidePointListList()
+          .equals(other.getUnhidePointListList())) return false;
       if (getFBFJPEPMAOF()
           != other.getFBFJPEPMAOF()) return false;
       if (getRetcode()
           != other.getRetcode()) return false;
-      if (!getGILIFDOOHFFList()
-          .equals(other.getGILIFDOOHFFList())) return false;
+      if (!getUnlockAreaListList()
+          .equals(other.getUnlockAreaListList())) return false;
       if (!getPPDDIADEDICList()
           .equals(other.getPPDDIADEDICList())) return false;
       if (!getOGKCOCBLNLFList()
@@ -1095,12 +1095,12 @@ public final class GetScenePointRspOuterClass {
           .equals(other.getJJOHJDFINFNList())) return false;
       if (getBelongUid()
           != other.getBelongUid()) return false;
-      if (!getUnlockAreaListList()
-          .equals(other.getUnlockAreaListList())) return false;
+      if (!getJCLHNODLPOHList()
+          .equals(other.getJCLHNODLPOHList())) return false;
       if (getSceneId()
           != other.getSceneId()) return false;
-      if (!getUnhidePointListList()
-          .equals(other.getUnhidePointListList())) return false;
+      if (!getKOPAHGHMECFList()
+          .equals(other.getKOPAHGHMECFList())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -1116,18 +1116,18 @@ public final class GetScenePointRspOuterClass {
         hash = (37 * hash) + UNLOCKED_POINT_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getUnlockedPointListList().hashCode();
       }
-      if (getELDLGKEKABICount() > 0) {
-        hash = (37 * hash) + ELDLGKEKABI_FIELD_NUMBER;
-        hash = (53 * hash) + getELDLGKEKABIList().hashCode();
+      if (getUnhidePointListCount() > 0) {
+        hash = (37 * hash) + UNHIDE_POINT_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getUnhidePointListList().hashCode();
       }
       hash = (37 * hash) + FBFJPEPMAOF_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getFBFJPEPMAOF());
       hash = (37 * hash) + RETCODE_FIELD_NUMBER;
       hash = (53 * hash) + getRetcode();
-      if (getGILIFDOOHFFCount() > 0) {
-        hash = (37 * hash) + GILIFDOOHFF_FIELD_NUMBER;
-        hash = (53 * hash) + getGILIFDOOHFFList().hashCode();
+      if (getUnlockAreaListCount() > 0) {
+        hash = (37 * hash) + UNLOCK_AREA_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getUnlockAreaListList().hashCode();
       }
       if (getPPDDIADEDICCount() > 0) {
         hash = (37 * hash) + PPDDIADEDIC_FIELD_NUMBER;
@@ -1147,15 +1147,15 @@ public final class GetScenePointRspOuterClass {
       }
       hash = (37 * hash) + BELONG_UID_FIELD_NUMBER;
       hash = (53 * hash) + getBelongUid();
-      if (getUnlockAreaListCount() > 0) {
-        hash = (37 * hash) + UNLOCKAREALIST_FIELD_NUMBER;
-        hash = (53 * hash) + getUnlockAreaListList().hashCode();
+      if (getJCLHNODLPOHCount() > 0) {
+        hash = (37 * hash) + JCLHNODLPOH_FIELD_NUMBER;
+        hash = (53 * hash) + getJCLHNODLPOHList().hashCode();
       }
       hash = (37 * hash) + SCENE_ID_FIELD_NUMBER;
       hash = (53 * hash) + getSceneId();
-      if (getUnhidePointListCount() > 0) {
-        hash = (37 * hash) + UNHIDE_POINT_LIST_FIELD_NUMBER;
-        hash = (53 * hash) + getUnhidePointListList().hashCode();
+      if (getKOPAHGHMECFCount() > 0) {
+        hash = (37 * hash) + KOPAHGHMECF_FIELD_NUMBER;
+        hash = (53 * hash) + getKOPAHGHMECFList().hashCode();
       }
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
@@ -1297,13 +1297,13 @@ public final class GetScenePointRspOuterClass {
         super.clear();
         unlockedPointList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000001);
-        eLDLGKEKABI_ = emptyIntList();
+        unhidePointList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000002);
         fBFJPEPMAOF_ = false;
 
         retcode_ = 0;
 
-        gILIFDOOHFF_ = emptyIntList();
+        unlockAreaList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000004);
         pPDDIADEDIC_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000008);
@@ -1315,11 +1315,11 @@ public final class GetScenePointRspOuterClass {
         bitField0_ = (bitField0_ & ~0x00000040);
         belongUid_ = 0;
 
-        unlockAreaList_ = emptyIntList();
+        jCLHNODLPOH_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000080);
         sceneId_ = 0;
 
-        unhidePointList_ = emptyIntList();
+        kOPAHGHMECF_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000100);
         return this;
       }
@@ -1354,17 +1354,17 @@ public final class GetScenePointRspOuterClass {
         }
         result.unlockedPointList_ = unlockedPointList_;
         if (((bitField0_ & 0x00000002) != 0)) {
-          eLDLGKEKABI_.makeImmutable();
+          unhidePointList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000002);
         }
-        result.eLDLGKEKABI_ = eLDLGKEKABI_;
+        result.unhidePointList_ = unhidePointList_;
         result.fBFJPEPMAOF_ = fBFJPEPMAOF_;
         result.retcode_ = retcode_;
         if (((bitField0_ & 0x00000004) != 0)) {
-          gILIFDOOHFF_.makeImmutable();
+          unlockAreaList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000004);
         }
-        result.gILIFDOOHFF_ = gILIFDOOHFF_;
+        result.unlockAreaList_ = unlockAreaList_;
         if (((bitField0_ & 0x00000008) != 0)) {
           pPDDIADEDIC_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000008);
@@ -1387,16 +1387,16 @@ public final class GetScenePointRspOuterClass {
         result.jJOHJDFINFN_ = jJOHJDFINFN_;
         result.belongUid_ = belongUid_;
         if (((bitField0_ & 0x00000080) != 0)) {
-          unlockAreaList_.makeImmutable();
+          jCLHNODLPOH_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000080);
         }
-        result.unlockAreaList_ = unlockAreaList_;
+        result.jCLHNODLPOH_ = jCLHNODLPOH_;
         result.sceneId_ = sceneId_;
         if (((bitField0_ & 0x00000100) != 0)) {
-          unhidePointList_.makeImmutable();
+          kOPAHGHMECF_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000100);
         }
-        result.unhidePointList_ = unhidePointList_;
+        result.kOPAHGHMECF_ = kOPAHGHMECF_;
         onBuilt();
         return result;
       }
@@ -1455,13 +1455,13 @@ public final class GetScenePointRspOuterClass {
           }
           onChanged();
         }
-        if (!other.eLDLGKEKABI_.isEmpty()) {
-          if (eLDLGKEKABI_.isEmpty()) {
-            eLDLGKEKABI_ = other.eLDLGKEKABI_;
+        if (!other.unhidePointList_.isEmpty()) {
+          if (unhidePointList_.isEmpty()) {
+            unhidePointList_ = other.unhidePointList_;
             bitField0_ = (bitField0_ & ~0x00000002);
           } else {
-            ensureELDLGKEKABIIsMutable();
-            eLDLGKEKABI_.addAll(other.eLDLGKEKABI_);
+            ensureUnhidePointListIsMutable();
+            unhidePointList_.addAll(other.unhidePointList_);
           }
           onChanged();
         }
@@ -1471,13 +1471,13 @@ public final class GetScenePointRspOuterClass {
         if (other.getRetcode() != 0) {
           setRetcode(other.getRetcode());
         }
-        if (!other.gILIFDOOHFF_.isEmpty()) {
-          if (gILIFDOOHFF_.isEmpty()) {
-            gILIFDOOHFF_ = other.gILIFDOOHFF_;
+        if (!other.unlockAreaList_.isEmpty()) {
+          if (unlockAreaList_.isEmpty()) {
+            unlockAreaList_ = other.unlockAreaList_;
             bitField0_ = (bitField0_ & ~0x00000004);
           } else {
-            ensureGILIFDOOHFFIsMutable();
-            gILIFDOOHFF_.addAll(other.gILIFDOOHFF_);
+            ensureUnlockAreaListIsMutable();
+            unlockAreaList_.addAll(other.unlockAreaList_);
           }
           onChanged();
         }
@@ -1524,26 +1524,26 @@ public final class GetScenePointRspOuterClass {
         if (other.getBelongUid() != 0) {
           setBelongUid(other.getBelongUid());
         }
-        if (!other.unlockAreaList_.isEmpty()) {
-          if (unlockAreaList_.isEmpty()) {
-            unlockAreaList_ = other.unlockAreaList_;
+        if (!other.jCLHNODLPOH_.isEmpty()) {
+          if (jCLHNODLPOH_.isEmpty()) {
+            jCLHNODLPOH_ = other.jCLHNODLPOH_;
             bitField0_ = (bitField0_ & ~0x00000080);
           } else {
-            ensureUnlockAreaListIsMutable();
-            unlockAreaList_.addAll(other.unlockAreaList_);
+            ensureJCLHNODLPOHIsMutable();
+            jCLHNODLPOH_.addAll(other.jCLHNODLPOH_);
           }
           onChanged();
         }
         if (other.getSceneId() != 0) {
           setSceneId(other.getSceneId());
         }
-        if (!other.unhidePointList_.isEmpty()) {
-          if (unhidePointList_.isEmpty()) {
-            unhidePointList_ = other.unhidePointList_;
+        if (!other.kOPAHGHMECF_.isEmpty()) {
+          if (kOPAHGHMECF_.isEmpty()) {
+            kOPAHGHMECF_ = other.kOPAHGHMECF_;
             bitField0_ = (bitField0_ & ~0x00000100);
           } else {
-            ensureUnhidePointListIsMutable();
-            unhidePointList_.addAll(other.unhidePointList_);
+            ensureKOPAHGHMECFIsMutable();
+            kOPAHGHMECF_.addAll(other.kOPAHGHMECF_);
           }
           onChanged();
         }
@@ -1656,80 +1656,80 @@ public final class GetScenePointRspOuterClass {
         return this;
       }
 
-      private com.google.protobuf.Internal.IntList eLDLGKEKABI_ = emptyIntList();
-      private void ensureELDLGKEKABIIsMutable() {
+      private com.google.protobuf.Internal.IntList unhidePointList_ = emptyIntList();
+      private void ensureUnhidePointListIsMutable() {
         if (!((bitField0_ & 0x00000002) != 0)) {
-          eLDLGKEKABI_ = mutableCopy(eLDLGKEKABI_);
+          unhidePointList_ = mutableCopy(unhidePointList_);
           bitField0_ |= 0x00000002;
          }
       }
       /**
-       * repeated uint32 ELDLGKEKABI = 6;
-       * @return A list containing the eLDLGKEKABI.
+       * repeated uint32 unhide_point_list = 6;
+       * @return A list containing the unhidePointList.
        */
       public java.util.List
-          getELDLGKEKABIList() {
+          getUnhidePointListList() {
         return ((bitField0_ & 0x00000002) != 0) ?
-                 java.util.Collections.unmodifiableList(eLDLGKEKABI_) : eLDLGKEKABI_;
+                 java.util.Collections.unmodifiableList(unhidePointList_) : unhidePointList_;
       }
       /**
-       * repeated uint32 ELDLGKEKABI = 6;
-       * @return The count of eLDLGKEKABI.
+       * repeated uint32 unhide_point_list = 6;
+       * @return The count of unhidePointList.
        */
-      public int getELDLGKEKABICount() {
-        return eLDLGKEKABI_.size();
+      public int getUnhidePointListCount() {
+        return unhidePointList_.size();
       }
       /**
-       * repeated uint32 ELDLGKEKABI = 6;
+       * repeated uint32 unhide_point_list = 6;
        * @param index The index of the element to return.
-       * @return The eLDLGKEKABI at the given index.
+       * @return The unhidePointList at the given index.
        */
-      public int getELDLGKEKABI(int index) {
-        return eLDLGKEKABI_.getInt(index);
+      public int getUnhidePointList(int index) {
+        return unhidePointList_.getInt(index);
       }
       /**
-       * repeated uint32 ELDLGKEKABI = 6;
+       * repeated uint32 unhide_point_list = 6;
        * @param index The index to set the value at.
-       * @param value The eLDLGKEKABI to set.
+       * @param value The unhidePointList to set.
        * @return This builder for chaining.
        */
-      public Builder setELDLGKEKABI(
+      public Builder setUnhidePointList(
           int index, int value) {
-        ensureELDLGKEKABIIsMutable();
-        eLDLGKEKABI_.setInt(index, value);
+        ensureUnhidePointListIsMutable();
+        unhidePointList_.setInt(index, value);
         onChanged();
         return this;
       }
       /**
-       * repeated uint32 ELDLGKEKABI = 6;
-       * @param value The eLDLGKEKABI to add.
+       * repeated uint32 unhide_point_list = 6;
+       * @param value The unhidePointList to add.
        * @return This builder for chaining.
        */
-      public Builder addELDLGKEKABI(int value) {
-        ensureELDLGKEKABIIsMutable();
-        eLDLGKEKABI_.addInt(value);
+      public Builder addUnhidePointList(int value) {
+        ensureUnhidePointListIsMutable();
+        unhidePointList_.addInt(value);
         onChanged();
         return this;
       }
       /**
-       * repeated uint32 ELDLGKEKABI = 6;
-       * @param values The eLDLGKEKABI to add.
+       * repeated uint32 unhide_point_list = 6;
+       * @param values The unhidePointList to add.
        * @return This builder for chaining.
        */
-      public Builder addAllELDLGKEKABI(
+      public Builder addAllUnhidePointList(
           java.lang.Iterable values) {
-        ensureELDLGKEKABIIsMutable();
+        ensureUnhidePointListIsMutable();
         com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, eLDLGKEKABI_);
+            values, unhidePointList_);
         onChanged();
         return this;
       }
       /**
-       * repeated uint32 ELDLGKEKABI = 6;
+       * repeated uint32 unhide_point_list = 6;
        * @return This builder for chaining.
        */
-      public Builder clearELDLGKEKABI() {
-        eLDLGKEKABI_ = emptyIntList();
+      public Builder clearUnhidePointList() {
+        unhidePointList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
@@ -1797,80 +1797,80 @@ public final class GetScenePointRspOuterClass {
         return this;
       }
 
-      private com.google.protobuf.Internal.IntList gILIFDOOHFF_ = emptyIntList();
-      private void ensureGILIFDOOHFFIsMutable() {
+      private com.google.protobuf.Internal.IntList unlockAreaList_ = emptyIntList();
+      private void ensureUnlockAreaListIsMutable() {
         if (!((bitField0_ & 0x00000004) != 0)) {
-          gILIFDOOHFF_ = mutableCopy(gILIFDOOHFF_);
+          unlockAreaList_ = mutableCopy(unlockAreaList_);
           bitField0_ |= 0x00000004;
          }
       }
       /**
-       * repeated uint32 GILIFDOOHFF = 12;
-       * @return A list containing the gILIFDOOHFF.
+       * repeated uint32 unlock_area_list = 12;
+       * @return A list containing the unlockAreaList.
        */
       public java.util.List
-          getGILIFDOOHFFList() {
+          getUnlockAreaListList() {
         return ((bitField0_ & 0x00000004) != 0) ?
-                 java.util.Collections.unmodifiableList(gILIFDOOHFF_) : gILIFDOOHFF_;
+                 java.util.Collections.unmodifiableList(unlockAreaList_) : unlockAreaList_;
       }
       /**
-       * repeated uint32 GILIFDOOHFF = 12;
-       * @return The count of gILIFDOOHFF.
+       * repeated uint32 unlock_area_list = 12;
+       * @return The count of unlockAreaList.
        */
-      public int getGILIFDOOHFFCount() {
-        return gILIFDOOHFF_.size();
+      public int getUnlockAreaListCount() {
+        return unlockAreaList_.size();
       }
       /**
-       * repeated uint32 GILIFDOOHFF = 12;
+       * repeated uint32 unlock_area_list = 12;
        * @param index The index of the element to return.
-       * @return The gILIFDOOHFF at the given index.
+       * @return The unlockAreaList at the given index.
        */
-      public int getGILIFDOOHFF(int index) {
-        return gILIFDOOHFF_.getInt(index);
+      public int getUnlockAreaList(int index) {
+        return unlockAreaList_.getInt(index);
       }
       /**
-       * repeated uint32 GILIFDOOHFF = 12;
+       * repeated uint32 unlock_area_list = 12;
        * @param index The index to set the value at.
-       * @param value The gILIFDOOHFF to set.
+       * @param value The unlockAreaList to set.
        * @return This builder for chaining.
        */
-      public Builder setGILIFDOOHFF(
+      public Builder setUnlockAreaList(
           int index, int value) {
-        ensureGILIFDOOHFFIsMutable();
-        gILIFDOOHFF_.setInt(index, value);
+        ensureUnlockAreaListIsMutable();
+        unlockAreaList_.setInt(index, value);
         onChanged();
         return this;
       }
       /**
-       * repeated uint32 GILIFDOOHFF = 12;
-       * @param value The gILIFDOOHFF to add.
+       * repeated uint32 unlock_area_list = 12;
+       * @param value The unlockAreaList to add.
        * @return This builder for chaining.
        */
-      public Builder addGILIFDOOHFF(int value) {
-        ensureGILIFDOOHFFIsMutable();
-        gILIFDOOHFF_.addInt(value);
+      public Builder addUnlockAreaList(int value) {
+        ensureUnlockAreaListIsMutable();
+        unlockAreaList_.addInt(value);
         onChanged();
         return this;
       }
       /**
-       * repeated uint32 GILIFDOOHFF = 12;
-       * @param values The gILIFDOOHFF to add.
+       * repeated uint32 unlock_area_list = 12;
+       * @param values The unlockAreaList to add.
        * @return This builder for chaining.
        */
-      public Builder addAllGILIFDOOHFF(
+      public Builder addAllUnlockAreaList(
           java.lang.Iterable values) {
-        ensureGILIFDOOHFFIsMutable();
+        ensureUnlockAreaListIsMutable();
         com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, gILIFDOOHFF_);
+            values, unlockAreaList_);
         onChanged();
         return this;
       }
       /**
-       * repeated uint32 GILIFDOOHFF = 12;
+       * repeated uint32 unlock_area_list = 12;
        * @return This builder for chaining.
        */
-      public Builder clearGILIFDOOHFF() {
-        gILIFDOOHFF_ = emptyIntList();
+      public Builder clearUnlockAreaList() {
+        unlockAreaList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000004);
         onChanged();
         return this;
@@ -2223,80 +2223,80 @@ public final class GetScenePointRspOuterClass {
         return this;
       }
 
-      private com.google.protobuf.Internal.IntList unlockAreaList_ = emptyIntList();
-      private void ensureUnlockAreaListIsMutable() {
+      private com.google.protobuf.Internal.IntList jCLHNODLPOH_ = emptyIntList();
+      private void ensureJCLHNODLPOHIsMutable() {
         if (!((bitField0_ & 0x00000080) != 0)) {
-          unlockAreaList_ = mutableCopy(unlockAreaList_);
+          jCLHNODLPOH_ = mutableCopy(jCLHNODLPOH_);
           bitField0_ |= 0x00000080;
          }
       }
       /**
-       * repeated uint32 unlockAreaList = 13;
-       * @return A list containing the unlockAreaList.
+       * repeated uint32 JCLHNODLPOH = 13;
+       * @return A list containing the jCLHNODLPOH.
        */
       public java.util.List
-          getUnlockAreaListList() {
+          getJCLHNODLPOHList() {
         return ((bitField0_ & 0x00000080) != 0) ?
-                 java.util.Collections.unmodifiableList(unlockAreaList_) : unlockAreaList_;
+                 java.util.Collections.unmodifiableList(jCLHNODLPOH_) : jCLHNODLPOH_;
       }
       /**
-       * repeated uint32 unlockAreaList = 13;
-       * @return The count of unlockAreaList.
+       * repeated uint32 JCLHNODLPOH = 13;
+       * @return The count of jCLHNODLPOH.
        */
-      public int getUnlockAreaListCount() {
-        return unlockAreaList_.size();
+      public int getJCLHNODLPOHCount() {
+        return jCLHNODLPOH_.size();
       }
       /**
-       * repeated uint32 unlockAreaList = 13;
+       * repeated uint32 JCLHNODLPOH = 13;
        * @param index The index of the element to return.
-       * @return The unlockAreaList at the given index.
+       * @return The jCLHNODLPOH at the given index.
        */
-      public int getUnlockAreaList(int index) {
-        return unlockAreaList_.getInt(index);
+      public int getJCLHNODLPOH(int index) {
+        return jCLHNODLPOH_.getInt(index);
       }
       /**
-       * repeated uint32 unlockAreaList = 13;
+       * repeated uint32 JCLHNODLPOH = 13;
        * @param index The index to set the value at.
-       * @param value The unlockAreaList to set.
+       * @param value The jCLHNODLPOH to set.
        * @return This builder for chaining.
        */
-      public Builder setUnlockAreaList(
+      public Builder setJCLHNODLPOH(
           int index, int value) {
-        ensureUnlockAreaListIsMutable();
-        unlockAreaList_.setInt(index, value);
+        ensureJCLHNODLPOHIsMutable();
+        jCLHNODLPOH_.setInt(index, value);
         onChanged();
         return this;
       }
       /**
-       * repeated uint32 unlockAreaList = 13;
-       * @param value The unlockAreaList to add.
+       * repeated uint32 JCLHNODLPOH = 13;
+       * @param value The jCLHNODLPOH to add.
        * @return This builder for chaining.
        */
-      public Builder addUnlockAreaList(int value) {
-        ensureUnlockAreaListIsMutable();
-        unlockAreaList_.addInt(value);
+      public Builder addJCLHNODLPOH(int value) {
+        ensureJCLHNODLPOHIsMutable();
+        jCLHNODLPOH_.addInt(value);
         onChanged();
         return this;
       }
       /**
-       * repeated uint32 unlockAreaList = 13;
-       * @param values The unlockAreaList to add.
+       * repeated uint32 JCLHNODLPOH = 13;
+       * @param values The jCLHNODLPOH to add.
        * @return This builder for chaining.
        */
-      public Builder addAllUnlockAreaList(
+      public Builder addAllJCLHNODLPOH(
           java.lang.Iterable values) {
-        ensureUnlockAreaListIsMutable();
+        ensureJCLHNODLPOHIsMutable();
         com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, unlockAreaList_);
+            values, jCLHNODLPOH_);
         onChanged();
         return this;
       }
       /**
-       * repeated uint32 unlockAreaList = 13;
+       * repeated uint32 JCLHNODLPOH = 13;
        * @return This builder for chaining.
        */
-      public Builder clearUnlockAreaList() {
-        unlockAreaList_ = emptyIntList();
+      public Builder clearJCLHNODLPOH() {
+        jCLHNODLPOH_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000080);
         onChanged();
         return this;
@@ -2333,80 +2333,80 @@ public final class GetScenePointRspOuterClass {
         return this;
       }
 
-      private com.google.protobuf.Internal.IntList unhidePointList_ = emptyIntList();
-      private void ensureUnhidePointListIsMutable() {
+      private com.google.protobuf.Internal.IntList kOPAHGHMECF_ = emptyIntList();
+      private void ensureKOPAHGHMECFIsMutable() {
         if (!((bitField0_ & 0x00000100) != 0)) {
-          unhidePointList_ = mutableCopy(unhidePointList_);
+          kOPAHGHMECF_ = mutableCopy(kOPAHGHMECF_);
           bitField0_ |= 0x00000100;
          }
       }
       /**
-       * repeated uint32 unhide_point_list = 3;
-       * @return A list containing the unhidePointList.
+       * repeated uint32 KOPAHGHMECF = 3;
+       * @return A list containing the kOPAHGHMECF.
        */
       public java.util.List
-          getUnhidePointListList() {
+          getKOPAHGHMECFList() {
         return ((bitField0_ & 0x00000100) != 0) ?
-                 java.util.Collections.unmodifiableList(unhidePointList_) : unhidePointList_;
+                 java.util.Collections.unmodifiableList(kOPAHGHMECF_) : kOPAHGHMECF_;
       }
       /**
-       * repeated uint32 unhide_point_list = 3;
-       * @return The count of unhidePointList.
+       * repeated uint32 KOPAHGHMECF = 3;
+       * @return The count of kOPAHGHMECF.
        */
-      public int getUnhidePointListCount() {
-        return unhidePointList_.size();
+      public int getKOPAHGHMECFCount() {
+        return kOPAHGHMECF_.size();
       }
       /**
-       * repeated uint32 unhide_point_list = 3;
+       * repeated uint32 KOPAHGHMECF = 3;
        * @param index The index of the element to return.
-       * @return The unhidePointList at the given index.
+       * @return The kOPAHGHMECF at the given index.
        */
-      public int getUnhidePointList(int index) {
-        return unhidePointList_.getInt(index);
+      public int getKOPAHGHMECF(int index) {
+        return kOPAHGHMECF_.getInt(index);
       }
       /**
-       * repeated uint32 unhide_point_list = 3;
+       * repeated uint32 KOPAHGHMECF = 3;
        * @param index The index to set the value at.
-       * @param value The unhidePointList to set.
+       * @param value The kOPAHGHMECF to set.
        * @return This builder for chaining.
        */
-      public Builder setUnhidePointList(
+      public Builder setKOPAHGHMECF(
           int index, int value) {
-        ensureUnhidePointListIsMutable();
-        unhidePointList_.setInt(index, value);
+        ensureKOPAHGHMECFIsMutable();
+        kOPAHGHMECF_.setInt(index, value);
         onChanged();
         return this;
       }
       /**
-       * repeated uint32 unhide_point_list = 3;
-       * @param value The unhidePointList to add.
+       * repeated uint32 KOPAHGHMECF = 3;
+       * @param value The kOPAHGHMECF to add.
        * @return This builder for chaining.
        */
-      public Builder addUnhidePointList(int value) {
-        ensureUnhidePointListIsMutable();
-        unhidePointList_.addInt(value);
+      public Builder addKOPAHGHMECF(int value) {
+        ensureKOPAHGHMECFIsMutable();
+        kOPAHGHMECF_.addInt(value);
         onChanged();
         return this;
       }
       /**
-       * repeated uint32 unhide_point_list = 3;
-       * @param values The unhidePointList to add.
+       * repeated uint32 KOPAHGHMECF = 3;
+       * @param values The kOPAHGHMECF to add.
        * @return This builder for chaining.
        */
-      public Builder addAllUnhidePointList(
+      public Builder addAllKOPAHGHMECF(
           java.lang.Iterable values) {
-        ensureUnhidePointListIsMutable();
+        ensureKOPAHGHMECFIsMutable();
         com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, unhidePointList_);
+            values, kOPAHGHMECF_);
         onChanged();
         return this;
       }
       /**
-       * repeated uint32 unhide_point_list = 3;
+       * repeated uint32 KOPAHGHMECF = 3;
        * @return This builder for chaining.
        */
-      public Builder clearUnhidePointList() {
-        unhidePointList_ = emptyIntList();
+      public Builder clearKOPAHGHMECF() {
+        kOPAHGHMECF_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000100);
         onChanged();
         return this;
@@ -2478,16 +2478,16 @@ public final class GetScenePointRspOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\026GetScenePointRsp.proto\"\254\002\n\020GetScenePoi" +
-      "ntRsp\022\033\n\023unlocked_point_list\030\001 \003(\r\022\023\n\013EL" +
-      "DLGKEKABI\030\006 \003(\r\022\023\n\013FBFJPEPMAOF\030\t \001(\010\022\017\n\007" +
-      "retcode\030\013 \001(\005\022\023\n\013GILIFDOOHFF\030\014 \003(\r\022\023\n\013PP" +
-      "DDIADEDIC\030\010 \003(\r\022\023\n\013OGKCOCBLNLF\030\n \003(\r\022\023\n\013" +
-      "EBIFELCKPEA\030\007 \003(\r\022\023\n\013JJOHJDFINFN\030\004 \003(\r\022\022" +
-      "\n\nbelong_uid\030\016 \001(\r\022\026\n\016unlockAreaList\030\r \003" +
-      "(\r\022\020\n\010scene_id\030\002 \001(\r\022\031\n\021unhide_point_lis" +
-      "t\030\003 \003(\rB\033\n\031emu.grasscutter.net.protob\006pr" +
-      "oto3"
+      "\n\026GetScenePointRsp.proto\"\256\002\n\020GetScenePoi" +
+      "ntRsp\022\033\n\023unlocked_point_list\030\001 \003(\r\022\031\n\021un" +
+      "hide_point_list\030\006 \003(\r\022\023\n\013FBFJPEPMAOF\030\t \001" +
+      "(\010\022\017\n\007retcode\030\013 \001(\005\022\030\n\020unlock_area_list\030" +
+      "\014 \003(\r\022\023\n\013PPDDIADEDIC\030\010 \003(\r\022\023\n\013OGKCOCBLNL" +
+      "F\030\n \003(\r\022\023\n\013EBIFELCKPEA\030\007 \003(\r\022\023\n\013JJOHJDFI" +
+      "NFN\030\004 \003(\r\022\022\n\nbelong_uid\030\016 \001(\r\022\023\n\013JCLHNOD" +
+      "LPOH\030\r \003(\r\022\020\n\010scene_id\030\002 \001(\r\022\023\n\013KOPAHGHM" +
+      "ECF\030\003 \003(\rB\033\n\031emu.grasscutter.net.protob\006" +
+      "proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -2498,7 +2498,7 @@ public final class GetScenePointRspOuterClass {
     internal_static_GetScenePointRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_GetScenePointRsp_descriptor,
-        new java.lang.String[] { "UnlockedPointList", "ELDLGKEKABI", "FBFJPEPMAOF", "Retcode", "GILIFDOOHFF", "PPDDIADEDIC", "OGKCOCBLNLF", "EBIFELCKPEA", "JJOHJDFINFN", "BelongUid", "UnlockAreaList", "SceneId", "UnhidePointList", });
+        new java.lang.String[] { "UnlockedPointList", "UnhidePointList", "FBFJPEPMAOF", "Retcode", "UnlockAreaList", "PPDDIADEDIC", "OGKCOCBLNLF", "EBIFELCKPEA", "JJOHJDFINFN", "BelongUid", "JCLHNODLPOH", "SceneId", "KOPAHGHMECF", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SealBattleBeginNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SealBattleBeginNotifyOuterClass.java
index dbd9c5b71..7b237983f 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SealBattleBeginNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SealBattleBeginNotifyOuterClass.java
@@ -19,16 +19,16 @@ public final class SealBattleBeginNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * uint32 seal_max_progress = 10;
-     * @return The sealMaxProgress.
+     * uint32 CMPKIKADOJJ = 10;
+     * @return The cMPKIKADOJJ.
      */
-    int getSealMaxProgress();
+    int getCMPKIKADOJJ();
 
     /**
-     * uint32 seal_radius = 11;
-     * @return The sealRadius.
+     * uint32 PDKCGAJOEPC = 11;
+     * @return The pDKCGAJOEPC.
      */
-    int getSealRadius();
+    int getPDKCGAJOEPC();
 
     /**
      * .SealBattleType battle_type = 3;
@@ -106,12 +106,12 @@ public final class SealBattleBeginNotifyOuterClass {
             }
             case 80: {
 
-              sealMaxProgress_ = input.readUInt32();
+              cMPKIKADOJJ_ = input.readUInt32();
               break;
             }
             case 88: {
 
-              sealRadius_ = input.readUInt32();
+              pDKCGAJOEPC_ = input.readUInt32();
               break;
             }
             case 96: {
@@ -151,26 +151,26 @@ public final class SealBattleBeginNotifyOuterClass {
               emu.grasscutter.net.proto.SealBattleBeginNotifyOuterClass.SealBattleBeginNotify.class, emu.grasscutter.net.proto.SealBattleBeginNotifyOuterClass.SealBattleBeginNotify.Builder.class);
     }
 
-    public static final int SEAL_MAX_PROGRESS_FIELD_NUMBER = 10;
-    private int sealMaxProgress_;
+    public static final int CMPKIKADOJJ_FIELD_NUMBER = 10;
+    private int cMPKIKADOJJ_;
     /**
-     * uint32 seal_max_progress = 10;
-     * @return The sealMaxProgress.
+     * uint32 CMPKIKADOJJ = 10;
+     * @return The cMPKIKADOJJ.
      */
     @java.lang.Override
-    public int getSealMaxProgress() {
-      return sealMaxProgress_;
+    public int getCMPKIKADOJJ() {
+      return cMPKIKADOJJ_;
     }
 
-    public static final int SEAL_RADIUS_FIELD_NUMBER = 11;
-    private int sealRadius_;
+    public static final int PDKCGAJOEPC_FIELD_NUMBER = 11;
+    private int pDKCGAJOEPC_;
     /**
-     * uint32 seal_radius = 11;
-     * @return The sealRadius.
+     * uint32 PDKCGAJOEPC = 11;
+     * @return The pDKCGAJOEPC.
      */
     @java.lang.Override
-    public int getSealRadius() {
-      return sealRadius_;
+    public int getPDKCGAJOEPC() {
+      return pDKCGAJOEPC_;
     }
 
     public static final int BATTLE_TYPE_FIELD_NUMBER = 3;
@@ -220,11 +220,11 @@ public final class SealBattleBeginNotifyOuterClass {
       if (battleType_ != emu.grasscutter.net.proto.SealBattleTypeOuterClass.SealBattleType.SEAL_BATTLE_KEEP_ALIVE.getNumber()) {
         output.writeEnum(3, battleType_);
       }
-      if (sealMaxProgress_ != 0) {
-        output.writeUInt32(10, sealMaxProgress_);
+      if (cMPKIKADOJJ_ != 0) {
+        output.writeUInt32(10, cMPKIKADOJJ_);
       }
-      if (sealRadius_ != 0) {
-        output.writeUInt32(11, sealRadius_);
+      if (pDKCGAJOEPC_ != 0) {
+        output.writeUInt32(11, pDKCGAJOEPC_);
       }
       if (sealEntityId_ != 0) {
         output.writeUInt32(12, sealEntityId_);
@@ -242,13 +242,13 @@ public final class SealBattleBeginNotifyOuterClass {
         size += com.google.protobuf.CodedOutputStream
           .computeEnumSize(3, battleType_);
       }
-      if (sealMaxProgress_ != 0) {
+      if (cMPKIKADOJJ_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(10, sealMaxProgress_);
+          .computeUInt32Size(10, cMPKIKADOJJ_);
       }
-      if (sealRadius_ != 0) {
+      if (pDKCGAJOEPC_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(11, sealRadius_);
+          .computeUInt32Size(11, pDKCGAJOEPC_);
       }
       if (sealEntityId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
@@ -269,10 +269,10 @@ public final class SealBattleBeginNotifyOuterClass {
       }
       emu.grasscutter.net.proto.SealBattleBeginNotifyOuterClass.SealBattleBeginNotify other = (emu.grasscutter.net.proto.SealBattleBeginNotifyOuterClass.SealBattleBeginNotify) obj;
 
-      if (getSealMaxProgress()
-          != other.getSealMaxProgress()) return false;
-      if (getSealRadius()
-          != other.getSealRadius()) return false;
+      if (getCMPKIKADOJJ()
+          != other.getCMPKIKADOJJ()) return false;
+      if (getPDKCGAJOEPC()
+          != other.getPDKCGAJOEPC()) return false;
       if (battleType_ != other.battleType_) return false;
       if (getSealEntityId()
           != other.getSealEntityId()) return false;
@@ -287,10 +287,10 @@ public final class SealBattleBeginNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + SEAL_MAX_PROGRESS_FIELD_NUMBER;
-      hash = (53 * hash) + getSealMaxProgress();
-      hash = (37 * hash) + SEAL_RADIUS_FIELD_NUMBER;
-      hash = (53 * hash) + getSealRadius();
+      hash = (37 * hash) + CMPKIKADOJJ_FIELD_NUMBER;
+      hash = (53 * hash) + getCMPKIKADOJJ();
+      hash = (37 * hash) + PDKCGAJOEPC_FIELD_NUMBER;
+      hash = (53 * hash) + getPDKCGAJOEPC();
       hash = (37 * hash) + BATTLE_TYPE_FIELD_NUMBER;
       hash = (53 * hash) + battleType_;
       hash = (37 * hash) + SEAL_ENTITY_ID_FIELD_NUMBER;
@@ -433,9 +433,9 @@ public final class SealBattleBeginNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        sealMaxProgress_ = 0;
+        cMPKIKADOJJ_ = 0;
 
-        sealRadius_ = 0;
+        pDKCGAJOEPC_ = 0;
 
         battleType_ = 0;
 
@@ -467,8 +467,8 @@ public final class SealBattleBeginNotifyOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.SealBattleBeginNotifyOuterClass.SealBattleBeginNotify buildPartial() {
         emu.grasscutter.net.proto.SealBattleBeginNotifyOuterClass.SealBattleBeginNotify result = new emu.grasscutter.net.proto.SealBattleBeginNotifyOuterClass.SealBattleBeginNotify(this);
-        result.sealMaxProgress_ = sealMaxProgress_;
-        result.sealRadius_ = sealRadius_;
+        result.cMPKIKADOJJ_ = cMPKIKADOJJ_;
+        result.pDKCGAJOEPC_ = pDKCGAJOEPC_;
         result.battleType_ = battleType_;
         result.sealEntityId_ = sealEntityId_;
         onBuilt();
@@ -519,11 +519,11 @@ public final class SealBattleBeginNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.SealBattleBeginNotifyOuterClass.SealBattleBeginNotify other) {
         if (other == emu.grasscutter.net.proto.SealBattleBeginNotifyOuterClass.SealBattleBeginNotify.getDefaultInstance()) return this;
-        if (other.getSealMaxProgress() != 0) {
-          setSealMaxProgress(other.getSealMaxProgress());
+        if (other.getCMPKIKADOJJ() != 0) {
+          setCMPKIKADOJJ(other.getCMPKIKADOJJ());
         }
-        if (other.getSealRadius() != 0) {
-          setSealRadius(other.getSealRadius());
+        if (other.getPDKCGAJOEPC() != 0) {
+          setPDKCGAJOEPC(other.getPDKCGAJOEPC());
         }
         if (other.battleType_ != 0) {
           setBattleTypeValue(other.getBattleTypeValue());
@@ -560,64 +560,64 @@ public final class SealBattleBeginNotifyOuterClass {
         return this;
       }
 
-      private int sealMaxProgress_ ;
+      private int cMPKIKADOJJ_ ;
       /**
-       * uint32 seal_max_progress = 10;
-       * @return The sealMaxProgress.
+       * uint32 CMPKIKADOJJ = 10;
+       * @return The cMPKIKADOJJ.
        */
       @java.lang.Override
-      public int getSealMaxProgress() {
-        return sealMaxProgress_;
+      public int getCMPKIKADOJJ() {
+        return cMPKIKADOJJ_;
       }
       /**
-       * uint32 seal_max_progress = 10;
-       * @param value The sealMaxProgress to set.
+       * uint32 CMPKIKADOJJ = 10;
+       * @param value The cMPKIKADOJJ to set.
        * @return This builder for chaining.
        */
-      public Builder setSealMaxProgress(int value) {
+      public Builder setCMPKIKADOJJ(int value) {
         
-        sealMaxProgress_ = value;
+        cMPKIKADOJJ_ = value;
         onChanged();
         return this;
       }
       /**
-       * uint32 seal_max_progress = 10;
+       * uint32 CMPKIKADOJJ = 10;
        * @return This builder for chaining.
        */
-      public Builder clearSealMaxProgress() {
+      public Builder clearCMPKIKADOJJ() {
         
-        sealMaxProgress_ = 0;
+        cMPKIKADOJJ_ = 0;
         onChanged();
         return this;
       }
 
-      private int sealRadius_ ;
+      private int pDKCGAJOEPC_ ;
       /**
-       * uint32 seal_radius = 11;
-       * @return The sealRadius.
+       * uint32 PDKCGAJOEPC = 11;
+       * @return The pDKCGAJOEPC.
        */
       @java.lang.Override
-      public int getSealRadius() {
-        return sealRadius_;
+      public int getPDKCGAJOEPC() {
+        return pDKCGAJOEPC_;
       }
       /**
-       * uint32 seal_radius = 11;
-       * @param value The sealRadius to set.
+       * uint32 PDKCGAJOEPC = 11;
+       * @param value The pDKCGAJOEPC to set.
        * @return This builder for chaining.
        */
-      public Builder setSealRadius(int value) {
+      public Builder setPDKCGAJOEPC(int value) {
         
-        sealRadius_ = value;
+        pDKCGAJOEPC_ = value;
         onChanged();
         return this;
       }
       /**
-       * uint32 seal_radius = 11;
+       * uint32 PDKCGAJOEPC = 11;
        * @return This builder for chaining.
        */
-      public Builder clearSealRadius() {
+      public Builder clearPDKCGAJOEPC() {
         
-        sealRadius_ = 0;
+        pDKCGAJOEPC_ = 0;
         onChanged();
         return this;
       }
@@ -774,11 +774,11 @@ public final class SealBattleBeginNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\033SealBattleBeginNotify.proto\032\024SealBattl" +
-      "eType.proto\"\205\001\n\025SealBattleBeginNotify\022\031\n" +
-      "\021seal_max_progress\030\n \001(\r\022\023\n\013seal_radius\030" +
-      "\013 \001(\r\022$\n\013battle_type\030\003 \001(\0162\017.SealBattleT" +
-      "ype\022\026\n\016seal_entity_id\030\014 \001(\rB\033\n\031emu.grass" +
-      "cutter.net.protob\006proto3"
+      "eType.proto\"\177\n\025SealBattleBeginNotify\022\023\n\013" +
+      "CMPKIKADOJJ\030\n \001(\r\022\023\n\013PDKCGAJOEPC\030\013 \001(\r\022$" +
+      "\n\013battle_type\030\003 \001(\0162\017.SealBattleType\022\026\n\016" +
+      "seal_entity_id\030\014 \001(\rB\033\n\031emu.grasscutter." +
+      "net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -790,7 +790,7 @@ public final class SealBattleBeginNotifyOuterClass {
     internal_static_SealBattleBeginNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_SealBattleBeginNotify_descriptor,
-        new java.lang.String[] { "SealMaxProgress", "SealRadius", "BattleType", "SealEntityId", });
+        new java.lang.String[] { "CMPKIKADOJJ", "PDKCGAJOEPC", "BattleType", "SealEntityId", });
     emu.grasscutter.net.proto.SealBattleTypeOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SealBattleProgressNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SealBattleProgressNotifyOuterClass.java
index 4fbd1e2c0..6f99843cd 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SealBattleProgressNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SealBattleProgressNotifyOuterClass.java
@@ -19,10 +19,10 @@ public final class SealBattleProgressNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * uint32 seal_radius = 8;
-     * @return The sealRadius.
+     * uint32 PDKCGAJOEPC = 8;
+     * @return The pDKCGAJOEPC.
      */
-    int getSealRadius();
+    int getPDKCGAJOEPC();
 
     /**
      * uint32 end_time = 2;
@@ -43,10 +43,10 @@ public final class SealBattleProgressNotifyOuterClass {
     int getSealEntityId();
 
     /**
-     * uint32 max_progress = 5;
-     * @return The maxProgress.
+     * uint32 BAEKFBCJFJK = 5;
+     * @return The bAEKFBCJFJK.
      */
-    int getMaxProgress();
+    int getBAEKFBCJFJK();
   }
   /**
    * 
@@ -105,12 +105,12 @@ public final class SealBattleProgressNotifyOuterClass {
             }
             case 40: {
 
-              maxProgress_ = input.readUInt32();
+              bAEKFBCJFJK_ = input.readUInt32();
               break;
             }
             case 64: {
 
-              sealRadius_ = input.readUInt32();
+              pDKCGAJOEPC_ = input.readUInt32();
               break;
             }
             case 112: {
@@ -155,15 +155,15 @@ public final class SealBattleProgressNotifyOuterClass {
               emu.grasscutter.net.proto.SealBattleProgressNotifyOuterClass.SealBattleProgressNotify.class, emu.grasscutter.net.proto.SealBattleProgressNotifyOuterClass.SealBattleProgressNotify.Builder.class);
     }
 
-    public static final int SEAL_RADIUS_FIELD_NUMBER = 8;
-    private int sealRadius_;
+    public static final int PDKCGAJOEPC_FIELD_NUMBER = 8;
+    private int pDKCGAJOEPC_;
     /**
-     * uint32 seal_radius = 8;
-     * @return The sealRadius.
+     * uint32 PDKCGAJOEPC = 8;
+     * @return The pDKCGAJOEPC.
      */
     @java.lang.Override
-    public int getSealRadius() {
-      return sealRadius_;
+    public int getPDKCGAJOEPC() {
+      return pDKCGAJOEPC_;
     }
 
     public static final int END_TIME_FIELD_NUMBER = 2;
@@ -199,15 +199,15 @@ public final class SealBattleProgressNotifyOuterClass {
       return sealEntityId_;
     }
 
-    public static final int MAX_PROGRESS_FIELD_NUMBER = 5;
-    private int maxProgress_;
+    public static final int BAEKFBCJFJK_FIELD_NUMBER = 5;
+    private int bAEKFBCJFJK_;
     /**
-     * uint32 max_progress = 5;
-     * @return The maxProgress.
+     * uint32 BAEKFBCJFJK = 5;
+     * @return The bAEKFBCJFJK.
      */
     @java.lang.Override
-    public int getMaxProgress() {
-      return maxProgress_;
+    public int getBAEKFBCJFJK() {
+      return bAEKFBCJFJK_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -227,11 +227,11 @@ public final class SealBattleProgressNotifyOuterClass {
       if (endTime_ != 0) {
         output.writeUInt32(2, endTime_);
       }
-      if (maxProgress_ != 0) {
-        output.writeUInt32(5, maxProgress_);
+      if (bAEKFBCJFJK_ != 0) {
+        output.writeUInt32(5, bAEKFBCJFJK_);
       }
-      if (sealRadius_ != 0) {
-        output.writeUInt32(8, sealRadius_);
+      if (pDKCGAJOEPC_ != 0) {
+        output.writeUInt32(8, pDKCGAJOEPC_);
       }
       if (sealEntityId_ != 0) {
         output.writeUInt32(14, sealEntityId_);
@@ -252,13 +252,13 @@ public final class SealBattleProgressNotifyOuterClass {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(2, endTime_);
       }
-      if (maxProgress_ != 0) {
+      if (bAEKFBCJFJK_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(5, maxProgress_);
+          .computeUInt32Size(5, bAEKFBCJFJK_);
       }
-      if (sealRadius_ != 0) {
+      if (pDKCGAJOEPC_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(8, sealRadius_);
+          .computeUInt32Size(8, pDKCGAJOEPC_);
       }
       if (sealEntityId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
@@ -283,16 +283,16 @@ public final class SealBattleProgressNotifyOuterClass {
       }
       emu.grasscutter.net.proto.SealBattleProgressNotifyOuterClass.SealBattleProgressNotify other = (emu.grasscutter.net.proto.SealBattleProgressNotifyOuterClass.SealBattleProgressNotify) obj;
 
-      if (getSealRadius()
-          != other.getSealRadius()) return false;
+      if (getPDKCGAJOEPC()
+          != other.getPDKCGAJOEPC()) return false;
       if (getEndTime()
           != other.getEndTime()) return false;
       if (getProgress()
           != other.getProgress()) return false;
       if (getSealEntityId()
           != other.getSealEntityId()) return false;
-      if (getMaxProgress()
-          != other.getMaxProgress()) return false;
+      if (getBAEKFBCJFJK()
+          != other.getBAEKFBCJFJK()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -304,16 +304,16 @@ public final class SealBattleProgressNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + SEAL_RADIUS_FIELD_NUMBER;
-      hash = (53 * hash) + getSealRadius();
+      hash = (37 * hash) + PDKCGAJOEPC_FIELD_NUMBER;
+      hash = (53 * hash) + getPDKCGAJOEPC();
       hash = (37 * hash) + END_TIME_FIELD_NUMBER;
       hash = (53 * hash) + getEndTime();
       hash = (37 * hash) + PROGRESS_FIELD_NUMBER;
       hash = (53 * hash) + getProgress();
       hash = (37 * hash) + SEAL_ENTITY_ID_FIELD_NUMBER;
       hash = (53 * hash) + getSealEntityId();
-      hash = (37 * hash) + MAX_PROGRESS_FIELD_NUMBER;
-      hash = (53 * hash) + getMaxProgress();
+      hash = (37 * hash) + BAEKFBCJFJK_FIELD_NUMBER;
+      hash = (53 * hash) + getBAEKFBCJFJK();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -452,7 +452,7 @@ public final class SealBattleProgressNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        sealRadius_ = 0;
+        pDKCGAJOEPC_ = 0;
 
         endTime_ = 0;
 
@@ -460,7 +460,7 @@ public final class SealBattleProgressNotifyOuterClass {
 
         sealEntityId_ = 0;
 
-        maxProgress_ = 0;
+        bAEKFBCJFJK_ = 0;
 
         return this;
       }
@@ -488,11 +488,11 @@ public final class SealBattleProgressNotifyOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.SealBattleProgressNotifyOuterClass.SealBattleProgressNotify buildPartial() {
         emu.grasscutter.net.proto.SealBattleProgressNotifyOuterClass.SealBattleProgressNotify result = new emu.grasscutter.net.proto.SealBattleProgressNotifyOuterClass.SealBattleProgressNotify(this);
-        result.sealRadius_ = sealRadius_;
+        result.pDKCGAJOEPC_ = pDKCGAJOEPC_;
         result.endTime_ = endTime_;
         result.progress_ = progress_;
         result.sealEntityId_ = sealEntityId_;
-        result.maxProgress_ = maxProgress_;
+        result.bAEKFBCJFJK_ = bAEKFBCJFJK_;
         onBuilt();
         return result;
       }
@@ -541,8 +541,8 @@ public final class SealBattleProgressNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.SealBattleProgressNotifyOuterClass.SealBattleProgressNotify other) {
         if (other == emu.grasscutter.net.proto.SealBattleProgressNotifyOuterClass.SealBattleProgressNotify.getDefaultInstance()) return this;
-        if (other.getSealRadius() != 0) {
-          setSealRadius(other.getSealRadius());
+        if (other.getPDKCGAJOEPC() != 0) {
+          setPDKCGAJOEPC(other.getPDKCGAJOEPC());
         }
         if (other.getEndTime() != 0) {
           setEndTime(other.getEndTime());
@@ -553,8 +553,8 @@ public final class SealBattleProgressNotifyOuterClass {
         if (other.getSealEntityId() != 0) {
           setSealEntityId(other.getSealEntityId());
         }
-        if (other.getMaxProgress() != 0) {
-          setMaxProgress(other.getMaxProgress());
+        if (other.getBAEKFBCJFJK() != 0) {
+          setBAEKFBCJFJK(other.getBAEKFBCJFJK());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -585,33 +585,33 @@ public final class SealBattleProgressNotifyOuterClass {
         return this;
       }
 
-      private int sealRadius_ ;
+      private int pDKCGAJOEPC_ ;
       /**
-       * uint32 seal_radius = 8;
-       * @return The sealRadius.
+       * uint32 PDKCGAJOEPC = 8;
+       * @return The pDKCGAJOEPC.
        */
       @java.lang.Override
-      public int getSealRadius() {
-        return sealRadius_;
+      public int getPDKCGAJOEPC() {
+        return pDKCGAJOEPC_;
       }
       /**
-       * uint32 seal_radius = 8;
-       * @param value The sealRadius to set.
+       * uint32 PDKCGAJOEPC = 8;
+       * @param value The pDKCGAJOEPC to set.
        * @return This builder for chaining.
        */
-      public Builder setSealRadius(int value) {
+      public Builder setPDKCGAJOEPC(int value) {
         
-        sealRadius_ = value;
+        pDKCGAJOEPC_ = value;
         onChanged();
         return this;
       }
       /**
-       * uint32 seal_radius = 8;
+       * uint32 PDKCGAJOEPC = 8;
        * @return This builder for chaining.
        */
-      public Builder clearSealRadius() {
+      public Builder clearPDKCGAJOEPC() {
         
-        sealRadius_ = 0;
+        pDKCGAJOEPC_ = 0;
         onChanged();
         return this;
       }
@@ -709,33 +709,33 @@ public final class SealBattleProgressNotifyOuterClass {
         return this;
       }
 
-      private int maxProgress_ ;
+      private int bAEKFBCJFJK_ ;
       /**
-       * uint32 max_progress = 5;
-       * @return The maxProgress.
+       * uint32 BAEKFBCJFJK = 5;
+       * @return The bAEKFBCJFJK.
        */
       @java.lang.Override
-      public int getMaxProgress() {
-        return maxProgress_;
+      public int getBAEKFBCJFJK() {
+        return bAEKFBCJFJK_;
       }
       /**
-       * uint32 max_progress = 5;
-       * @param value The maxProgress to set.
+       * uint32 BAEKFBCJFJK = 5;
+       * @param value The bAEKFBCJFJK to set.
        * @return This builder for chaining.
        */
-      public Builder setMaxProgress(int value) {
+      public Builder setBAEKFBCJFJK(int value) {
         
-        maxProgress_ = value;
+        bAEKFBCJFJK_ = value;
         onChanged();
         return this;
       }
       /**
-       * uint32 max_progress = 5;
+       * uint32 BAEKFBCJFJK = 5;
        * @return This builder for chaining.
        */
-      public Builder clearMaxProgress() {
+      public Builder clearBAEKFBCJFJK() {
         
-        maxProgress_ = 0;
+        bAEKFBCJFJK_ = 0;
         onChanged();
         return this;
       }
@@ -806,12 +806,11 @@ public final class SealBattleProgressNotifyOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\036SealBattleProgressNotify.proto\"\201\001\n\030Sea" +
-      "lBattleProgressNotify\022\023\n\013seal_radius\030\010 \001" +
+      "\n\036SealBattleProgressNotify.proto\"\200\001\n\030Sea" +
+      "lBattleProgressNotify\022\023\n\013PDKCGAJOEPC\030\010 \001" +
       "(\r\022\020\n\010end_time\030\002 \001(\r\022\020\n\010progress\030\017 \001(\r\022\026" +
-      "\n\016seal_entity_id\030\016 \001(\r\022\024\n\014max_progress\030\005" +
-      " \001(\rB\033\n\031emu.grasscutter.net.protob\006proto" +
-      "3"
+      "\n\016seal_entity_id\030\016 \001(\r\022\023\n\013BAEKFBCJFJK\030\005 " +
+      "\001(\rB\033\n\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -822,7 +821,7 @@ public final class SealBattleProgressNotifyOuterClass {
     internal_static_SealBattleProgressNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_SealBattleProgressNotify_descriptor,
-        new java.lang.String[] { "SealRadius", "EndTime", "Progress", "SealEntityId", "MaxProgress", });
+        new java.lang.String[] { "PDKCGAJOEPC", "EndTime", "Progress", "SealEntityId", "BAEKFBCJFJK", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/main/java/emu/grasscutter/auth/AuthenticationSystem.java b/src/main/java/emu/grasscutter/auth/AuthenticationSystem.java
index d7accbf14..4e5f541c8 100644
--- a/src/main/java/emu/grasscutter/auth/AuthenticationSystem.java
+++ b/src/main/java/emu/grasscutter/auth/AuthenticationSystem.java
@@ -4,10 +4,9 @@ import emu.grasscutter.game.Account;
 import emu.grasscutter.server.http.objects.*;
 import emu.grasscutter.utils.DispatchUtils;
 import io.javalin.http.Context;
+import lombok.*;
+
 import javax.annotation.Nullable;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Getter;
 
 /** Defines an authenticator for the server. Can be changed by plugins. */
 public interface AuthenticationSystem {
diff --git a/src/main/java/emu/grasscutter/auth/Authenticator.java b/src/main/java/emu/grasscutter/auth/Authenticator.java
index ac324a7ba..07dad7755 100644
--- a/src/main/java/emu/grasscutter/auth/Authenticator.java
+++ b/src/main/java/emu/grasscutter/auth/Authenticator.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.auth;
 
-import emu.grasscutter.server.http.objects.ComboTokenResJson;
-import emu.grasscutter.server.http.objects.LoginResultJson;
+import emu.grasscutter.server.http.objects.*;
 
 /**
  * Handles username/password authentication from the client.
diff --git a/src/main/java/emu/grasscutter/auth/DefaultAuthentication.java b/src/main/java/emu/grasscutter/auth/DefaultAuthentication.java
index 241b7c894..9cbd4c42e 100644
--- a/src/main/java/emu/grasscutter/auth/DefaultAuthentication.java
+++ b/src/main/java/emu/grasscutter/auth/DefaultAuthentication.java
@@ -1,13 +1,12 @@
 package emu.grasscutter.auth;
 
-import static emu.grasscutter.config.Configuration.ACCOUNT;
-import static emu.grasscutter.utils.lang.Language.translate;
-
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.auth.DefaultAuthenticators.*;
 import emu.grasscutter.game.Account;
-import emu.grasscutter.server.http.objects.ComboTokenResJson;
-import emu.grasscutter.server.http.objects.LoginResultJson;
+import emu.grasscutter.server.http.objects.*;
+
+import static emu.grasscutter.config.Configuration.ACCOUNT;
+import static emu.grasscutter.utils.lang.Language.translate;
 
 /**
  * The default Grasscutter authentication implementation. Allows all users to access any account.
diff --git a/src/main/java/emu/grasscutter/auth/DefaultAuthenticators.java b/src/main/java/emu/grasscutter/auth/DefaultAuthenticators.java
index 1892d4504..372b0267f 100644
--- a/src/main/java/emu/grasscutter/auth/DefaultAuthenticators.java
+++ b/src/main/java/emu/grasscutter/auth/DefaultAuthenticators.java
@@ -1,8 +1,5 @@
 package emu.grasscutter.auth;
 
-import static emu.grasscutter.config.Configuration.ACCOUNT;
-import static emu.grasscutter.utils.lang.Language.translate;
-
 import at.favre.lib.crypto.bcrypt.BCrypt;
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.Grasscutter.ServerRunMode;
@@ -13,12 +10,16 @@ import emu.grasscutter.server.dispatch.*;
 import emu.grasscutter.server.http.objects.*;
 import emu.grasscutter.utils.*;
 import io.javalin.http.ContentType;
+
+import javax.crypto.Cipher;
 import java.nio.charset.StandardCharsets;
 import java.security.KeyFactory;
 import java.security.interfaces.RSAPrivateKey;
 import java.security.spec.PKCS8EncodedKeySpec;
 import java.util.concurrent.*;
-import javax.crypto.Cipher;
+
+import static emu.grasscutter.config.Configuration.ACCOUNT;
+import static emu.grasscutter.utils.lang.Language.translate;
 
 /** A class containing default authenticators. */
 public final class DefaultAuthenticators {
diff --git a/src/main/java/emu/grasscutter/auth/HandbookAuthenticator.java b/src/main/java/emu/grasscutter/auth/HandbookAuthenticator.java
index 46d2f473f..043427783 100644
--- a/src/main/java/emu/grasscutter/auth/HandbookAuthenticator.java
+++ b/src/main/java/emu/grasscutter/auth/HandbookAuthenticator.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.auth;
 
 import emu.grasscutter.auth.AuthenticationSystem.AuthenticationRequest;
-import lombok.Builder;
-import lombok.Getter;
+import lombok.*;
 
 /** Handles player authentication for the web GM handbook. */
 public interface HandbookAuthenticator {
diff --git a/src/main/java/emu/grasscutter/command/Command.java b/src/main/java/emu/grasscutter/command/Command.java
index 0a454cd4c..99f2706cb 100644
--- a/src/main/java/emu/grasscutter/command/Command.java
+++ b/src/main/java/emu/grasscutter/command/Command.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.command;
 
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.*;
 
 @Retention(RetentionPolicy.RUNTIME)
 public @interface Command {
diff --git a/src/main/java/emu/grasscutter/command/CommandHandler.java b/src/main/java/emu/grasscutter/command/CommandHandler.java
index 29e59aaf0..35ef15789 100644
--- a/src/main/java/emu/grasscutter/command/CommandHandler.java
+++ b/src/main/java/emu/grasscutter/command/CommandHandler.java
@@ -1,12 +1,12 @@
 package emu.grasscutter.command;
 
-import static emu.grasscutter.utils.lang.Language.translate;
-
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.server.event.game.ReceiveCommandFeedbackEvent;
-import java.util.List;
-import java.util.StringJoiner;
+
+import java.util.*;
+
+import static emu.grasscutter.utils.lang.Language.translate;
 
 public interface CommandHandler {
 
diff --git a/src/main/java/emu/grasscutter/command/CommandHelpers.java b/src/main/java/emu/grasscutter/command/CommandHelpers.java
index 1748c9a0f..835a35ac6 100644
--- a/src/main/java/emu/grasscutter/command/CommandHelpers.java
+++ b/src/main/java/emu/grasscutter/command/CommandHelpers.java
@@ -1,11 +1,9 @@
 package emu.grasscutter.command;
 
-import java.util.List;
-import java.util.Map;
-import java.util.function.BiConsumer;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 import javax.annotation.Nonnull;
+import java.util.*;
+import java.util.function.BiConsumer;
+import java.util.regex.*;
 
 public class CommandHelpers {
     public static final Pattern lvlRegex =
diff --git a/src/main/java/emu/grasscutter/command/commands/AccountCommand.java b/src/main/java/emu/grasscutter/command/commands/AccountCommand.java
index 5efab34c3..4670b25e9 100644
--- a/src/main/java/emu/grasscutter/command/commands/AccountCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/AccountCommand.java
@@ -1,7 +1,5 @@
 package emu.grasscutter.command.commands;
 
-import static emu.grasscutter.utils.lang.Language.translate;
-
 import at.favre.lib.crypto.bcrypt.BCrypt;
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.command.*;
@@ -9,9 +7,12 @@ import emu.grasscutter.config.Configuration;
 import emu.grasscutter.database.*;
 import emu.grasscutter.game.Account;
 import emu.grasscutter.game.player.Player;
+
 import java.util.List;
 import java.util.stream.Collectors;
 
+import static emu.grasscutter.utils.lang.Language.translate;
+
 @Command(
         label = "account",
         usage = {
diff --git a/src/main/java/emu/grasscutter/command/commands/AchievementCommand.java b/src/main/java/emu/grasscutter/command/commands/AchievementCommand.java
index eba2c51e8..d5333efef 100644
--- a/src/main/java/emu/grasscutter/command/commands/AchievementCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/AchievementCommand.java
@@ -1,14 +1,12 @@
 package emu.grasscutter.command.commands;
 
-import emu.grasscutter.command.Command;
-import emu.grasscutter.command.CommandHandler;
+import emu.grasscutter.command.*;
 import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.excels.achievement.AchievementData;
-import emu.grasscutter.game.achievement.AchievementControlReturns;
-import emu.grasscutter.game.achievement.Achievements;
+import emu.grasscutter.game.achievement.*;
 import emu.grasscutter.game.player.Player;
-import java.util.List;
-import java.util.Optional;
+
+import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 
 @Command(
diff --git a/src/main/java/emu/grasscutter/command/commands/AnnounceCommand.java b/src/main/java/emu/grasscutter/command/commands/AnnounceCommand.java
index 078e7a3a3..0c1296484 100644
--- a/src/main/java/emu/grasscutter/command/commands/AnnounceCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/AnnounceCommand.java
@@ -1,15 +1,13 @@
 package emu.grasscutter.command.commands;
 
-import static emu.grasscutter.utils.lang.Language.translate;
-
 import emu.grasscutter.Grasscutter;
-import emu.grasscutter.command.Command;
-import emu.grasscutter.command.CommandHandler;
+import emu.grasscutter.command.*;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.server.packet.send.PacketServerAnnounceNotify;
-import java.util.Collections;
-import java.util.List;
-import java.util.Random;
+
+import java.util.*;
+
+import static emu.grasscutter.utils.lang.Language.translate;
 
 @Command(
         label = "announce",
diff --git a/src/main/java/emu/grasscutter/command/commands/BanCommand.java b/src/main/java/emu/grasscutter/command/commands/BanCommand.java
index b9de6e268..79cda5858 100644
--- a/src/main/java/emu/grasscutter/command/commands/BanCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/BanCommand.java
@@ -1,10 +1,10 @@
 package emu.grasscutter.command.commands;
 
-import emu.grasscutter.command.Command;
-import emu.grasscutter.command.CommandHandler;
+import emu.grasscutter.command.*;
 import emu.grasscutter.game.Account;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.server.game.GameSession;
+
 import java.util.List;
 
 @Command(
diff --git a/src/main/java/emu/grasscutter/command/commands/ClearCommand.java b/src/main/java/emu/grasscutter/command/commands/ClearCommand.java
index d7f7555e5..4ea4c32dc 100644
--- a/src/main/java/emu/grasscutter/command/commands/ClearCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/ClearCommand.java
@@ -1,19 +1,16 @@
 package emu.grasscutter.command.commands;
 
-import static emu.grasscutter.command.CommandHelpers.*;
-
-import emu.grasscutter.command.Command;
-import emu.grasscutter.command.CommandHandler;
-import emu.grasscutter.game.inventory.GameItem;
-import emu.grasscutter.game.inventory.Inventory;
-import emu.grasscutter.game.inventory.ItemType;
+import emu.grasscutter.command.*;
+import emu.grasscutter.game.inventory.*;
 import emu.grasscutter.game.player.Player;
-import java.util.List;
-import java.util.Map;
+import lombok.Setter;
+
+import java.util.*;
 import java.util.function.BiConsumer;
 import java.util.regex.Pattern;
 import java.util.stream.Stream;
-import lombok.Setter;
+
+import static emu.grasscutter.command.CommandHelpers.*;
 
 @Command(
         label = "clear",
diff --git a/src/main/java/emu/grasscutter/command/commands/CoopCommand.java b/src/main/java/emu/grasscutter/command/commands/CoopCommand.java
index d31a8509b..a1ff03be4 100644
--- a/src/main/java/emu/grasscutter/command/commands/CoopCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/CoopCommand.java
@@ -1,9 +1,9 @@
 package emu.grasscutter.command.commands;
 
 import emu.grasscutter.Grasscutter;
-import emu.grasscutter.command.Command;
-import emu.grasscutter.command.CommandHandler;
+import emu.grasscutter.command.*;
 import emu.grasscutter.game.player.Player;
+
 import java.util.List;
 
 @Command(
diff --git a/src/main/java/emu/grasscutter/command/commands/CutsceneCommand.java b/src/main/java/emu/grasscutter/command/commands/CutsceneCommand.java
index 12df77357..059dd7344 100644
--- a/src/main/java/emu/grasscutter/command/commands/CutsceneCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/CutsceneCommand.java
@@ -1,12 +1,12 @@
 package emu.grasscutter.command.commands;
 
-import emu.grasscutter.command.Command;
-import emu.grasscutter.command.CommandHandler;
+import emu.grasscutter.command.*;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.server.packet.send.PacketCutsceneBeginNotify;
-import java.util.List;
 import lombok.val;
 
+import java.util.List;
+
 @Command(
         label = "cutscene",
         aliases = {"c"},
diff --git a/src/main/java/emu/grasscutter/command/commands/DebugCommand.java b/src/main/java/emu/grasscutter/command/commands/DebugCommand.java
index c4aac96af..278b900c1 100644
--- a/src/main/java/emu/grasscutter/command/commands/DebugCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/DebugCommand.java
@@ -3,6 +3,7 @@ package emu.grasscutter.command.commands;
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.command.*;
 import emu.grasscutter.game.player.Player;
+
 import java.util.List;
 
 @Command(
diff --git a/src/main/java/emu/grasscutter/command/commands/EnterDungeonCommand.java b/src/main/java/emu/grasscutter/command/commands/EnterDungeonCommand.java
index 77a2f7cb7..75558c765 100644
--- a/src/main/java/emu/grasscutter/command/commands/EnterDungeonCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/EnterDungeonCommand.java
@@ -1,12 +1,12 @@
 package emu.grasscutter.command.commands;
 
-import static emu.grasscutter.utils.lang.Language.translate;
-
-import emu.grasscutter.command.Command;
-import emu.grasscutter.command.CommandHandler;
+import emu.grasscutter.command.*;
 import emu.grasscutter.game.player.Player;
+
 import java.util.List;
 
+import static emu.grasscutter.utils.lang.Language.translate;
+
 @Command(
         label = "enter_dungeon",
         aliases = {"enterdungeon", "dungeon"},
diff --git a/src/main/java/emu/grasscutter/command/commands/EntityCommand.java b/src/main/java/emu/grasscutter/command/commands/EntityCommand.java
index 1c933dee7..8d53ae48e 100644
--- a/src/main/java/emu/grasscutter/command/commands/EntityCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/EntityCommand.java
@@ -1,23 +1,20 @@
 package emu.grasscutter.command.commands;
 
-import static emu.grasscutter.command.CommandHelpers.*;
-import static emu.grasscutter.utils.lang.Language.translate;
-
-import emu.grasscutter.command.Command;
-import emu.grasscutter.command.CommandHandler;
+import emu.grasscutter.command.*;
 import emu.grasscutter.game.entity.*;
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.game.props.ElementType;
-import emu.grasscutter.game.props.FightProperty;
+import emu.grasscutter.game.props.*;
 import emu.grasscutter.game.world.Scene;
 import emu.grasscutter.server.event.entity.EntityDamageEvent;
 import emu.grasscutter.server.packet.send.PacketEntityFightPropUpdateNotify;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
+import lombok.Setter;
+
+import java.util.*;
 import java.util.function.BiConsumer;
 import java.util.regex.Pattern;
-import lombok.Setter;
+
+import static emu.grasscutter.command.CommandHelpers.*;
+import static emu.grasscutter.utils.lang.Language.translate;
 
 @Command(
         label = "entity",
diff --git a/src/main/java/emu/grasscutter/command/commands/GiveCommand.java b/src/main/java/emu/grasscutter/command/commands/GiveCommand.java
index 2fa3e496a..e5c1f035e 100644
--- a/src/main/java/emu/grasscutter/command/commands/GiveCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/GiveCommand.java
@@ -1,29 +1,23 @@
 package emu.grasscutter.command.commands;
 
+import emu.grasscutter.command.*;
+import emu.grasscutter.data.*;
+import emu.grasscutter.data.excels.ItemData;
+import emu.grasscutter.data.excels.avatar.AvatarData;
+import emu.grasscutter.data.excels.reliquary.*;
+import emu.grasscutter.game.avatar.Avatar;
+import emu.grasscutter.game.inventory.*;
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.game.props.*;
+import lombok.Setter;
+
+import java.util.*;
+import java.util.function.BiConsumer;
+import java.util.regex.Pattern;
+
 import static emu.grasscutter.GameConstants.*;
 import static emu.grasscutter.command.CommandHelpers.*;
 
-import emu.grasscutter.command.Command;
-import emu.grasscutter.command.CommandHandler;
-import emu.grasscutter.data.GameData;
-import emu.grasscutter.data.GameDepot;
-import emu.grasscutter.data.excels.ItemData;
-import emu.grasscutter.data.excels.avatar.AvatarData;
-import emu.grasscutter.data.excels.reliquary.ReliquaryAffixData;
-import emu.grasscutter.data.excels.reliquary.ReliquaryMainPropData;
-import emu.grasscutter.game.avatar.Avatar;
-import emu.grasscutter.game.inventory.GameItem;
-import emu.grasscutter.game.inventory.ItemType;
-import emu.grasscutter.game.player.Player;
-import emu.grasscutter.game.props.ActionReason;
-import emu.grasscutter.game.props.FightProperty;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.function.BiConsumer;
-import java.util.regex.Pattern;
-import lombok.Setter;
-
 @Command(
         label = "give",
         aliases = {"g", "item", "giveitem"},
diff --git a/src/main/java/emu/grasscutter/command/commands/GroupCommand.java b/src/main/java/emu/grasscutter/command/commands/GroupCommand.java
index 74d94fb2d..f8ea6f2b5 100644
--- a/src/main/java/emu/grasscutter/command/commands/GroupCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/GroupCommand.java
@@ -1,13 +1,13 @@
 package emu.grasscutter.command.commands;
 
-import static emu.grasscutter.utils.lang.Language.translate;
-
-import emu.grasscutter.command.Command;
-import emu.grasscutter.command.CommandHandler;
+import emu.grasscutter.command.*;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.world.SceneGroupInstance;
+
 import java.util.List;
 
+import static emu.grasscutter.utils.lang.Language.translate;
+
 @Command(
         label = "group",
         aliases = {"gr"},
diff --git a/src/main/java/emu/grasscutter/command/commands/HealCommand.java b/src/main/java/emu/grasscutter/command/commands/HealCommand.java
index 491303cd3..5a2aa3fb8 100644
--- a/src/main/java/emu/grasscutter/command/commands/HealCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/HealCommand.java
@@ -1,15 +1,14 @@
 package emu.grasscutter.command.commands;
 
-import static emu.grasscutter.utils.lang.Language.translate;
-
-import emu.grasscutter.command.Command;
-import emu.grasscutter.command.CommandHandler;
+import emu.grasscutter.command.*;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.props.FightProperty;
-import emu.grasscutter.server.packet.send.PacketAvatarFightPropUpdateNotify;
-import emu.grasscutter.server.packet.send.PacketAvatarLifeStateChangeNotify;
+import emu.grasscutter.server.packet.send.*;
+
 import java.util.List;
 
+import static emu.grasscutter.utils.lang.Language.translate;
+
 @Command(
         label = "heal",
         aliases = {"h"},
diff --git a/src/main/java/emu/grasscutter/command/commands/HelpCommand.java b/src/main/java/emu/grasscutter/command/commands/HelpCommand.java
index 9e3ecbafa..6d28fe115 100644
--- a/src/main/java/emu/grasscutter/command/commands/HelpCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/HelpCommand.java
@@ -1,14 +1,12 @@
 package emu.grasscutter.command.commands;
 
-import static emu.grasscutter.utils.lang.Language.translate;
-
-import emu.grasscutter.command.Command;
-import emu.grasscutter.command.CommandHandler;
-import emu.grasscutter.command.CommandMap;
+import emu.grasscutter.command.*;
 import emu.grasscutter.game.Account;
 import emu.grasscutter.game.player.Player;
-import java.util.ArrayList;
-import java.util.List;
+
+import java.util.*;
+
+import static emu.grasscutter.utils.lang.Language.translate;
 
 @Command(
         label = "help",
diff --git a/src/main/java/emu/grasscutter/command/commands/InfoCommand.java b/src/main/java/emu/grasscutter/command/commands/InfoCommand.java
index f7b1c6979..60cdfbbd0 100644
--- a/src/main/java/emu/grasscutter/command/commands/InfoCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/InfoCommand.java
@@ -1,9 +1,7 @@
 package emu.grasscutter.command.commands;
 
-import emu.grasscutter.BuildConfig;
-import emu.grasscutter.Grasscutter;
-import emu.grasscutter.command.Command;
-import emu.grasscutter.command.CommandHandler;
+import emu.grasscutter.*;
+import emu.grasscutter.command.*;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.tools.Tools;
 
diff --git a/src/main/java/emu/grasscutter/command/commands/KickCommand.java b/src/main/java/emu/grasscutter/command/commands/KickCommand.java
index 6eb974989..454e7db79 100644
--- a/src/main/java/emu/grasscutter/command/commands/KickCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/KickCommand.java
@@ -1,8 +1,8 @@
 package emu.grasscutter.command.commands;
 
-import emu.grasscutter.command.Command;
-import emu.grasscutter.command.CommandHandler;
+import emu.grasscutter.command.*;
 import emu.grasscutter.game.player.Player;
+
 import java.util.List;
 
 @Command(
diff --git a/src/main/java/emu/grasscutter/command/commands/KillAllCommand.java b/src/main/java/emu/grasscutter/command/commands/KillAllCommand.java
index 7472bcada..dff353883 100644
--- a/src/main/java/emu/grasscutter/command/commands/KillAllCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/KillAllCommand.java
@@ -1,15 +1,14 @@
 package emu.grasscutter.command.commands;
 
-import static emu.grasscutter.utils.lang.Language.translate;
-
-import emu.grasscutter.command.Command;
-import emu.grasscutter.command.CommandHandler;
-import emu.grasscutter.game.entity.EntityMonster;
-import emu.grasscutter.game.entity.GameEntity;
+import emu.grasscutter.command.*;
+import emu.grasscutter.game.entity.*;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.world.Scene;
+
 import java.util.List;
 
+import static emu.grasscutter.utils.lang.Language.translate;
+
 @Command(
         label = "killall",
         usage = {"[]"},
diff --git a/src/main/java/emu/grasscutter/command/commands/KillCharacterCommand.java b/src/main/java/emu/grasscutter/command/commands/KillCharacterCommand.java
index 1ff4e42f6..dd4016b9e 100644
--- a/src/main/java/emu/grasscutter/command/commands/KillCharacterCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/KillCharacterCommand.java
@@ -1,17 +1,15 @@
 package emu.grasscutter.command.commands;
 
-import static emu.grasscutter.utils.lang.Language.translate;
-
-import emu.grasscutter.command.Command;
-import emu.grasscutter.command.CommandHandler;
+import emu.grasscutter.command.*;
 import emu.grasscutter.game.entity.EntityAvatar;
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.game.props.FightProperty;
-import emu.grasscutter.game.props.LifeState;
-import emu.grasscutter.server.packet.send.PacketEntityFightPropUpdateNotify;
-import emu.grasscutter.server.packet.send.PacketLifeStateChangeNotify;
+import emu.grasscutter.game.props.*;
+import emu.grasscutter.server.packet.send.*;
+
 import java.util.List;
 
+import static emu.grasscutter.utils.lang.Language.translate;
+
 @Command(
         label = "killCharacter",
         aliases = {"suicide", "kill"},
diff --git a/src/main/java/emu/grasscutter/command/commands/LanguageCommand.java b/src/main/java/emu/grasscutter/command/commands/LanguageCommand.java
index e6823b90f..2f86268e8 100644
--- a/src/main/java/emu/grasscutter/command/commands/LanguageCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/LanguageCommand.java
@@ -1,14 +1,13 @@
 package emu.grasscutter.command.commands;
 
-import static emu.grasscutter.utils.lang.Language.translate;
-
 import emu.grasscutter.Grasscutter;
-import emu.grasscutter.command.Command;
-import emu.grasscutter.command.CommandHandler;
+import emu.grasscutter.command.*;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.utils.Utils;
-import java.util.List;
-import java.util.Locale;
+
+import java.util.*;
+
+import static emu.grasscutter.utils.lang.Language.translate;
 
 @Command(
         label = "language",
diff --git a/src/main/java/emu/grasscutter/command/commands/ListCommand.java b/src/main/java/emu/grasscutter/command/commands/ListCommand.java
index 8bdc331d8..fb9ed0f26 100644
--- a/src/main/java/emu/grasscutter/command/commands/ListCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/ListCommand.java
@@ -1,13 +1,12 @@
 package emu.grasscutter.command.commands;
 
-import static emu.grasscutter.utils.lang.Language.translate;
-
 import emu.grasscutter.Grasscutter;
-import emu.grasscutter.command.Command;
-import emu.grasscutter.command.CommandHandler;
+import emu.grasscutter.command.*;
 import emu.grasscutter.game.player.Player;
-import java.util.List;
-import java.util.Map;
+
+import java.util.*;
+
+import static emu.grasscutter.utils.lang.Language.translate;
 
 @Command(
         label = "list",
diff --git a/src/main/java/emu/grasscutter/command/commands/PermissionCommand.java b/src/main/java/emu/grasscutter/command/commands/PermissionCommand.java
index 876a31a65..ede194e19 100644
--- a/src/main/java/emu/grasscutter/command/commands/PermissionCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/PermissionCommand.java
@@ -1,15 +1,15 @@
 package emu.grasscutter.command.commands;
 
-import static emu.grasscutter.utils.lang.Language.translate;
-
 import emu.grasscutter.Grasscutter;
-import emu.grasscutter.command.Command;
+import emu.grasscutter.command.*;
 import emu.grasscutter.command.Command.TargetRequirement;
-import emu.grasscutter.command.CommandHandler;
 import emu.grasscutter.game.Account;
 import emu.grasscutter.game.player.Player;
+
 import java.util.List;
 
+import static emu.grasscutter.utils.lang.Language.translate;
+
 @Command(
         label = "permission",
         usage = {"add ", "remove ", "clear", "list"},
diff --git a/src/main/java/emu/grasscutter/command/commands/PositionCommand.java b/src/main/java/emu/grasscutter/command/commands/PositionCommand.java
index 9d412d800..4b034ffa1 100644
--- a/src/main/java/emu/grasscutter/command/commands/PositionCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/PositionCommand.java
@@ -1,9 +1,9 @@
 package emu.grasscutter.command.commands;
 
-import emu.grasscutter.command.Command;
-import emu.grasscutter.command.CommandHandler;
+import emu.grasscutter.command.*;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.world.Position;
+
 import java.util.List;
 
 @Command(
diff --git a/src/main/java/emu/grasscutter/command/commands/QuestCommand.java b/src/main/java/emu/grasscutter/command/commands/QuestCommand.java
index 3b4aeb540..4b8b467fa 100644
--- a/src/main/java/emu/grasscutter/command/commands/QuestCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/QuestCommand.java
@@ -1,14 +1,15 @@
 package emu.grasscutter.command.commands;
 
-import static emu.grasscutter.utils.lang.Language.translate;
-
 import emu.grasscutter.command.*;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.quest.GameQuest;
 import emu.grasscutter.game.quest.enums.*;
+
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static emu.grasscutter.utils.lang.Language.translate;
+
 @Command(
         label = "quest",
         aliases = {"q"},
diff --git a/src/main/java/emu/grasscutter/command/commands/ReloadCommand.java b/src/main/java/emu/grasscutter/command/commands/ReloadCommand.java
index 205852d6f..50de6ce29 100644
--- a/src/main/java/emu/grasscutter/command/commands/ReloadCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/ReloadCommand.java
@@ -1,13 +1,13 @@
 package emu.grasscutter.command.commands;
 
-import static emu.grasscutter.utils.lang.Language.translate;
-
 import emu.grasscutter.Grasscutter;
-import emu.grasscutter.command.Command;
-import emu.grasscutter.command.CommandHandler;
+import emu.grasscutter.command.*;
 import emu.grasscutter.game.player.Player;
+
 import java.util.List;
 
+import static emu.grasscutter.utils.lang.Language.translate;
+
 @Command(
         label = "reload",
         permission = "server.reload",
diff --git a/src/main/java/emu/grasscutter/command/commands/ResetConstCommand.java b/src/main/java/emu/grasscutter/command/commands/ResetConstCommand.java
index 963a1ccb1..97a8207de 100644
--- a/src/main/java/emu/grasscutter/command/commands/ResetConstCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/ResetConstCommand.java
@@ -1,14 +1,14 @@
 package emu.grasscutter.command.commands;
 
-import static emu.grasscutter.utils.lang.Language.translate;
-
-import emu.grasscutter.command.Command;
-import emu.grasscutter.command.CommandHandler;
+import emu.grasscutter.command.*;
 import emu.grasscutter.game.avatar.Avatar;
 import emu.grasscutter.game.entity.EntityAvatar;
 import emu.grasscutter.game.player.Player;
+
 import java.util.List;
 
+import static emu.grasscutter.utils.lang.Language.translate;
+
 @Command(
         label = "resetConst",
         aliases = {"resetconstellation"},
diff --git a/src/main/java/emu/grasscutter/command/commands/ResetShopLimitCommand.java b/src/main/java/emu/grasscutter/command/commands/ResetShopLimitCommand.java
index 0b1ae22f4..e365d20de 100644
--- a/src/main/java/emu/grasscutter/command/commands/ResetShopLimitCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/ResetShopLimitCommand.java
@@ -1,12 +1,12 @@
 package emu.grasscutter.command.commands;
 
-import static emu.grasscutter.utils.lang.Language.translate;
-
-import emu.grasscutter.command.Command;
-import emu.grasscutter.command.CommandHandler;
+import emu.grasscutter.command.*;
 import emu.grasscutter.game.player.Player;
+
 import java.util.List;
 
+import static emu.grasscutter.utils.lang.Language.translate;
+
 @Command(
         label = "resetShopLimit",
         aliases = {"resetshop"},
diff --git a/src/main/java/emu/grasscutter/command/commands/SendMailCommand.java b/src/main/java/emu/grasscutter/command/commands/SendMailCommand.java
index bca7d0e2a..85cd49feb 100644
--- a/src/main/java/emu/grasscutter/command/commands/SendMailCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/SendMailCommand.java
@@ -1,16 +1,14 @@
 package emu.grasscutter.command.commands;
 
-import static emu.grasscutter.utils.lang.Language.translate;
-
 import emu.grasscutter.Grasscutter;
-import emu.grasscutter.command.Command;
-import emu.grasscutter.command.CommandHandler;
+import emu.grasscutter.command.*;
 import emu.grasscutter.database.DatabaseHelper;
 import emu.grasscutter.game.mail.Mail;
 import emu.grasscutter.game.player.Player;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Objects;
+
+import java.util.*;
+
+import static emu.grasscutter.utils.lang.Language.translate;
 
 @SuppressWarnings("ConstantConditions")
 @Command(
diff --git a/src/main/java/emu/grasscutter/command/commands/SendMessageCommand.java b/src/main/java/emu/grasscutter/command/commands/SendMessageCommand.java
index bac9d7e81..71e284dd8 100644
--- a/src/main/java/emu/grasscutter/command/commands/SendMessageCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/SendMessageCommand.java
@@ -1,10 +1,10 @@
 package emu.grasscutter.command.commands;
 
 import emu.grasscutter.Grasscutter;
-import emu.grasscutter.command.Command;
+import emu.grasscutter.command.*;
 import emu.grasscutter.command.Command.TargetRequirement;
-import emu.grasscutter.command.CommandHandler;
 import emu.grasscutter.game.player.Player;
+
 import java.util.List;
 
 @Command(
diff --git a/src/main/java/emu/grasscutter/command/commands/SetConstCommand.java b/src/main/java/emu/grasscutter/command/commands/SetConstCommand.java
index 6eaee6fd8..21c4a482a 100644
--- a/src/main/java/emu/grasscutter/command/commands/SetConstCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/SetConstCommand.java
@@ -1,14 +1,12 @@
 package emu.grasscutter.command.commands;
 
-import emu.grasscutter.command.Command;
-import emu.grasscutter.command.CommandHandler;
+import emu.grasscutter.command.*;
 import emu.grasscutter.game.avatar.Avatar;
 import emu.grasscutter.game.entity.EntityAvatar;
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.game.world.Position;
-import emu.grasscutter.game.world.Scene;
-import emu.grasscutter.game.world.World;
+import emu.grasscutter.game.world.*;
 import emu.grasscutter.server.packet.send.PacketSceneEntityAppearNotify;
+
 import java.util.List;
 
 @Command(
diff --git a/src/main/java/emu/grasscutter/command/commands/SetFetterLevelCommand.java b/src/main/java/emu/grasscutter/command/commands/SetFetterLevelCommand.java
index 472e0df2b..001fb845e 100644
--- a/src/main/java/emu/grasscutter/command/commands/SetFetterLevelCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/SetFetterLevelCommand.java
@@ -1,15 +1,15 @@
 package emu.grasscutter.command.commands;
 
-import static emu.grasscutter.utils.lang.Language.translate;
-
-import emu.grasscutter.command.Command;
-import emu.grasscutter.command.CommandHandler;
+import emu.grasscutter.command.*;
 import emu.grasscutter.data.GameData;
 import emu.grasscutter.game.avatar.Avatar;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.server.packet.send.PacketAvatarFetterDataNotify;
+
 import java.util.List;
 
+import static emu.grasscutter.utils.lang.Language.translate;
+
 @Command(
         label = "setFetterLevel",
         usage = {""},
diff --git a/src/main/java/emu/grasscutter/command/commands/SetPropCommand.java b/src/main/java/emu/grasscutter/command/commands/SetPropCommand.java
index 07c082e7d..486350232 100644
--- a/src/main/java/emu/grasscutter/command/commands/SetPropCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/SetPropCommand.java
@@ -1,17 +1,13 @@
 package emu.grasscutter.command.commands;
 
-import emu.grasscutter.command.Command;
-import emu.grasscutter.command.CommandHandler;
+import emu.grasscutter.command.*;
 import emu.grasscutter.data.GameData;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.props.PlayerProperty;
 import emu.grasscutter.game.tower.TowerLevelRecord;
-import emu.grasscutter.server.packet.send.PacketOpenStateChangeNotify;
-import emu.grasscutter.server.packet.send.PacketSceneAreaUnlockNotify;
-import emu.grasscutter.server.packet.send.PacketScenePointUnlockNotify;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import emu.grasscutter.server.packet.send.*;
+
+import java.util.*;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.stream.IntStream;
 
diff --git a/src/main/java/emu/grasscutter/command/commands/SetStatsCommand.java b/src/main/java/emu/grasscutter/command/commands/SetStatsCommand.java
index 56ca718a1..3ba30860e 100644
--- a/src/main/java/emu/grasscutter/command/commands/SetStatsCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/SetStatsCommand.java
@@ -1,15 +1,13 @@
 package emu.grasscutter.command.commands;
 
-import emu.grasscutter.command.Command;
-import emu.grasscutter.command.CommandHandler;
+import emu.grasscutter.command.*;
 import emu.grasscutter.game.avatar.Avatar;
 import emu.grasscutter.game.entity.EntityAvatar;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.props.FightProperty;
 import emu.grasscutter.server.packet.send.PacketEntityFightPropUpdateNotify;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+
+import java.util.*;
 
 @Command(
         label = "setStats",
diff --git a/src/main/java/emu/grasscutter/command/commands/SoundCommand.java b/src/main/java/emu/grasscutter/command/commands/SoundCommand.java
index ed36639e8..6c5c71a56 100644
--- a/src/main/java/emu/grasscutter/command/commands/SoundCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/SoundCommand.java
@@ -1,15 +1,15 @@
 package emu.grasscutter.command.commands;
 
-import static emu.grasscutter.utils.lang.Language.translate;
-
-import emu.grasscutter.command.Command;
-import emu.grasscutter.command.CommandHandler;
+import emu.grasscutter.command.*;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.world.Position;
 import emu.grasscutter.server.packet.send.PacketScenePlayerSoundNotify;
-import java.util.List;
 import lombok.val;
 
+import java.util.List;
+
+import static emu.grasscutter.utils.lang.Language.translate;
+
 @Command(
         label = "sound",
         aliases = {"audio"},
diff --git a/src/main/java/emu/grasscutter/command/commands/SpawnCommand.java b/src/main/java/emu/grasscutter/command/commands/SpawnCommand.java
index f555cf308..b5b1ec9fc 100644
--- a/src/main/java/emu/grasscutter/command/commands/SpawnCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/SpawnCommand.java
@@ -1,27 +1,23 @@
 package emu.grasscutter.command.commands;
 
+import emu.grasscutter.command.*;
+import emu.grasscutter.data.GameData;
+import emu.grasscutter.data.excels.*;
+import emu.grasscutter.data.excels.monster.MonsterData;
+import emu.grasscutter.game.entity.*;
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.game.props.*;
+import emu.grasscutter.game.world.*;
+import lombok.Setter;
+
+import java.util.*;
+import java.util.function.BiConsumer;
+import java.util.regex.Pattern;
+
 import static emu.grasscutter.command.CommandHelpers.*;
 import static emu.grasscutter.config.Configuration.GAME_OPTIONS;
 import static emu.grasscutter.utils.lang.Language.translate;
 
-import emu.grasscutter.command.Command;
-import emu.grasscutter.command.CommandHandler;
-import emu.grasscutter.data.GameData;
-import emu.grasscutter.data.excels.GadgetData;
-import emu.grasscutter.data.excels.ItemData;
-import emu.grasscutter.data.excels.monster.MonsterData;
-import emu.grasscutter.game.entity.*;
-import emu.grasscutter.game.player.Player;
-import emu.grasscutter.game.props.EntityType;
-import emu.grasscutter.game.props.FightProperty;
-import emu.grasscutter.game.world.Position;
-import emu.grasscutter.game.world.Scene;
-import java.util.List;
-import java.util.Map;
-import java.util.function.BiConsumer;
-import java.util.regex.Pattern;
-import lombok.Setter;
-
 @Command(
         label = "spawn",
         aliases = {"drop", "s"},
diff --git a/src/main/java/emu/grasscutter/command/commands/StopCommand.java b/src/main/java/emu/grasscutter/command/commands/StopCommand.java
index ec43b6c0f..9257e7f22 100644
--- a/src/main/java/emu/grasscutter/command/commands/StopCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/StopCommand.java
@@ -1,13 +1,13 @@
 package emu.grasscutter.command.commands;
 
-import static emu.grasscutter.utils.lang.Language.translate;
-
 import emu.grasscutter.Grasscutter;
-import emu.grasscutter.command.Command;
-import emu.grasscutter.command.CommandHandler;
+import emu.grasscutter.command.*;
 import emu.grasscutter.game.player.Player;
+
 import java.util.List;
 
+import static emu.grasscutter.utils.lang.Language.translate;
+
 @Command(
         label = "stop",
         aliases = {"shutdown"},
diff --git a/src/main/java/emu/grasscutter/command/commands/TalentCommand.java b/src/main/java/emu/grasscutter/command/commands/TalentCommand.java
index 69d655afb..f36c3c171 100644
--- a/src/main/java/emu/grasscutter/command/commands/TalentCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/TalentCommand.java
@@ -1,12 +1,12 @@
 package emu.grasscutter.command.commands;
 
-import emu.grasscutter.command.Command;
-import emu.grasscutter.command.CommandHandler;
+import emu.grasscutter.command.*;
 import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.excels.avatar.AvatarSkillDepotData;
 import emu.grasscutter.game.avatar.Avatar;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.utils.lang.Language;
+
 import java.util.List;
 
 @Command(
diff --git a/src/main/java/emu/grasscutter/command/commands/TeamCommand.java b/src/main/java/emu/grasscutter/command/commands/TeamCommand.java
index e36e272c6..14cf0f244 100644
--- a/src/main/java/emu/grasscutter/command/commands/TeamCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/TeamCommand.java
@@ -1,14 +1,12 @@
 package emu.grasscutter.command.commands;
 
-import static emu.grasscutter.config.Configuration.GAME_OPTIONS;
-
-import emu.grasscutter.command.Command;
-import emu.grasscutter.command.CommandHandler;
+import emu.grasscutter.command.*;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.server.packet.send.PacketChangeMpTeamAvatarRsp;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
+
+import java.util.*;
+
+import static emu.grasscutter.config.Configuration.GAME_OPTIONS;
 
 @Command(
         label = "team",
diff --git a/src/main/java/emu/grasscutter/command/commands/TeleportAllCommand.java b/src/main/java/emu/grasscutter/command/commands/TeleportAllCommand.java
index a253b40e4..99fe0c423 100644
--- a/src/main/java/emu/grasscutter/command/commands/TeleportAllCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/TeleportAllCommand.java
@@ -1,13 +1,13 @@
 package emu.grasscutter.command.commands;
 
-import static emu.grasscutter.utils.lang.Language.translate;
-
-import emu.grasscutter.command.Command;
-import emu.grasscutter.command.CommandHandler;
+import emu.grasscutter.command.*;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.server.event.player.PlayerTeleportEvent.TeleportType;
+
 import java.util.List;
 
+import static emu.grasscutter.utils.lang.Language.translate;
+
 @Command(
         label = "teleportAll",
         aliases = {"tpall"},
diff --git a/src/main/java/emu/grasscutter/command/commands/TeleportCommand.java b/src/main/java/emu/grasscutter/command/commands/TeleportCommand.java
index 9e72f8f71..64070561c 100644
--- a/src/main/java/emu/grasscutter/command/commands/TeleportCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/TeleportCommand.java
@@ -1,14 +1,14 @@
 package emu.grasscutter.command.commands;
 
-import static emu.grasscutter.utils.lang.Language.translate;
-
-import emu.grasscutter.command.Command;
-import emu.grasscutter.command.CommandHandler;
+import emu.grasscutter.command.*;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.world.Position;
 import emu.grasscutter.server.event.player.PlayerTeleportEvent.TeleportType;
+
 import java.util.List;
 
+import static emu.grasscutter.utils.lang.Language.translate;
+
 @Command(
         label = "teleport",
         aliases = {"tp"},
diff --git a/src/main/java/emu/grasscutter/command/commands/TrialAvatarActivityCommand.java b/src/main/java/emu/grasscutter/command/commands/TrialAvatarActivityCommand.java
index 5a2a0160b..7a78bcd0d 100644
--- a/src/main/java/emu/grasscutter/command/commands/TrialAvatarActivityCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/TrialAvatarActivityCommand.java
@@ -1,17 +1,16 @@
 package emu.grasscutter.command.commands;
 
-import static emu.grasscutter.utils.lang.Language.translate;
-
-import emu.grasscutter.command.Command;
-import emu.grasscutter.command.CommandHandler;
-import emu.grasscutter.game.activity.trialavatar.TrialAvatarActivityHandler;
-import emu.grasscutter.game.activity.trialavatar.TrialAvatarPlayerData;
+import emu.grasscutter.command.*;
+import emu.grasscutter.game.activity.trialavatar.*;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.props.ActivityType;
 import emu.grasscutter.server.packet.send.PacketActivityInfoNotify;
 import emu.grasscutter.utils.JsonUtils;
+
 import java.util.List;
 
+import static emu.grasscutter.utils.lang.Language.translate;
+
 @Command(
         label = "trialAvatarActivity",
         aliases = {"taa"},
diff --git a/src/main/java/emu/grasscutter/command/commands/UnBanCommand.java b/src/main/java/emu/grasscutter/command/commands/UnBanCommand.java
index 33687d06c..db027ccf5 100644
--- a/src/main/java/emu/grasscutter/command/commands/UnBanCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/UnBanCommand.java
@@ -1,9 +1,9 @@
 package emu.grasscutter.command.commands;
 
-import emu.grasscutter.command.Command;
-import emu.grasscutter.command.CommandHandler;
+import emu.grasscutter.command.*;
 import emu.grasscutter.game.Account;
 import emu.grasscutter.game.player.Player;
+
 import java.util.List;
 
 @Command(
diff --git a/src/main/java/emu/grasscutter/command/commands/UnlockAllCommand.java b/src/main/java/emu/grasscutter/command/commands/UnlockAllCommand.java
index 4f16448b0..fa376d5af 100644
--- a/src/main/java/emu/grasscutter/command/commands/UnlockAllCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/UnlockAllCommand.java
@@ -1,16 +1,13 @@
 package emu.grasscutter.command.commands;
 
-import static emu.grasscutter.utils.lang.Language.translate;
-
-import emu.grasscutter.command.Command;
-import emu.grasscutter.command.CommandHandler;
+import emu.grasscutter.command.*;
 import emu.grasscutter.data.GameData;
-import emu.grasscutter.game.player.Player;
-import emu.grasscutter.game.player.PlayerProgressManager;
+import emu.grasscutter.game.player.*;
 import emu.grasscutter.server.packet.send.PacketOpenStateChangeNotify;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+
+import java.util.*;
+
+import static emu.grasscutter.utils.lang.Language.translate;
 
 @Command(
         label = "unlockall",
diff --git a/src/main/java/emu/grasscutter/command/commands/WeatherCommand.java b/src/main/java/emu/grasscutter/command/commands/WeatherCommand.java
index daf0f1fca..cf8d52c53 100644
--- a/src/main/java/emu/grasscutter/command/commands/WeatherCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/WeatherCommand.java
@@ -1,9 +1,9 @@
 package emu.grasscutter.command.commands;
 
-import emu.grasscutter.command.Command;
-import emu.grasscutter.command.CommandHandler;
+import emu.grasscutter.command.*;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.props.ClimateType;
+
 import java.util.List;
 
 @Command(
diff --git a/src/main/java/emu/grasscutter/data/GameData.java b/src/main/java/emu/grasscutter/data/GameData.java
index e486c5655..5bef0478a 100644
--- a/src/main/java/emu/grasscutter/data/GameData.java
+++ b/src/main/java/emu/grasscutter/data/GameData.java
@@ -4,53 +4,30 @@ import emu.grasscutter.Grasscutter;
 import emu.grasscutter.data.binout.*;
 import emu.grasscutter.data.binout.config.*;
 import emu.grasscutter.data.binout.routes.Route;
-import emu.grasscutter.data.custom.TrialAvatarActivityCustomData;
-import emu.grasscutter.data.custom.TrialAvatarCustomData;
+import emu.grasscutter.data.custom.*;
 import emu.grasscutter.data.excels.*;
-import emu.grasscutter.data.excels.achievement.AchievementData;
-import emu.grasscutter.data.excels.achievement.AchievementGoalData;
-import emu.grasscutter.data.excels.activity.ActivityCondExcelConfigData;
-import emu.grasscutter.data.excels.activity.ActivityData;
-import emu.grasscutter.data.excels.activity.ActivityShopData;
-import emu.grasscutter.data.excels.activity.ActivityWatcherData;
+import emu.grasscutter.data.excels.achievement.*;
+import emu.grasscutter.data.excels.activity.*;
 import emu.grasscutter.data.excels.avatar.*;
 import emu.grasscutter.data.excels.codex.*;
 import emu.grasscutter.data.excels.dungeon.*;
-import emu.grasscutter.data.excels.giving.GivingData;
-import emu.grasscutter.data.excels.giving.GivingGroupData;
-import emu.grasscutter.data.excels.monster.MonsterCurveData;
-import emu.grasscutter.data.excels.monster.MonsterData;
-import emu.grasscutter.data.excels.monster.MonsterDescribeData;
-import emu.grasscutter.data.excels.monster.MonsterSpecialNameData;
-import emu.grasscutter.data.excels.quest.QuestData;
-import emu.grasscutter.data.excels.quest.QuestGlobalVarData;
-import emu.grasscutter.data.excels.reliquary.ReliquaryAffixData;
-import emu.grasscutter.data.excels.reliquary.ReliquaryLevelData;
-import emu.grasscutter.data.excels.reliquary.ReliquaryMainPropData;
-import emu.grasscutter.data.excels.reliquary.ReliquarySetData;
+import emu.grasscutter.data.excels.giving.*;
+import emu.grasscutter.data.excels.monster.*;
+import emu.grasscutter.data.excels.quest.*;
+import emu.grasscutter.data.excels.reliquary.*;
 import emu.grasscutter.data.excels.scene.*;
-import emu.grasscutter.data.excels.tower.TowerFloorData;
-import emu.grasscutter.data.excels.tower.TowerLevelData;
-import emu.grasscutter.data.excels.tower.TowerScheduleData;
+import emu.grasscutter.data.excels.tower.*;
 import emu.grasscutter.data.excels.trial.*;
-import emu.grasscutter.data.excels.weapon.WeaponCurveData;
-import emu.grasscutter.data.excels.weapon.WeaponLevelData;
-import emu.grasscutter.data.excels.weapon.WeaponPromoteData;
-import emu.grasscutter.data.excels.world.WeatherData;
-import emu.grasscutter.data.excels.world.WorldAreaData;
-import emu.grasscutter.data.excels.world.WorldLevelData;
+import emu.grasscutter.data.excels.weapon.*;
+import emu.grasscutter.data.excels.world.*;
 import emu.grasscutter.data.server.*;
 import emu.grasscutter.game.dungeons.DungeonDropEntry;
-import emu.grasscutter.game.quest.QuestEncryptionKey;
-import emu.grasscutter.game.quest.RewindData;
-import emu.grasscutter.game.quest.TeleportData;
+import emu.grasscutter.game.quest.*;
 import emu.grasscutter.game.quest.enums.QuestCond;
 import emu.grasscutter.game.world.GroupReplacementData;
 import emu.grasscutter.utils.Utils;
 import it.unimi.dsi.fastutil.ints.*;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.val;
+import lombok.*;
 
 import javax.annotation.Nullable;
 import java.lang.reflect.Field;
diff --git a/src/main/java/emu/grasscutter/data/GameDepot.java b/src/main/java/emu/grasscutter/data/GameDepot.java
index 31b5377b5..58bbf9bbf 100644
--- a/src/main/java/emu/grasscutter/data/GameDepot.java
+++ b/src/main/java/emu/grasscutter/data/GameDepot.java
@@ -2,19 +2,14 @@ package emu.grasscutter.data;
 
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.data.ResourceLoader.AvatarConfig;
-import emu.grasscutter.data.excels.reliquary.ReliquaryAffixData;
-import emu.grasscutter.data.excels.reliquary.ReliquaryMainPropData;
+import emu.grasscutter.data.excels.reliquary.*;
 import emu.grasscutter.game.managers.blossom.BlossomConfig;
 import emu.grasscutter.game.world.SpawnDataEntry;
 import emu.grasscutter.utils.objects.WeightedList;
-import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import lombok.Getter;
-import lombok.Setter;
+import it.unimi.dsi.fastutil.ints.*;
+import lombok.*;
+
+import java.util.*;
 
 public class GameDepot {
     public static final int[] BLOCK_SIZE = new int[] {50, 500}; // Scales
diff --git a/src/main/java/emu/grasscutter/data/ResourceType.java b/src/main/java/emu/grasscutter/data/ResourceType.java
index 542c1e9e0..d0142743b 100644
--- a/src/main/java/emu/grasscutter/data/ResourceType.java
+++ b/src/main/java/emu/grasscutter/data/ResourceType.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.data;
 
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.*;
 import java.util.List;
 import java.util.stream.Stream;
 
diff --git a/src/main/java/emu/grasscutter/data/binout/AbilityData.java b/src/main/java/emu/grasscutter/data/binout/AbilityData.java
index bf8df5a83..db4bc60fd 100644
--- a/src/main/java/emu/grasscutter/data/binout/AbilityData.java
+++ b/src/main/java/emu/grasscutter/data/binout/AbilityData.java
@@ -3,8 +3,8 @@ package emu.grasscutter.data.binout;
 import emu.grasscutter.data.binout.AbilityModifier.AbilityModifierAction;
 import emu.grasscutter.game.ability.AbilityLocalIdGenerator;
 import emu.grasscutter.game.ability.AbilityLocalIdGenerator.ConfigAbilitySubContainerType;
-import java.util.HashMap;
-import java.util.Map;
+
+import java.util.*;
 
 public class AbilityData {
     public String abilityName;
diff --git a/src/main/java/emu/grasscutter/data/binout/AbilityMixinData.java b/src/main/java/emu/grasscutter/data/binout/AbilityMixinData.java
index 3b0938cc5..c6e54de4f 100644
--- a/src/main/java/emu/grasscutter/data/binout/AbilityMixinData.java
+++ b/src/main/java/emu/grasscutter/data/binout/AbilityMixinData.java
@@ -1,12 +1,11 @@
 package emu.grasscutter.data.binout;
 
-import com.google.gson.Gson;
-import com.google.gson.JsonElement;
+import com.google.gson.*;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.reflect.TypeToken;
+
 import java.io.Serializable;
-import java.util.Arrays;
-import java.util.List;
+import java.util.*;
 
 public class AbilityMixinData implements Serializable {
     private static final long serialVersionUID = -2001232313615923575L;
diff --git a/src/main/java/emu/grasscutter/data/binout/AbilityModifierEntry.java b/src/main/java/emu/grasscutter/data/binout/AbilityModifierEntry.java
index 37401940f..aa1862075 100644
--- a/src/main/java/emu/grasscutter/data/binout/AbilityModifierEntry.java
+++ b/src/main/java/emu/grasscutter/data/binout/AbilityModifierEntry.java
@@ -1,8 +1,8 @@
 package emu.grasscutter.data.binout;
 
 import emu.grasscutter.data.binout.AbilityModifier.AbilityModifierAction;
-import java.util.ArrayList;
-import java.util.List;
+
+import java.util.*;
 
 public class AbilityModifierEntry {
     public List onModifierAdded;
diff --git a/src/main/java/emu/grasscutter/data/binout/ConfigGadget.java b/src/main/java/emu/grasscutter/data/binout/ConfigGadget.java
index 25a657b5f..94b0d9612 100644
--- a/src/main/java/emu/grasscutter/data/binout/ConfigGadget.java
+++ b/src/main/java/emu/grasscutter/data/binout/ConfigGadget.java
@@ -1,10 +1,10 @@
 package emu.grasscutter.data.binout;
 
-import javax.annotation.Nullable;
-import lombok.AccessLevel;
-import lombok.Data;
+import lombok.*;
 import lombok.experimental.FieldDefaults;
 
+import javax.annotation.Nullable;
+
 @Data
 @FieldDefaults(level = AccessLevel.PRIVATE)
 public class ConfigGadget {
diff --git a/src/main/java/emu/grasscutter/data/binout/ConfigGadgetCombat.java b/src/main/java/emu/grasscutter/data/binout/ConfigGadgetCombat.java
index 5f1da0c76..a858a8efa 100644
--- a/src/main/java/emu/grasscutter/data/binout/ConfigGadgetCombat.java
+++ b/src/main/java/emu/grasscutter/data/binout/ConfigGadgetCombat.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.data.binout;
 
-import lombok.AccessLevel;
-import lombok.Data;
+import lombok.*;
 import lombok.experimental.FieldDefaults;
 
 @Data
diff --git a/src/main/java/emu/grasscutter/data/binout/ConfigGadgetCombatProperty.java b/src/main/java/emu/grasscutter/data/binout/ConfigGadgetCombatProperty.java
index 737d4f0fa..09a72ffa0 100644
--- a/src/main/java/emu/grasscutter/data/binout/ConfigGadgetCombatProperty.java
+++ b/src/main/java/emu/grasscutter/data/binout/ConfigGadgetCombatProperty.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.data.binout;
 
-import lombok.AccessLevel;
-import lombok.Data;
+import lombok.*;
 import lombok.experimental.FieldDefaults;
 
 @Data
diff --git a/src/main/java/emu/grasscutter/data/binout/HomeworldDefaultSaveData.java b/src/main/java/emu/grasscutter/data/binout/HomeworldDefaultSaveData.java
index 30f997e10..cfd9d6fbf 100644
--- a/src/main/java/emu/grasscutter/data/binout/HomeworldDefaultSaveData.java
+++ b/src/main/java/emu/grasscutter/data/binout/HomeworldDefaultSaveData.java
@@ -2,8 +2,7 @@ package emu.grasscutter.data.binout;
 
 import com.google.gson.annotations.SerializedName;
 import emu.grasscutter.game.world.Position;
-import lombok.AccessLevel;
-import lombok.Data;
+import lombok.*;
 import lombok.experimental.FieldDefaults;
 
 import java.util.List;
diff --git a/src/main/java/emu/grasscutter/data/binout/MainQuestData.java b/src/main/java/emu/grasscutter/data/binout/MainQuestData.java
index 5dec01a48..50053bcaa 100644
--- a/src/main/java/emu/grasscutter/data/binout/MainQuestData.java
+++ b/src/main/java/emu/grasscutter/data/binout/MainQuestData.java
@@ -3,12 +3,10 @@ package emu.grasscutter.data.binout;
 import dev.morphia.annotations.Entity;
 import emu.grasscutter.data.GameData;
 import emu.grasscutter.game.quest.enums.QuestType;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
 import lombok.Data;
 
+import java.util.*;
+
 public class MainQuestData {
     private int id;
     private int ICLLDPJFIMA;
diff --git a/src/main/java/emu/grasscutter/data/binout/OpenConfigEntry.java b/src/main/java/emu/grasscutter/data/binout/OpenConfigEntry.java
index f595dc460..368c42880 100644
--- a/src/main/java/emu/grasscutter/data/binout/OpenConfigEntry.java
+++ b/src/main/java/emu/grasscutter/data/binout/OpenConfigEntry.java
@@ -1,8 +1,8 @@
 package emu.grasscutter.data.binout;
 
 import emu.grasscutter.data.ResourceLoader.OpenConfigData;
-import java.util.ArrayList;
-import java.util.List;
+
+import java.util.*;
 
 public class OpenConfigEntry {
     private final String name;
diff --git a/src/main/java/emu/grasscutter/data/binout/SceneNpcBornData.java b/src/main/java/emu/grasscutter/data/binout/SceneNpcBornData.java
index 317c34f0c..771dba034 100644
--- a/src/main/java/emu/grasscutter/data/binout/SceneNpcBornData.java
+++ b/src/main/java/emu/grasscutter/data/binout/SceneNpcBornData.java
@@ -3,13 +3,12 @@ package emu.grasscutter.data.binout;
 import com.github.davidmoten.rtreemulti.RTree;
 import com.github.davidmoten.rtreemulti.geometry.Geometry;
 import emu.grasscutter.scripts.data.SceneGroup;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import lombok.AccessLevel;
-import lombok.Data;
+import lombok.*;
 import lombok.experimental.FieldDefaults;
 
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+
 @Data
 @FieldDefaults(level = AccessLevel.PRIVATE)
 public class SceneNpcBornData {
diff --git a/src/main/java/emu/grasscutter/data/binout/SceneNpcBornEntry.java b/src/main/java/emu/grasscutter/data/binout/SceneNpcBornEntry.java
index 372704a66..545278135 100644
--- a/src/main/java/emu/grasscutter/data/binout/SceneNpcBornEntry.java
+++ b/src/main/java/emu/grasscutter/data/binout/SceneNpcBornEntry.java
@@ -2,11 +2,11 @@ package emu.grasscutter.data.binout;
 
 import com.google.gson.annotations.SerializedName;
 import emu.grasscutter.game.world.Position;
-import java.util.List;
-import lombok.AccessLevel;
-import lombok.Data;
+import lombok.*;
 import lombok.experimental.FieldDefaults;
 
+import java.util.List;
+
 @Data
 @FieldDefaults(level = AccessLevel.PRIVATE)
 public class SceneNpcBornEntry {
diff --git a/src/main/java/emu/grasscutter/data/binout/ScriptSceneData.java b/src/main/java/emu/grasscutter/data/binout/ScriptSceneData.java
index 295b68db5..543ec4c4a 100644
--- a/src/main/java/emu/grasscutter/data/binout/ScriptSceneData.java
+++ b/src/main/java/emu/grasscutter/data/binout/ScriptSceneData.java
@@ -1,10 +1,10 @@
 package emu.grasscutter.data.binout;
 
 import com.google.gson.annotations.SerializedName;
-import java.util.List;
-import java.util.Map;
 import lombok.Data;
 
+import java.util.*;
+
 @Data
 public class ScriptSceneData {
     Map scriptObjectList;
diff --git a/src/main/java/emu/grasscutter/data/binout/TalentData.java b/src/main/java/emu/grasscutter/data/binout/TalentData.java
index 29b0b93b4..fa1e74101 100644
--- a/src/main/java/emu/grasscutter/data/binout/TalentData.java
+++ b/src/main/java/emu/grasscutter/data/binout/TalentData.java
@@ -2,6 +2,7 @@ package emu.grasscutter.data.binout;
 
 import com.google.gson.annotations.SerializedName;
 import emu.grasscutter.data.common.DynamicFloat;
+
 import java.io.Serializable;
 
 public class TalentData implements Serializable {
diff --git a/src/main/java/emu/grasscutter/data/binout/config/ConfigEntityBase.java b/src/main/java/emu/grasscutter/data/binout/config/ConfigEntityBase.java
index 6d78f4933..43c837dd4 100644
--- a/src/main/java/emu/grasscutter/data/binout/config/ConfigEntityBase.java
+++ b/src/main/java/emu/grasscutter/data/binout/config/ConfigEntityBase.java
@@ -1,13 +1,11 @@
 package emu.grasscutter.data.binout.config;
 
-import emu.grasscutter.data.binout.config.fields.ConfigAbilityData;
-import emu.grasscutter.data.binout.config.fields.ConfigCombat;
-import emu.grasscutter.data.binout.config.fields.ConfigCommon;
-import emu.grasscutter.data.binout.config.fields.ConfigGlobalValue;
-import java.util.Collection;
-import javax.annotation.Nullable;
+import emu.grasscutter.data.binout.config.fields.*;
 import lombok.Data;
 
+import javax.annotation.Nullable;
+import java.util.Collection;
+
 @Data
 public class ConfigEntityBase {
     @Nullable ConfigCommon configCommon;
diff --git a/src/main/java/emu/grasscutter/data/binout/config/ConfigEntityGadget.java b/src/main/java/emu/grasscutter/data/binout/config/ConfigEntityGadget.java
index 110d3cbb6..2408eb8a3 100644
--- a/src/main/java/emu/grasscutter/data/binout/config/ConfigEntityGadget.java
+++ b/src/main/java/emu/grasscutter/data/binout/config/ConfigEntityGadget.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.data.binout.config;
 
-import lombok.AccessLevel;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
+import lombok.*;
 import lombok.experimental.FieldDefaults;
 
 @Data
diff --git a/src/main/java/emu/grasscutter/data/binout/config/ConfigEntityMonster.java b/src/main/java/emu/grasscutter/data/binout/config/ConfigEntityMonster.java
index e940f7a74..578a9fb4f 100644
--- a/src/main/java/emu/grasscutter/data/binout/config/ConfigEntityMonster.java
+++ b/src/main/java/emu/grasscutter/data/binout/config/ConfigEntityMonster.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.data.binout.config;
 
-import lombok.Data;
-import lombok.EqualsAndHashCode;
+import lombok.*;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
diff --git a/src/main/java/emu/grasscutter/data/binout/config/ConfigGlobalCombat.java b/src/main/java/emu/grasscutter/data/binout/config/ConfigGlobalCombat.java
index 2b736061a..a43d4044d 100644
--- a/src/main/java/emu/grasscutter/data/binout/config/ConfigGlobalCombat.java
+++ b/src/main/java/emu/grasscutter/data/binout/config/ConfigGlobalCombat.java
@@ -1,8 +1,9 @@
 package emu.grasscutter.data.binout.config;
 
-import java.util.List;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class ConfigGlobalCombat {
     private DefaultAbilities defaultAbilities;
diff --git a/src/main/java/emu/grasscutter/data/binout/config/ConfigLevelEntity.java b/src/main/java/emu/grasscutter/data/binout/config/ConfigLevelEntity.java
index 9afe5a5d1..e45cd7d69 100644
--- a/src/main/java/emu/grasscutter/data/binout/config/ConfigLevelEntity.java
+++ b/src/main/java/emu/grasscutter/data/binout/config/ConfigLevelEntity.java
@@ -1,9 +1,10 @@
 package emu.grasscutter.data.binout.config;
 
 import emu.grasscutter.data.binout.config.fields.ConfigAbilityData;
-import java.util.List;
 import lombok.Getter;
 
+import java.util.List;
+
 public class ConfigLevelEntity {
 
     @Getter private List abilities;
diff --git a/src/main/java/emu/grasscutter/data/binout/config/fields/ConfigCombat.java b/src/main/java/emu/grasscutter/data/binout/config/fields/ConfigCombat.java
index 011e43606..516f5a006 100644
--- a/src/main/java/emu/grasscutter/data/binout/config/fields/ConfigCombat.java
+++ b/src/main/java/emu/grasscutter/data/binout/config/fields/ConfigCombat.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.data.binout.config.fields;
 
-import lombok.AccessLevel;
-import lombok.Data;
+import lombok.*;
 import lombok.experimental.FieldDefaults;
 
 @Data
diff --git a/src/main/java/emu/grasscutter/data/binout/config/fields/ConfigCombatDie.java b/src/main/java/emu/grasscutter/data/binout/config/fields/ConfigCombatDie.java
index c00981710..3f3896948 100644
--- a/src/main/java/emu/grasscutter/data/binout/config/fields/ConfigCombatDie.java
+++ b/src/main/java/emu/grasscutter/data/binout/config/fields/ConfigCombatDie.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.data.binout.config.fields;
 
 import com.google.gson.annotations.SerializedName;
-import lombok.AccessLevel;
-import lombok.Data;
+import lombok.*;
 import lombok.experimental.FieldDefaults;
 
 @Data
diff --git a/src/main/java/emu/grasscutter/data/binout/config/fields/ConfigCombatProperty.java b/src/main/java/emu/grasscutter/data/binout/config/fields/ConfigCombatProperty.java
index 995747762..235e81c9e 100644
--- a/src/main/java/emu/grasscutter/data/binout/config/fields/ConfigCombatProperty.java
+++ b/src/main/java/emu/grasscutter/data/binout/config/fields/ConfigCombatProperty.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.data.binout.config.fields;
 
-import lombok.AccessLevel;
-import lombok.Data;
+import lombok.*;
 import lombok.experimental.FieldDefaults;
 
 @Data
diff --git a/src/main/java/emu/grasscutter/data/binout/config/fields/ConfigGlobalValue.java b/src/main/java/emu/grasscutter/data/binout/config/fields/ConfigGlobalValue.java
index 195667856..6762d6cea 100644
--- a/src/main/java/emu/grasscutter/data/binout/config/fields/ConfigGlobalValue.java
+++ b/src/main/java/emu/grasscutter/data/binout/config/fields/ConfigGlobalValue.java
@@ -1,9 +1,9 @@
 package emu.grasscutter.data.binout.config.fields;
 
-import java.util.Map;
-import java.util.Set;
 import lombok.Data;
 
+import java.util.*;
+
 /** Contains information about the entities SGVs */
 @Data
 public class ConfigGlobalValue {
diff --git a/src/main/java/emu/grasscutter/data/binout/routes/Route.java b/src/main/java/emu/grasscutter/data/binout/routes/Route.java
index 6f77acd9e..526e80ac9 100644
--- a/src/main/java/emu/grasscutter/data/binout/routes/Route.java
+++ b/src/main/java/emu/grasscutter/data/binout/routes/Route.java
@@ -1,10 +1,8 @@
 package emu.grasscutter.data.binout.routes;
 
 import emu.grasscutter.net.proto.RouteOuterClass;
-import lombok.AccessLevel;
-import lombok.Data;
+import lombok.*;
 import lombok.experimental.FieldDefaults;
-import lombok.val;
 
 @Data
 @FieldDefaults(level = AccessLevel.PRIVATE)
diff --git a/src/main/java/emu/grasscutter/data/binout/routes/RoutePoint.java b/src/main/java/emu/grasscutter/data/binout/routes/RoutePoint.java
index c8bd79e6c..6414c8554 100644
--- a/src/main/java/emu/grasscutter/data/binout/routes/RoutePoint.java
+++ b/src/main/java/emu/grasscutter/data/binout/routes/RoutePoint.java
@@ -2,10 +2,8 @@ package emu.grasscutter.data.binout.routes;
 
 import emu.grasscutter.game.world.Position;
 import emu.grasscutter.net.proto.RoutePointOuterClass;
-import lombok.AccessLevel;
-import lombok.Data;
+import lombok.*;
 import lombok.experimental.FieldDefaults;
-import lombok.val;
 
 @Data
 @FieldDefaults(level = AccessLevel.PRIVATE)
diff --git a/src/main/java/emu/grasscutter/data/binout/routes/SceneRoutes.java b/src/main/java/emu/grasscutter/data/binout/routes/SceneRoutes.java
index 510664904..9203ea7b3 100644
--- a/src/main/java/emu/grasscutter/data/binout/routes/SceneRoutes.java
+++ b/src/main/java/emu/grasscutter/data/binout/routes/SceneRoutes.java
@@ -1,10 +1,10 @@
 package emu.grasscutter.data.binout.routes;
 
-import javax.annotation.Nullable;
-import lombok.AccessLevel;
-import lombok.Data;
+import lombok.*;
 import lombok.experimental.FieldDefaults;
 
+import javax.annotation.Nullable;
+
 @Data
 @FieldDefaults(level = AccessLevel.PRIVATE)
 public class SceneRoutes {
diff --git a/src/main/java/emu/grasscutter/data/common/DynamicFloat.java b/src/main/java/emu/grasscutter/data/common/DynamicFloat.java
index 99dc12433..ea29e7074 100644
--- a/src/main/java/emu/grasscutter/data/common/DynamicFloat.java
+++ b/src/main/java/emu/grasscutter/data/common/DynamicFloat.java
@@ -4,9 +4,10 @@ import emu.grasscutter.data.excels.ProudSkillData;
 import emu.grasscutter.game.ability.Ability;
 import it.unimi.dsi.fastutil.floats.FloatArrayList;
 import it.unimi.dsi.fastutil.objects.*;
-import java.util.*;
 import lombok.*;
 
+import java.util.*;
+
 @Getter
 public class DynamicFloat {
     public static DynamicFloat ZERO = new DynamicFloat(0f);
diff --git a/src/main/java/emu/grasscutter/data/common/PointData.java b/src/main/java/emu/grasscutter/data/common/PointData.java
index b3ffddc13..67dfc8c73 100644
--- a/src/main/java/emu/grasscutter/data/common/PointData.java
+++ b/src/main/java/emu/grasscutter/data/common/PointData.java
@@ -5,10 +5,8 @@ import emu.grasscutter.Grasscutter;
 import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.excels.dungeon.DailyDungeonData;
 import emu.grasscutter.game.world.Position;
-import it.unimi.dsi.fastutil.ints.IntArrayList;
-import it.unimi.dsi.fastutil.ints.IntList;
-import lombok.Getter;
-import lombok.Setter;
+import it.unimi.dsi.fastutil.ints.*;
+import lombok.*;
 
 public final class PointData {
     @Getter @Setter private int id;
diff --git a/src/main/java/emu/grasscutter/data/custom/TrialAvatarActivityCustomData.java b/src/main/java/emu/grasscutter/data/custom/TrialAvatarActivityCustomData.java
index 79f503863..0828ae3f0 100644
--- a/src/main/java/emu/grasscutter/data/custom/TrialAvatarActivityCustomData.java
+++ b/src/main/java/emu/grasscutter/data/custom/TrialAvatarActivityCustomData.java
@@ -1,8 +1,9 @@
 package emu.grasscutter.data.custom;
 
 import emu.grasscutter.data.common.BaseTrialActivityData;
+import lombok.Data;
+
 import java.util.List;
-import lombok.*;
 
 @Data
 public class TrialAvatarActivityCustomData implements BaseTrialActivityData {
diff --git a/src/main/java/emu/grasscutter/data/custom/TrialAvatarCustomData.java b/src/main/java/emu/grasscutter/data/custom/TrialAvatarCustomData.java
index 406e3f199..67a2891f0 100644
--- a/src/main/java/emu/grasscutter/data/custom/TrialAvatarCustomData.java
+++ b/src/main/java/emu/grasscutter/data/custom/TrialAvatarCustomData.java
@@ -1,7 +1,8 @@
 package emu.grasscutter.data.custom;
 
+import lombok.Data;
+
 import java.util.List;
-import lombok.*;
 
 @Data
 public class TrialAvatarCustomData {
diff --git a/src/main/java/emu/grasscutter/data/excels/BargainData.java b/src/main/java/emu/grasscutter/data/excels/BargainData.java
index 8bc3d050a..b991a2f08 100644
--- a/src/main/java/emu/grasscutter/data/excels/BargainData.java
+++ b/src/main/java/emu/grasscutter/data/excels/BargainData.java
@@ -1,9 +1,10 @@
 package emu.grasscutter.data.excels;
 
 import emu.grasscutter.data.*;
-import java.util.List;
 import lombok.Getter;
 
+import java.util.List;
+
 @Getter
 @ResourceType(name = "BargainExcelConfigData.json")
 public final class BargainData extends GameResource {
diff --git a/src/main/java/emu/grasscutter/data/excels/BattlePassMissionData.java b/src/main/java/emu/grasscutter/data/excels/BattlePassMissionData.java
index 13793cb92..ec062ce4b 100644
--- a/src/main/java/emu/grasscutter/data/excels/BattlePassMissionData.java
+++ b/src/main/java/emu/grasscutter/data/excels/BattlePassMissionData.java
@@ -1,15 +1,13 @@
 package emu.grasscutter.data.excels;
 
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
-import emu.grasscutter.game.props.BattlePassMissionRefreshType;
-import emu.grasscutter.game.props.WatcherTriggerType;
+import emu.grasscutter.data.*;
+import emu.grasscutter.game.props.*;
 import emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission.MissionStatus;
-import java.util.Arrays;
-import java.util.Set;
-import java.util.stream.Collectors;
 import lombok.Getter;
 
+import java.util.*;
+import java.util.stream.Collectors;
+
 @ResourceType(name = {"BattlePassMissionExcelConfigData.json"})
 @Getter
 public class BattlePassMissionData extends GameResource {
diff --git a/src/main/java/emu/grasscutter/data/excels/BattlePassRewardData.java b/src/main/java/emu/grasscutter/data/excels/BattlePassRewardData.java
index d6c98a23c..c2917b086 100644
--- a/src/main/java/emu/grasscutter/data/excels/BattlePassRewardData.java
+++ b/src/main/java/emu/grasscutter/data/excels/BattlePassRewardData.java
@@ -1,10 +1,10 @@
 package emu.grasscutter.data.excels;
 
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
-import java.util.List;
+import emu.grasscutter.data.*;
 import lombok.Getter;
 
+import java.util.List;
+
 @ResourceType(name = "BattlePassRewardExcelConfigData.json")
 @Getter
 public class BattlePassRewardData extends GameResource {
diff --git a/src/main/java/emu/grasscutter/data/excels/BlossomRefreshExcelConfigData.java b/src/main/java/emu/grasscutter/data/excels/BlossomRefreshExcelConfigData.java
index d06cab994..e2ebcf707 100644
--- a/src/main/java/emu/grasscutter/data/excels/BlossomRefreshExcelConfigData.java
+++ b/src/main/java/emu/grasscutter/data/excels/BlossomRefreshExcelConfigData.java
@@ -1,10 +1,10 @@
 package emu.grasscutter.data.excels;
 
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
-import java.util.List;
+import emu.grasscutter.data.*;
 import lombok.Getter;
 
+import java.util.List;
+
 @ResourceType(name = "BlossomRefreshExcelConfigData.json")
 @Getter
 public class BlossomRefreshExcelConfigData extends GameResource {
diff --git a/src/main/java/emu/grasscutter/data/excels/BuffData.java b/src/main/java/emu/grasscutter/data/excels/BuffData.java
index bd75a5d4c..72f9750e9 100644
--- a/src/main/java/emu/grasscutter/data/excels/BuffData.java
+++ b/src/main/java/emu/grasscutter/data/excels/BuffData.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.data.excels;
 
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.data.*;
 import emu.grasscutter.game.props.ServerBuffType;
 import lombok.Getter;
 
diff --git a/src/main/java/emu/grasscutter/data/excels/ChapterData.java b/src/main/java/emu/grasscutter/data/excels/ChapterData.java
index 053afdb98..7bd9b9bb3 100644
--- a/src/main/java/emu/grasscutter/data/excels/ChapterData.java
+++ b/src/main/java/emu/grasscutter/data/excels/ChapterData.java
@@ -1,11 +1,10 @@
 package emu.grasscutter.data.excels;
 
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
-import java.util.HashMap;
-import java.util.Map;
+import emu.grasscutter.data.*;
 import lombok.Getter;
 
+import java.util.*;
+
 @Getter
 @ResourceType(name = "ChapterExcelConfigData.json")
 public class ChapterData extends GameResource {
diff --git a/src/main/java/emu/grasscutter/data/excels/CityData.java b/src/main/java/emu/grasscutter/data/excels/CityData.java
index 610c004e6..c6bc59746 100644
--- a/src/main/java/emu/grasscutter/data/excels/CityData.java
+++ b/src/main/java/emu/grasscutter/data/excels/CityData.java
@@ -1,13 +1,11 @@
 package emu.grasscutter.data.excels;
 
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
-import java.util.List;
-import lombok.AccessLevel;
-import lombok.Getter;
-import lombok.Setter;
+import emu.grasscutter.data.*;
+import lombok.*;
 import lombok.experimental.FieldDefaults;
 
+import java.util.List;
+
 @ResourceType(name = "CityConfigData.json", loadPriority = ResourceType.LoadPriority.HIGH)
 @Getter
 @Setter
diff --git a/src/main/java/emu/grasscutter/data/excels/CombineData.java b/src/main/java/emu/grasscutter/data/excels/CombineData.java
index a3870b81f..df7a5859e 100644
--- a/src/main/java/emu/grasscutter/data/excels/CombineData.java
+++ b/src/main/java/emu/grasscutter/data/excels/CombineData.java
@@ -1,8 +1,8 @@
 package emu.grasscutter.data.excels;
 
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.data.*;
 import emu.grasscutter.data.common.ItemParamData;
+
 import java.util.List;
 import java.util.stream.Collectors;
 
diff --git a/src/main/java/emu/grasscutter/data/excels/CompoundData.java b/src/main/java/emu/grasscutter/data/excels/CompoundData.java
index 5e1ca14a8..e6f78c198 100644
--- a/src/main/java/emu/grasscutter/data/excels/CompoundData.java
+++ b/src/main/java/emu/grasscutter/data/excels/CompoundData.java
@@ -1,12 +1,12 @@
 package emu.grasscutter.data.excels;
 
 import com.google.gson.annotations.SerializedName;
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.data.*;
 import emu.grasscutter.data.common.ItemParamData;
-import java.util.List;
 import lombok.Getter;
 
+import java.util.List;
+
 @ResourceType(
         name = {"CompoundExcelConfigData.json"},
         loadPriority = ResourceType.LoadPriority.LOW)
diff --git a/src/main/java/emu/grasscutter/data/excels/CookBonusData.java b/src/main/java/emu/grasscutter/data/excels/CookBonusData.java
index 4835575f5..1a2de3884 100644
--- a/src/main/java/emu/grasscutter/data/excels/CookBonusData.java
+++ b/src/main/java/emu/grasscutter/data/excels/CookBonusData.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.data.excels;
 
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.data.*;
 import emu.grasscutter.data.ResourceType.LoadPriority;
 
 @ResourceType(
diff --git a/src/main/java/emu/grasscutter/data/excels/CookRecipeData.java b/src/main/java/emu/grasscutter/data/excels/CookRecipeData.java
index 42b50f91c..7e1c069da 100644
--- a/src/main/java/emu/grasscutter/data/excels/CookRecipeData.java
+++ b/src/main/java/emu/grasscutter/data/excels/CookRecipeData.java
@@ -1,12 +1,12 @@
 package emu.grasscutter.data.excels;
 
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.data.*;
 import emu.grasscutter.data.ResourceType.LoadPriority;
 import emu.grasscutter.data.common.ItemParamData;
-import java.util.List;
 import lombok.Getter;
 
+import java.util.List;
+
 @ResourceType(
         name = {"CookRecipeExcelConfigData.json"},
         loadPriority = LoadPriority.LOW)
diff --git a/src/main/java/emu/grasscutter/data/excels/DropMaterialData.java b/src/main/java/emu/grasscutter/data/excels/DropMaterialData.java
index 62af9e2f6..042f7c2a3 100644
--- a/src/main/java/emu/grasscutter/data/excels/DropMaterialData.java
+++ b/src/main/java/emu/grasscutter/data/excels/DropMaterialData.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.data.excels;
 
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.data.*;
 import lombok.Getter;
 
 @ResourceType(name = "DropMaterialExcelConfigData.json")
diff --git a/src/main/java/emu/grasscutter/data/excels/DropTableData.java b/src/main/java/emu/grasscutter/data/excels/DropTableData.java
index b1d3eac09..39743e840 100644
--- a/src/main/java/emu/grasscutter/data/excels/DropTableData.java
+++ b/src/main/java/emu/grasscutter/data/excels/DropTableData.java
@@ -1,12 +1,12 @@
 package emu.grasscutter.data.excels;
 
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.data.*;
 import emu.grasscutter.data.ResourceType.LoadPriority;
 import emu.grasscutter.data.common.DropItemData;
-import java.util.List;
 import lombok.Getter;
 
+import java.util.List;
+
 @ResourceType(
         name = {"DropTableExcelConfigData.json", "DropSubTableExcelConfigData.json"},
         loadPriority = LoadPriority.HIGH)
diff --git a/src/main/java/emu/grasscutter/data/excels/EnvAnimalGatherConfigData.java b/src/main/java/emu/grasscutter/data/excels/EnvAnimalGatherConfigData.java
index 7b86b6828..41645e463 100644
--- a/src/main/java/emu/grasscutter/data/excels/EnvAnimalGatherConfigData.java
+++ b/src/main/java/emu/grasscutter/data/excels/EnvAnimalGatherConfigData.java
@@ -1,8 +1,8 @@
 package emu.grasscutter.data.excels;
 
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.data.*;
 import emu.grasscutter.data.common.ItemParamData;
+
 import java.util.List;
 
 @ResourceType(
diff --git a/src/main/java/emu/grasscutter/data/excels/EquipAffixData.java b/src/main/java/emu/grasscutter/data/excels/EquipAffixData.java
index f3ff41fbc..4afba16bc 100644
--- a/src/main/java/emu/grasscutter/data/excels/EquipAffixData.java
+++ b/src/main/java/emu/grasscutter/data/excels/EquipAffixData.java
@@ -1,8 +1,8 @@
 package emu.grasscutter.data.excels;
 
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.data.*;
 import emu.grasscutter.data.common.FightPropData;
+
 import java.util.ArrayList;
 
 @ResourceType(name = "EquipAffixExcelConfigData.json")
diff --git a/src/main/java/emu/grasscutter/data/excels/FetterCharacterCardData.java b/src/main/java/emu/grasscutter/data/excels/FetterCharacterCardData.java
index 3acf85914..bdd7fa441 100644
--- a/src/main/java/emu/grasscutter/data/excels/FetterCharacterCardData.java
+++ b/src/main/java/emu/grasscutter/data/excels/FetterCharacterCardData.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.data.excels;
 
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.data.*;
 import emu.grasscutter.data.ResourceType.LoadPriority;
 
 @ResourceType(name = "FetterCharacterCardExcelConfigData.json", loadPriority = LoadPriority.HIGHEST)
diff --git a/src/main/java/emu/grasscutter/data/excels/FetterData.java b/src/main/java/emu/grasscutter/data/excels/FetterData.java
index 95a19fa51..92adb273b 100644
--- a/src/main/java/emu/grasscutter/data/excels/FetterData.java
+++ b/src/main/java/emu/grasscutter/data/excels/FetterData.java
@@ -1,9 +1,9 @@
 package emu.grasscutter.data.excels;
 
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.data.*;
 import emu.grasscutter.data.ResourceType.LoadPriority;
 import emu.grasscutter.data.common.OpenCondData;
+
 import java.util.List;
 
 @ResourceType(
diff --git a/src/main/java/emu/grasscutter/data/excels/ForgeData.java b/src/main/java/emu/grasscutter/data/excels/ForgeData.java
index f833d8cdc..7a870f1a5 100644
--- a/src/main/java/emu/grasscutter/data/excels/ForgeData.java
+++ b/src/main/java/emu/grasscutter/data/excels/ForgeData.java
@@ -1,12 +1,12 @@
 package emu.grasscutter.data.excels;
 
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.data.*;
 import emu.grasscutter.data.ResourceType.LoadPriority;
 import emu.grasscutter.data.common.ItemParamData;
-import java.util.List;
 import lombok.Getter;
 
+import java.util.List;
+
 @ResourceType(
         name = {"ForgeExcelConfigData.json"},
         loadPriority = LoadPriority.HIGHEST)
diff --git a/src/main/java/emu/grasscutter/data/excels/FurnitureMakeConfigData.java b/src/main/java/emu/grasscutter/data/excels/FurnitureMakeConfigData.java
index 8593357aa..3b0516e92 100644
--- a/src/main/java/emu/grasscutter/data/excels/FurnitureMakeConfigData.java
+++ b/src/main/java/emu/grasscutter/data/excels/FurnitureMakeConfigData.java
@@ -1,13 +1,12 @@
 package emu.grasscutter.data.excels;
 
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.data.*;
 import emu.grasscutter.data.common.ItemParamData;
-import java.util.List;
-import lombok.AccessLevel;
-import lombok.Getter;
+import lombok.*;
 import lombok.experimental.FieldDefaults;
 
+import java.util.List;
+
 @Getter
 @FieldDefaults(level = AccessLevel.PRIVATE)
 @ResourceType(name = {"FurnitureMakeExcelConfigData.json"})
diff --git a/src/main/java/emu/grasscutter/data/excels/GadgetData.java b/src/main/java/emu/grasscutter/data/excels/GadgetData.java
index 33d3c2ee6..d325f4cf9 100644
--- a/src/main/java/emu/grasscutter/data/excels/GadgetData.java
+++ b/src/main/java/emu/grasscutter/data/excels/GadgetData.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.data.excels;
 
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.data.*;
 import emu.grasscutter.game.props.EntityType;
 import lombok.Getter;
 
diff --git a/src/main/java/emu/grasscutter/data/excels/GatherData.java b/src/main/java/emu/grasscutter/data/excels/GatherData.java
index 06cb09bdb..a9129be66 100644
--- a/src/main/java/emu/grasscutter/data/excels/GatherData.java
+++ b/src/main/java/emu/grasscutter/data/excels/GatherData.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.data.excels;
 
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.data.*;
 
 @ResourceType(name = "GatherExcelConfigData.json")
 public class GatherData extends GameResource {
diff --git a/src/main/java/emu/grasscutter/data/excels/GuideTriggerData.java b/src/main/java/emu/grasscutter/data/excels/GuideTriggerData.java
index 9bc5c3846..bd05d3efe 100644
--- a/src/main/java/emu/grasscutter/data/excels/GuideTriggerData.java
+++ b/src/main/java/emu/grasscutter/data/excels/GuideTriggerData.java
@@ -1,10 +1,7 @@
 package emu.grasscutter.data.excels;
 
-import emu.grasscutter.data.GameData;
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
+import emu.grasscutter.data.*;
+import lombok.*;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
diff --git a/src/main/java/emu/grasscutter/data/excels/HomeWorldBgmData.java b/src/main/java/emu/grasscutter/data/excels/HomeWorldBgmData.java
index 899b98b42..7e6a18290 100644
--- a/src/main/java/emu/grasscutter/data/excels/HomeWorldBgmData.java
+++ b/src/main/java/emu/grasscutter/data/excels/HomeWorldBgmData.java
@@ -1,10 +1,8 @@
 package emu.grasscutter.data.excels;
 
 import com.google.gson.annotations.SerializedName;
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
-import lombok.AccessLevel;
-import lombok.Getter;
+import emu.grasscutter.data.*;
+import lombok.*;
 import lombok.experimental.FieldDefaults;
 
 @Getter
diff --git a/src/main/java/emu/grasscutter/data/excels/HomeWorldLevelData.java b/src/main/java/emu/grasscutter/data/excels/HomeWorldLevelData.java
index 6a8d88805..55a35fcfd 100644
--- a/src/main/java/emu/grasscutter/data/excels/HomeWorldLevelData.java
+++ b/src/main/java/emu/grasscutter/data/excels/HomeWorldLevelData.java
@@ -1,12 +1,11 @@
 package emu.grasscutter.data.excels;
 
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
-import java.util.List;
-import lombok.AccessLevel;
-import lombok.Getter;
+import emu.grasscutter.data.*;
+import lombok.*;
 import lombok.experimental.FieldDefaults;
 
+import java.util.List;
+
 @Getter
 @FieldDefaults(level = AccessLevel.PRIVATE)
 @ResourceType(name = {"HomeworldLevelExcelConfigData.json"})
diff --git a/src/main/java/emu/grasscutter/data/excels/HomeWorldNPCData.java b/src/main/java/emu/grasscutter/data/excels/HomeWorldNPCData.java
index 6402d93f1..e1247de8c 100644
--- a/src/main/java/emu/grasscutter/data/excels/HomeWorldNPCData.java
+++ b/src/main/java/emu/grasscutter/data/excels/HomeWorldNPCData.java
@@ -1,11 +1,9 @@
 package emu.grasscutter.data.excels;
 
 import com.google.gson.annotations.SerializedName;
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.data.*;
 import emu.grasscutter.game.inventory.ItemQuality;
-import lombok.AccessLevel;
-import lombok.Getter;
+import lombok.*;
 import lombok.experimental.FieldDefaults;
 
 import java.util.List;
diff --git a/src/main/java/emu/grasscutter/data/excels/InvestigationMonsterData.java b/src/main/java/emu/grasscutter/data/excels/InvestigationMonsterData.java
index cbc4b3cc4..07ab113c5 100644
--- a/src/main/java/emu/grasscutter/data/excels/InvestigationMonsterData.java
+++ b/src/main/java/emu/grasscutter/data/excels/InvestigationMonsterData.java
@@ -1,13 +1,11 @@
 package emu.grasscutter.data.excels;
 
-import emu.grasscutter.data.GameData;
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
-import java.util.List;
-import lombok.AccessLevel;
-import lombok.Getter;
+import emu.grasscutter.data.*;
+import lombok.*;
 import lombok.experimental.FieldDefaults;
 
+import java.util.List;
+
 @ResourceType(
         name = "InvestigationMonsterConfigData.json",
         loadPriority = ResourceType.LoadPriority.LOW)
diff --git a/src/main/java/emu/grasscutter/data/excels/ItemData.java b/src/main/java/emu/grasscutter/data/excels/ItemData.java
index 1a10152a7..8844b8225 100644
--- a/src/main/java/emu/grasscutter/data/excels/ItemData.java
+++ b/src/main/java/emu/grasscutter/data/excels/ItemData.java
@@ -1,24 +1,16 @@
 package emu.grasscutter.data.excels;
 
 import com.google.gson.annotations.SerializedName;
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.data.*;
 import emu.grasscutter.data.common.ItemUseData;
 import emu.grasscutter.game.home.SpecialFurnitureType;
-import emu.grasscutter.game.inventory.EquipType;
-import emu.grasscutter.game.inventory.ItemType;
-import emu.grasscutter.game.inventory.MaterialType;
-import emu.grasscutter.game.props.FightProperty;
+import emu.grasscutter.game.inventory.*;
+import emu.grasscutter.game.props.*;
 import emu.grasscutter.game.props.ItemUseAction.ItemUseAction;
-import emu.grasscutter.game.props.ItemUseOp;
-import emu.grasscutter.game.props.ItemUseTarget;
-import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
-import it.unimi.dsi.fastutil.ints.IntSet;
+import it.unimi.dsi.fastutil.ints.*;
 import lombok.Getter;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
 
 @ResourceType(
         name = {
diff --git a/src/main/java/emu/grasscutter/data/excels/MonsterAffixData.java b/src/main/java/emu/grasscutter/data/excels/MonsterAffixData.java
index d504e081b..b1c20a3c4 100644
--- a/src/main/java/emu/grasscutter/data/excels/MonsterAffixData.java
+++ b/src/main/java/emu/grasscutter/data/excels/MonsterAffixData.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.data.excels;
 
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.data.*;
 import lombok.Getter;
 
 @ResourceType(name = "MonsterAffixExcelConfigData.json")
diff --git a/src/main/java/emu/grasscutter/data/excels/MusicGameBasicData.java b/src/main/java/emu/grasscutter/data/excels/MusicGameBasicData.java
index 90ea1ef3c..6f0c3de96 100644
--- a/src/main/java/emu/grasscutter/data/excels/MusicGameBasicData.java
+++ b/src/main/java/emu/grasscutter/data/excels/MusicGameBasicData.java
@@ -1,9 +1,7 @@
 package emu.grasscutter.data.excels;
 
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
-import lombok.AccessLevel;
-import lombok.Getter;
+import emu.grasscutter.data.*;
+import lombok.*;
 import lombok.experimental.FieldDefaults;
 
 @ResourceType(name = "MusicGameBasicConfigData.json")
diff --git a/src/main/java/emu/grasscutter/data/excels/NpcData.java b/src/main/java/emu/grasscutter/data/excels/NpcData.java
index b88d02bf1..4f92cb967 100644
--- a/src/main/java/emu/grasscutter/data/excels/NpcData.java
+++ b/src/main/java/emu/grasscutter/data/excels/NpcData.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.data.excels;
 
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.data.*;
 import lombok.Getter;
 
 @ResourceType(name = "NpcExcelConfigData.json")
diff --git a/src/main/java/emu/grasscutter/data/excels/OpenStateData.java b/src/main/java/emu/grasscutter/data/excels/OpenStateData.java
index 7cc422edc..9d8d187c3 100644
--- a/src/main/java/emu/grasscutter/data/excels/OpenStateData.java
+++ b/src/main/java/emu/grasscutter/data/excels/OpenStateData.java
@@ -1,12 +1,9 @@
 package emu.grasscutter.data.excels;
 
-import emu.grasscutter.data.GameData;
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.data.*;
 import lombok.Getter;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
 
 @ResourceType(name = "OpenStateConfigData.json", loadPriority = ResourceType.LoadPriority.HIGHEST)
 public class OpenStateData extends GameResource {
diff --git a/src/main/java/emu/grasscutter/data/excels/PersonalLineData.java b/src/main/java/emu/grasscutter/data/excels/PersonalLineData.java
index d43b433d1..39c669281 100644
--- a/src/main/java/emu/grasscutter/data/excels/PersonalLineData.java
+++ b/src/main/java/emu/grasscutter/data/excels/PersonalLineData.java
@@ -1,13 +1,11 @@
 package emu.grasscutter.data.excels;
 
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
-import java.util.List;
-import lombok.AccessLevel;
-import lombok.Getter;
-import lombok.Setter;
+import emu.grasscutter.data.*;
+import lombok.*;
 import lombok.experimental.FieldDefaults;
 
+import java.util.List;
+
 @ResourceType(name = "PersonalLineExcelConfigData.json")
 @Getter
 @Setter // TODO: remove setters next API break
diff --git a/src/main/java/emu/grasscutter/data/excels/PlayerLevelData.java b/src/main/java/emu/grasscutter/data/excels/PlayerLevelData.java
index 6a0d52e06..35632c990 100644
--- a/src/main/java/emu/grasscutter/data/excels/PlayerLevelData.java
+++ b/src/main/java/emu/grasscutter/data/excels/PlayerLevelData.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.data.excels;
 
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.data.*;
 import lombok.Getter;
 
 @ResourceType(name = "PlayerLevelExcelConfigData.json")
diff --git a/src/main/java/emu/grasscutter/data/excels/ProudSkillData.java b/src/main/java/emu/grasscutter/data/excels/ProudSkillData.java
index 28ae499b8..50fdf5d46 100644
--- a/src/main/java/emu/grasscutter/data/excels/ProudSkillData.java
+++ b/src/main/java/emu/grasscutter/data/excels/ProudSkillData.java
@@ -1,16 +1,13 @@
 package emu.grasscutter.data.excels;
 
 import dev.morphia.annotations.Transient;
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
-import emu.grasscutter.data.common.FightPropData;
-import emu.grasscutter.data.common.ItemParamData;
-import it.unimi.dsi.fastutil.objects.Object2FloatMap;
-import it.unimi.dsi.fastutil.objects.Object2FloatOpenHashMap;
-import java.util.ArrayList;
-import java.util.List;
+import emu.grasscutter.data.*;
+import emu.grasscutter.data.common.*;
+import it.unimi.dsi.fastutil.objects.*;
 import lombok.Getter;
 
+import java.util.*;
+
 @ResourceType(name = "ProudSkillExcelConfigData.json")
 public class ProudSkillData extends GameResource {
     private int proudSkillId;
diff --git a/src/main/java/emu/grasscutter/data/excels/RefreshPolicyExcelConfigData.java b/src/main/java/emu/grasscutter/data/excels/RefreshPolicyExcelConfigData.java
index cb16c7263..80a9c52e9 100644
--- a/src/main/java/emu/grasscutter/data/excels/RefreshPolicyExcelConfigData.java
+++ b/src/main/java/emu/grasscutter/data/excels/RefreshPolicyExcelConfigData.java
@@ -1,13 +1,12 @@
 package emu.grasscutter.data.excels;
 
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.data.*;
 import emu.grasscutter.game.props.RefreshType;
 import emu.grasscutter.game.world.World;
-import java.util.Arrays;
-import java.util.List;
 import lombok.Getter;
 
+import java.util.*;
+
 @ResourceType(name = "RefreshPolicyExcelConfigData.json")
 public class RefreshPolicyExcelConfigData extends GameResource {
     @Getter private int id;
diff --git a/src/main/java/emu/grasscutter/data/excels/RewardData.java b/src/main/java/emu/grasscutter/data/excels/RewardData.java
index 62e344cf2..938809ad6 100644
--- a/src/main/java/emu/grasscutter/data/excels/RewardData.java
+++ b/src/main/java/emu/grasscutter/data/excels/RewardData.java
@@ -1,8 +1,8 @@
 package emu.grasscutter.data.excels;
 
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.data.*;
 import emu.grasscutter.data.common.ItemParamData;
+
 import java.util.List;
 
 @ResourceType(name = "RewardExcelConfigData.json")
diff --git a/src/main/java/emu/grasscutter/data/excels/RewardPreviewData.java b/src/main/java/emu/grasscutter/data/excels/RewardPreviewData.java
index 48d28f195..70cf7fd74 100644
--- a/src/main/java/emu/grasscutter/data/excels/RewardPreviewData.java
+++ b/src/main/java/emu/grasscutter/data/excels/RewardPreviewData.java
@@ -1,13 +1,12 @@
 package emu.grasscutter.data.excels;
 
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.data.*;
 import emu.grasscutter.data.ResourceType.LoadPriority;
-import emu.grasscutter.data.common.ItemParamData;
-import emu.grasscutter.data.common.ItemParamStringData;
-import java.util.Arrays;
+import emu.grasscutter.data.common.*;
 import lombok.Getter;
 
+import java.util.Arrays;
+
 @ResourceType(name = "RewardPreviewExcelConfigData.json", loadPriority = LoadPriority.HIGH)
 public class RewardPreviewData extends GameResource {
     @Getter(onMethod_ = @Override)
diff --git a/src/main/java/emu/grasscutter/data/excels/ShopGoodsData.java b/src/main/java/emu/grasscutter/data/excels/ShopGoodsData.java
index 16bf3c191..ec8c8471b 100644
--- a/src/main/java/emu/grasscutter/data/excels/ShopGoodsData.java
+++ b/src/main/java/emu/grasscutter/data/excels/ShopGoodsData.java
@@ -1,10 +1,10 @@
 package emu.grasscutter.data.excels;
 
 import com.google.gson.annotations.SerializedName;
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.data.*;
 import emu.grasscutter.data.common.ItemParamData;
 import emu.grasscutter.game.shop.ShopInfo;
+
 import java.util.List;
 
 @ResourceType(name = "ShopGoodsExcelConfigData.json")
diff --git a/src/main/java/emu/grasscutter/data/excels/StatuePromoteData.java b/src/main/java/emu/grasscutter/data/excels/StatuePromoteData.java
index 29e495a1c..fd3afc8eb 100644
--- a/src/main/java/emu/grasscutter/data/excels/StatuePromoteData.java
+++ b/src/main/java/emu/grasscutter/data/excels/StatuePromoteData.java
@@ -1,10 +1,8 @@
 package emu.grasscutter.data.excels;
 
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.data.*;
 import emu.grasscutter.data.common.ItemParamData;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.*;
 
 @ResourceType(name = "StatuePromoteExcelConfigData.json")
 public class StatuePromoteData extends GameResource {
diff --git a/src/main/java/emu/grasscutter/data/excels/TalkConfigData.java b/src/main/java/emu/grasscutter/data/excels/TalkConfigData.java
index 25506dbd2..64f6fb7df 100644
--- a/src/main/java/emu/grasscutter/data/excels/TalkConfigData.java
+++ b/src/main/java/emu/grasscutter/data/excels/TalkConfigData.java
@@ -3,9 +3,10 @@ package emu.grasscutter.data.excels;
 import com.google.gson.annotations.SerializedName;
 import emu.grasscutter.data.*;
 import emu.grasscutter.game.talk.TalkExec;
-import java.util.List;
 import lombok.*;
 
+import java.util.List;
+
 @ResourceType(name = "TalkExcelConfigData.json")
 @EqualsAndHashCode(callSuper = false)
 @Data
diff --git a/src/main/java/emu/grasscutter/data/excels/TriggerExcelConfigData.java b/src/main/java/emu/grasscutter/data/excels/TriggerExcelConfigData.java
index d98f009dc..95621a4b3 100644
--- a/src/main/java/emu/grasscutter/data/excels/TriggerExcelConfigData.java
+++ b/src/main/java/emu/grasscutter/data/excels/TriggerExcelConfigData.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.data.excels;
 
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.data.*;
 import lombok.Getter;
 
 @ResourceType(name = "TriggerExcelConfigData.json")
diff --git a/src/main/java/emu/grasscutter/data/excels/achievement/AchievementData.java b/src/main/java/emu/grasscutter/data/excels/achievement/AchievementData.java
index 334bd2dcc..75ce44ba6 100644
--- a/src/main/java/emu/grasscutter/data/excels/achievement/AchievementData.java
+++ b/src/main/java/emu/grasscutter/data/excels/achievement/AchievementData.java
@@ -1,16 +1,13 @@
 package emu.grasscutter.data.excels.achievement;
 
 import com.github.davidmoten.guavamini.Lists;
-import emu.grasscutter.data.GameData;
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.data.*;
 import emu.grasscutter.data.excels.BattlePassMissionData;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import lombok.Getter;
+
+import java.util.*;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.Collectors;
-import lombok.Getter;
 
 @Getter
 @ResourceType(name = "AchievementExcelConfigData.json")
diff --git a/src/main/java/emu/grasscutter/data/excels/achievement/AchievementGoalData.java b/src/main/java/emu/grasscutter/data/excels/achievement/AchievementGoalData.java
index 88b8b0086..fd11d21bf 100644
--- a/src/main/java/emu/grasscutter/data/excels/achievement/AchievementGoalData.java
+++ b/src/main/java/emu/grasscutter/data/excels/achievement/AchievementGoalData.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.data.excels.achievement;
 
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.data.*;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/emu/grasscutter/data/excels/activity/ActivityCondExcelConfigData.java b/src/main/java/emu/grasscutter/data/excels/activity/ActivityCondExcelConfigData.java
index fcc8cc24c..232ddadbf 100644
--- a/src/main/java/emu/grasscutter/data/excels/activity/ActivityCondExcelConfigData.java
+++ b/src/main/java/emu/grasscutter/data/excels/activity/ActivityCondExcelConfigData.java
@@ -1,14 +1,13 @@
 package emu.grasscutter.data.excels.activity;
 
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.data.*;
 import emu.grasscutter.game.activity.condition.ActivityConditions;
 import emu.grasscutter.game.quest.enums.LogicType;
-import java.util.List;
-import lombok.AccessLevel;
-import lombok.Getter;
+import lombok.*;
 import lombok.experimental.FieldDefaults;
 
+import java.util.List;
+
 @ResourceType(name = "NewActivityCondExcelConfigData.json")
 @Getter
 @FieldDefaults(level = AccessLevel.PRIVATE)
diff --git a/src/main/java/emu/grasscutter/data/excels/activity/ActivityData.java b/src/main/java/emu/grasscutter/data/excels/activity/ActivityData.java
index a5f4fe2c9..c7c98e09c 100644
--- a/src/main/java/emu/grasscutter/data/excels/activity/ActivityData.java
+++ b/src/main/java/emu/grasscutter/data/excels/activity/ActivityData.java
@@ -1,14 +1,11 @@
 package emu.grasscutter.data.excels.activity;
 
-import emu.grasscutter.data.GameData;
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
-import java.util.List;
-import java.util.Objects;
-import lombok.AccessLevel;
-import lombok.Getter;
+import emu.grasscutter.data.*;
+import lombok.*;
 import lombok.experimental.FieldDefaults;
 
+import java.util.*;
+
 @ResourceType(
         name = "NewActivityExcelConfigData.json",
         loadPriority = ResourceType.LoadPriority.LOW)
diff --git a/src/main/java/emu/grasscutter/data/excels/activity/ActivityShopData.java b/src/main/java/emu/grasscutter/data/excels/activity/ActivityShopData.java
index 5d15d3e49..9ce698cc1 100644
--- a/src/main/java/emu/grasscutter/data/excels/activity/ActivityShopData.java
+++ b/src/main/java/emu/grasscutter/data/excels/activity/ActivityShopData.java
@@ -1,11 +1,11 @@
 package emu.grasscutter.data.excels.activity;
 
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.data.*;
 import emu.grasscutter.game.shop.ShopType;
-import java.util.List;
 import lombok.Getter;
 
+import java.util.List;
+
 @ResourceType(name = "ActivityShopOverallExcelConfigData.json")
 public class ActivityShopData extends GameResource {
     @Getter private int scheduleId;
diff --git a/src/main/java/emu/grasscutter/data/excels/activity/ActivityWatcherData.java b/src/main/java/emu/grasscutter/data/excels/activity/ActivityWatcherData.java
index a3c9e5d24..3098f5eaf 100644
--- a/src/main/java/emu/grasscutter/data/excels/activity/ActivityWatcherData.java
+++ b/src/main/java/emu/grasscutter/data/excels/activity/ActivityWatcherData.java
@@ -1,13 +1,12 @@
 package emu.grasscutter.data.excels.activity;
 
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.data.*;
 import emu.grasscutter.game.props.WatcherTriggerType;
-import java.util.List;
-import lombok.AccessLevel;
-import lombok.Getter;
+import lombok.*;
 import lombok.experimental.FieldDefaults;
 
+import java.util.List;
+
 @ResourceType(
         name = "NewActivityWatcherConfigData.json",
         loadPriority = ResourceType.LoadPriority.HIGH)
diff --git a/src/main/java/emu/grasscutter/data/excels/avatar/AvatarCostumeData.java b/src/main/java/emu/grasscutter/data/excels/avatar/AvatarCostumeData.java
index e491c3a18..9468a4c57 100644
--- a/src/main/java/emu/grasscutter/data/excels/avatar/AvatarCostumeData.java
+++ b/src/main/java/emu/grasscutter/data/excels/avatar/AvatarCostumeData.java
@@ -1,9 +1,7 @@
 package emu.grasscutter.data.excels.avatar;
 
 import com.google.gson.annotations.SerializedName;
-import emu.grasscutter.data.GameData;
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.data.*;
 
 @ResourceType(name = "AvatarCostumeExcelConfigData.json")
 public class AvatarCostumeData extends GameResource {
diff --git a/src/main/java/emu/grasscutter/data/excels/avatar/AvatarCurveData.java b/src/main/java/emu/grasscutter/data/excels/avatar/AvatarCurveData.java
index b52a36b6d..032c57860 100644
--- a/src/main/java/emu/grasscutter/data/excels/avatar/AvatarCurveData.java
+++ b/src/main/java/emu/grasscutter/data/excels/avatar/AvatarCurveData.java
@@ -1,10 +1,9 @@
 package emu.grasscutter.data.excels.avatar;
 
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.data.*;
 import emu.grasscutter.data.common.CurveInfo;
-import java.util.HashMap;
-import java.util.Map;
+
+import java.util.*;
 import java.util.stream.Stream;
 
 @ResourceType(name = "AvatarCurveExcelConfigData.json")
diff --git a/src/main/java/emu/grasscutter/data/excels/avatar/AvatarData.java b/src/main/java/emu/grasscutter/data/excels/avatar/AvatarData.java
index 70bd76951..d897fc4e7 100644
--- a/src/main/java/emu/grasscutter/data/excels/avatar/AvatarData.java
+++ b/src/main/java/emu/grasscutter/data/excels/avatar/AvatarData.java
@@ -1,21 +1,14 @@
 package emu.grasscutter.data.excels.avatar;
 
-import emu.grasscutter.data.GameData;
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.data.*;
 import emu.grasscutter.data.ResourceType.LoadPriority;
-import emu.grasscutter.data.binout.AbilityEmbryoEntry;
 import emu.grasscutter.data.common.PropGrowCurve;
-import emu.grasscutter.game.props.FightProperty;
-import emu.grasscutter.game.props.WeaponType;
+import emu.grasscutter.game.props.*;
 import emu.grasscutter.utils.Utils;
-import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import it.unimi.dsi.fastutil.ints.IntArrayList;
-import it.unimi.dsi.fastutil.ints.IntList;
+import it.unimi.dsi.fastutil.ints.*;
 import lombok.Getter;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
 
 @ResourceType(name = "AvatarExcelConfigData.json", loadPriority = LoadPriority.LOW)
 public class AvatarData extends GameResource {
diff --git a/src/main/java/emu/grasscutter/data/excels/avatar/AvatarFetterLevelData.java b/src/main/java/emu/grasscutter/data/excels/avatar/AvatarFetterLevelData.java
index 68fe28688..8778fcc35 100644
--- a/src/main/java/emu/grasscutter/data/excels/avatar/AvatarFetterLevelData.java
+++ b/src/main/java/emu/grasscutter/data/excels/avatar/AvatarFetterLevelData.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.data.excels.avatar;
 
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.data.*;
 
 @ResourceType(name = "AvatarFettersLevelExcelConfigData.json")
 public class AvatarFetterLevelData extends GameResource {
diff --git a/src/main/java/emu/grasscutter/data/excels/avatar/AvatarFlycloakData.java b/src/main/java/emu/grasscutter/data/excels/avatar/AvatarFlycloakData.java
index ba6b45626..dda483808 100644
--- a/src/main/java/emu/grasscutter/data/excels/avatar/AvatarFlycloakData.java
+++ b/src/main/java/emu/grasscutter/data/excels/avatar/AvatarFlycloakData.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.data.excels.avatar;
 
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.data.*;
 
 @ResourceType(name = "AvatarFlycloakExcelConfigData.json")
 public class AvatarFlycloakData extends GameResource {
diff --git a/src/main/java/emu/grasscutter/data/excels/avatar/AvatarLevelData.java b/src/main/java/emu/grasscutter/data/excels/avatar/AvatarLevelData.java
index 6f957713b..1eae299e3 100644
--- a/src/main/java/emu/grasscutter/data/excels/avatar/AvatarLevelData.java
+++ b/src/main/java/emu/grasscutter/data/excels/avatar/AvatarLevelData.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.data.excels.avatar;
 
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.data.*;
 
 @ResourceType(name = "AvatarLevelExcelConfigData.json")
 public class AvatarLevelData extends GameResource {
diff --git a/src/main/java/emu/grasscutter/data/excels/avatar/AvatarPromoteData.java b/src/main/java/emu/grasscutter/data/excels/avatar/AvatarPromoteData.java
index b9cd54628..d948b3800 100644
--- a/src/main/java/emu/grasscutter/data/excels/avatar/AvatarPromoteData.java
+++ b/src/main/java/emu/grasscutter/data/excels/avatar/AvatarPromoteData.java
@@ -1,9 +1,8 @@
 package emu.grasscutter.data.excels.avatar;
 
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
-import emu.grasscutter.data.common.FightPropData;
-import emu.grasscutter.data.common.ItemParamData;
+import emu.grasscutter.data.*;
+import emu.grasscutter.data.common.*;
+
 import java.util.ArrayList;
 
 @ResourceType(name = "AvatarPromoteExcelConfigData.json")
diff --git a/src/main/java/emu/grasscutter/data/excels/avatar/AvatarReplaceCostumeData.java b/src/main/java/emu/grasscutter/data/excels/avatar/AvatarReplaceCostumeData.java
index fd0fe5600..beb5b5191 100644
--- a/src/main/java/emu/grasscutter/data/excels/avatar/AvatarReplaceCostumeData.java
+++ b/src/main/java/emu/grasscutter/data/excels/avatar/AvatarReplaceCostumeData.java
@@ -1,10 +1,8 @@
 package emu.grasscutter.data.excels.avatar;
 
 import com.google.gson.annotations.SerializedName;
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
+import emu.grasscutter.data.*;
+import lombok.*;
 
 @Data
 @ResourceType(name = "AvatarReplaceCostumeExcelConfigData.json")
diff --git a/src/main/java/emu/grasscutter/data/excels/avatar/AvatarSkillData.java b/src/main/java/emu/grasscutter/data/excels/avatar/AvatarSkillData.java
index 2abfda3a9..004a29e08 100644
--- a/src/main/java/emu/grasscutter/data/excels/avatar/AvatarSkillData.java
+++ b/src/main/java/emu/grasscutter/data/excels/avatar/AvatarSkillData.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.data.excels.avatar;
 
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.data.*;
 import emu.grasscutter.data.ResourceType.LoadPriority;
 import emu.grasscutter.game.props.ElementType;
 import lombok.Getter;
diff --git a/src/main/java/emu/grasscutter/data/excels/avatar/AvatarSkillDepotData.java b/src/main/java/emu/grasscutter/data/excels/avatar/AvatarSkillDepotData.java
index 7a54c1557..5c8b83409 100644
--- a/src/main/java/emu/grasscutter/data/excels/avatar/AvatarSkillDepotData.java
+++ b/src/main/java/emu/grasscutter/data/excels/avatar/AvatarSkillDepotData.java
@@ -1,21 +1,17 @@
 package emu.grasscutter.data.excels.avatar;
 
-import emu.grasscutter.data.GameData;
-import emu.grasscutter.data.GameDepot;
-import emu.grasscutter.data.GameResource;
+import emu.grasscutter.data.*;
 import emu.grasscutter.data.ResourceLoader.AvatarConfig;
-import emu.grasscutter.data.ResourceType;
 import emu.grasscutter.data.ResourceType.LoadPriority;
 import emu.grasscutter.data.binout.AbilityEmbryoEntry;
 import emu.grasscutter.game.props.ElementType;
 import emu.grasscutter.utils.Utils;
-import it.unimi.dsi.fastutil.ints.IntArrayList;
-import it.unimi.dsi.fastutil.ints.IntList;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.IntStream;
+import it.unimi.dsi.fastutil.ints.*;
 import lombok.Getter;
 
+import java.util.*;
+import java.util.stream.IntStream;
+
 @ResourceType(name = "AvatarSkillDepotExcelConfigData.json", loadPriority = LoadPriority.HIGH)
 @Getter
 public class AvatarSkillDepotData extends GameResource {
diff --git a/src/main/java/emu/grasscutter/data/excels/avatar/AvatarTalentData.java b/src/main/java/emu/grasscutter/data/excels/avatar/AvatarTalentData.java
index e295e883a..62081e506 100644
--- a/src/main/java/emu/grasscutter/data/excels/avatar/AvatarTalentData.java
+++ b/src/main/java/emu/grasscutter/data/excels/avatar/AvatarTalentData.java
@@ -1,9 +1,9 @@
 package emu.grasscutter.data.excels.avatar;
 
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.data.*;
 import emu.grasscutter.data.ResourceType.LoadPriority;
 import emu.grasscutter.data.common.FightPropData;
+
 import java.util.ArrayList;
 
 @ResourceType(name = "AvatarTalentExcelConfigData.json", loadPriority = LoadPriority.HIGHEST)
diff --git a/src/main/java/emu/grasscutter/data/excels/codex/CodexAnimalData.java b/src/main/java/emu/grasscutter/data/excels/codex/CodexAnimalData.java
index e7608646e..d8e0d593e 100644
--- a/src/main/java/emu/grasscutter/data/excels/codex/CodexAnimalData.java
+++ b/src/main/java/emu/grasscutter/data/excels/codex/CodexAnimalData.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.data.excels.codex;
 
 import com.google.gson.annotations.SerializedName;
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.data.*;
 import lombok.Getter;
 
 @ResourceType(name = {"AnimalCodexExcelConfigData.json"})
diff --git a/src/main/java/emu/grasscutter/data/excels/codex/CodexMaterialData.java b/src/main/java/emu/grasscutter/data/excels/codex/CodexMaterialData.java
index 0b82bb601..ee14db8e2 100644
--- a/src/main/java/emu/grasscutter/data/excels/codex/CodexMaterialData.java
+++ b/src/main/java/emu/grasscutter/data/excels/codex/CodexMaterialData.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.data.excels.codex;
 
-import emu.grasscutter.data.GameData;
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.data.*;
 
 @ResourceType(name = {"MaterialCodexExcelConfigData.json"})
 public class CodexMaterialData extends GameResource {
diff --git a/src/main/java/emu/grasscutter/data/excels/codex/CodexQuestData.java b/src/main/java/emu/grasscutter/data/excels/codex/CodexQuestData.java
index a584aeca2..1b373bfbe 100644
--- a/src/main/java/emu/grasscutter/data/excels/codex/CodexQuestData.java
+++ b/src/main/java/emu/grasscutter/data/excels/codex/CodexQuestData.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.data.excels.codex;
 
-import emu.grasscutter.data.GameData;
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.data.*;
 
 @ResourceType(name = {"QuestCodexExcelConfigData.json"})
 public class CodexQuestData extends GameResource {
diff --git a/src/main/java/emu/grasscutter/data/excels/codex/CodexReliquaryData.java b/src/main/java/emu/grasscutter/data/excels/codex/CodexReliquaryData.java
index fb35c341c..84eae3828 100644
--- a/src/main/java/emu/grasscutter/data/excels/codex/CodexReliquaryData.java
+++ b/src/main/java/emu/grasscutter/data/excels/codex/CodexReliquaryData.java
@@ -1,10 +1,7 @@
 package emu.grasscutter.data.excels.codex;
 
-import emu.grasscutter.data.GameData;
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
-import it.unimi.dsi.fastutil.ints.IntCollection;
-import it.unimi.dsi.fastutil.ints.IntList;
+import emu.grasscutter.data.*;
+import it.unimi.dsi.fastutil.ints.*;
 import lombok.Getter;
 
 @ResourceType(name = {"ReliquaryCodexExcelConfigData.json"})
diff --git a/src/main/java/emu/grasscutter/data/excels/codex/CodexWeaponData.java b/src/main/java/emu/grasscutter/data/excels/codex/CodexWeaponData.java
index be441b9bf..7d585839e 100644
--- a/src/main/java/emu/grasscutter/data/excels/codex/CodexWeaponData.java
+++ b/src/main/java/emu/grasscutter/data/excels/codex/CodexWeaponData.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.data.excels.codex;
 
-import emu.grasscutter.data.GameData;
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.data.*;
 
 @ResourceType(name = {"WeaponCodexExcelConfigData.json"})
 public class CodexWeaponData extends GameResource {
diff --git a/src/main/java/emu/grasscutter/data/excels/dungeon/DailyDungeonData.java b/src/main/java/emu/grasscutter/data/excels/dungeon/DailyDungeonData.java
index 4bb7c0805..341f29a9f 100644
--- a/src/main/java/emu/grasscutter/data/excels/dungeon/DailyDungeonData.java
+++ b/src/main/java/emu/grasscutter/data/excels/dungeon/DailyDungeonData.java
@@ -1,12 +1,11 @@
 package emu.grasscutter.data.excels.dungeon;
 
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
-import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
-import java.util.Calendar;
+import emu.grasscutter.data.*;
+import it.unimi.dsi.fastutil.ints.*;
 import lombok.Getter;
 
+import java.util.Calendar;
+
 @ResourceType(name = "DailyDungeonConfigData.json")
 public class DailyDungeonData extends GameResource {
     private static final int[] empty = new int[0];
diff --git a/src/main/java/emu/grasscutter/data/excels/dungeon/DungeonChallengeConfigData.java b/src/main/java/emu/grasscutter/data/excels/dungeon/DungeonChallengeConfigData.java
index 50a0a5ff3..99a3fa821 100644
--- a/src/main/java/emu/grasscutter/data/excels/dungeon/DungeonChallengeConfigData.java
+++ b/src/main/java/emu/grasscutter/data/excels/dungeon/DungeonChallengeConfigData.java
@@ -1,12 +1,12 @@
 package emu.grasscutter.data.excels.dungeon;
 
 import com.google.gson.annotations.SerializedName;
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.data.*;
 import emu.grasscutter.game.dungeons.challenge.enums.ChallengeType;
-import java.util.HashSet;
 import lombok.Getter;
 
+import java.util.HashSet;
+
 @Getter
 @ResourceType(name = "DungeonChallengeConfigData.json")
 public class DungeonChallengeConfigData extends GameResource {
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 8e30cc54c..bb3186555 100644
--- a/src/main/java/emu/grasscutter/data/excels/dungeon/DungeonData.java
+++ b/src/main/java/emu/grasscutter/data/excels/dungeon/DungeonData.java
@@ -1,15 +1,14 @@
 package emu.grasscutter.data.excels.dungeon;
 
-import emu.grasscutter.data.GameData;
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.data.*;
 import emu.grasscutter.data.excels.RewardPreviewData;
 import emu.grasscutter.game.dungeons.enums.*;
 import emu.grasscutter.game.world.Position;
 import emu.grasscutter.scripts.data.SceneMeta;
-import java.util.List;
 import lombok.Getter;
 
+import java.util.List;
+
 @ResourceType(name = "DungeonExcelConfigData.json")
 public class DungeonData extends GameResource {
 
diff --git a/src/main/java/emu/grasscutter/data/excels/dungeon/DungeonEntryData.java b/src/main/java/emu/grasscutter/data/excels/dungeon/DungeonEntryData.java
index b64010c29..bfb93b512 100644
--- a/src/main/java/emu/grasscutter/data/excels/dungeon/DungeonEntryData.java
+++ b/src/main/java/emu/grasscutter/data/excels/dungeon/DungeonEntryData.java
@@ -1,9 +1,7 @@
 package emu.grasscutter.data.excels.dungeon;
 
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
-import lombok.Getter;
-import lombok.Setter;
+import emu.grasscutter.data.*;
+import lombok.*;
 
 @ResourceType(name = "DungeonEntryExcelConfigData.json")
 @Getter
diff --git a/src/main/java/emu/grasscutter/data/excels/dungeon/DungeonPassConfigData.java b/src/main/java/emu/grasscutter/data/excels/dungeon/DungeonPassConfigData.java
index bf5b245b9..725dbcc7f 100644
--- a/src/main/java/emu/grasscutter/data/excels/dungeon/DungeonPassConfigData.java
+++ b/src/main/java/emu/grasscutter/data/excels/dungeon/DungeonPassConfigData.java
@@ -1,12 +1,11 @@
 package emu.grasscutter.data.excels.dungeon;
 
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.data.*;
 import emu.grasscutter.game.dungeons.enums.DungeonPassConditionType;
 import emu.grasscutter.game.quest.enums.LogicType;
+import lombok.*;
+
 import java.util.List;
-import lombok.Getter;
-import lombok.Setter;
 
 @ResourceType(name = "DungeonPassExcelConfigData.json")
 public class DungeonPassConfigData extends GameResource {
diff --git a/src/main/java/emu/grasscutter/data/excels/giving/GivingData.java b/src/main/java/emu/grasscutter/data/excels/giving/GivingData.java
index bd22eefcc..3f800297e 100644
--- a/src/main/java/emu/grasscutter/data/excels/giving/GivingData.java
+++ b/src/main/java/emu/grasscutter/data/excels/giving/GivingData.java
@@ -4,9 +4,10 @@ import com.google.gson.annotations.SerializedName;
 import emu.grasscutter.data.*;
 import emu.grasscutter.data.common.ItemParamData;
 import emu.grasscutter.game.inventory.BagTab;
-import java.util.List;
 import lombok.*;
 
+import java.util.List;
+
 @Data
 @EqualsAndHashCode(callSuper = false)
 @ResourceType(name = "GivingExcelConfigData.json")
diff --git a/src/main/java/emu/grasscutter/data/excels/giving/GivingGroupData.java b/src/main/java/emu/grasscutter/data/excels/giving/GivingGroupData.java
index c73101ca8..4c5bb7d1a 100644
--- a/src/main/java/emu/grasscutter/data/excels/giving/GivingGroupData.java
+++ b/src/main/java/emu/grasscutter/data/excels/giving/GivingGroupData.java
@@ -2,9 +2,10 @@ package emu.grasscutter.data.excels.giving;
 
 import com.google.gson.annotations.SerializedName;
 import emu.grasscutter.data.*;
-import java.util.List;
 import lombok.*;
 
+import java.util.List;
+
 @Data
 @EqualsAndHashCode(callSuper = false)
 @ResourceType(name = "GivingGroupExcelConfigData.json")
diff --git a/src/main/java/emu/grasscutter/data/excels/monster/MonsterCurveData.java b/src/main/java/emu/grasscutter/data/excels/monster/MonsterCurveData.java
index 4ba2a8714..3221cee27 100644
--- a/src/main/java/emu/grasscutter/data/excels/monster/MonsterCurveData.java
+++ b/src/main/java/emu/grasscutter/data/excels/monster/MonsterCurveData.java
@@ -1,10 +1,9 @@
 package emu.grasscutter.data.excels.monster;
 
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.data.*;
 import emu.grasscutter.data.common.CurveInfo;
-import java.util.HashMap;
-import java.util.Map;
+
+import java.util.*;
 import java.util.stream.Stream;
 
 @ResourceType(name = "MonsterCurveExcelConfigData.json")
diff --git a/src/main/java/emu/grasscutter/data/excels/monster/MonsterData.java b/src/main/java/emu/grasscutter/data/excels/monster/MonsterData.java
index 2a3b0f374..6f926bda4 100644
--- a/src/main/java/emu/grasscutter/data/excels/monster/MonsterData.java
+++ b/src/main/java/emu/grasscutter/data/excels/monster/MonsterData.java
@@ -1,18 +1,15 @@
 package emu.grasscutter.data.excels.monster;
 
 import com.google.gson.annotations.SerializedName;
-import emu.grasscutter.data.GameData;
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.data.*;
 import emu.grasscutter.data.ResourceType.LoadPriority;
 import emu.grasscutter.data.common.PropGrowCurve;
 import emu.grasscutter.data.excels.GadgetData;
-import emu.grasscutter.game.props.FightProperty;
-import emu.grasscutter.game.props.MonsterType;
-import java.util.List;
-import java.util.Set;
+import emu.grasscutter.game.props.*;
 import lombok.Getter;
 
+import java.util.*;
+
 @ResourceType(name = "MonsterExcelConfigData.json", loadPriority = LoadPriority.LOW)
 @Getter
 public class MonsterData extends GameResource {
diff --git a/src/main/java/emu/grasscutter/data/excels/monster/MonsterDescribeData.java b/src/main/java/emu/grasscutter/data/excels/monster/MonsterDescribeData.java
index b55849ed3..f5e895018 100644
--- a/src/main/java/emu/grasscutter/data/excels/monster/MonsterDescribeData.java
+++ b/src/main/java/emu/grasscutter/data/excels/monster/MonsterDescribeData.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.data.excels.monster;
 
 import com.google.gson.annotations.SerializedName;
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.data.*;
 import emu.grasscutter.data.ResourceType.LoadPriority;
 import lombok.Getter;
 
diff --git a/src/main/java/emu/grasscutter/data/excels/monster/MonsterSpecialNameData.java b/src/main/java/emu/grasscutter/data/excels/monster/MonsterSpecialNameData.java
index ea9d430b9..f4966f0f5 100644
--- a/src/main/java/emu/grasscutter/data/excels/monster/MonsterSpecialNameData.java
+++ b/src/main/java/emu/grasscutter/data/excels/monster/MonsterSpecialNameData.java
@@ -1,10 +1,8 @@
 package emu.grasscutter.data.excels.monster;
 
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.data.*;
 import emu.grasscutter.data.ResourceType.LoadPriority;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
+import lombok.*;
 
 @ResourceType(name = "MonsterSpecialNameExcelConfigData.json", loadPriority = LoadPriority.HIGH)
 @EqualsAndHashCode(callSuper = false)
diff --git a/src/main/java/emu/grasscutter/data/excels/quest/QuestData.java b/src/main/java/emu/grasscutter/data/excels/quest/QuestData.java
index d106f8db1..98dcd27eb 100644
--- a/src/main/java/emu/grasscutter/data/excels/quest/QuestData.java
+++ b/src/main/java/emu/grasscutter/data/excels/quest/QuestData.java
@@ -2,20 +2,16 @@ package emu.grasscutter.data.excels.quest;
 
 import com.google.gson.annotations.SerializedName;
 import emu.grasscutter.Grasscutter;
-import emu.grasscutter.data.GameData;
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.data.*;
 import emu.grasscutter.data.binout.MainQuestData;
 import emu.grasscutter.data.common.ItemParamData;
 import emu.grasscutter.game.quest.enums.*;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import lombok.*;
 import lombok.experimental.FieldDefaults;
 
+import javax.annotation.*;
+import java.util.*;
+
 @ResourceType(name = "QuestExcelConfigData.json")
 @Getter
 @ToString
diff --git a/src/main/java/emu/grasscutter/data/excels/quest/QuestGlobalVarData.java b/src/main/java/emu/grasscutter/data/excels/quest/QuestGlobalVarData.java
index c80ce493e..ebb1da655 100644
--- a/src/main/java/emu/grasscutter/data/excels/quest/QuestGlobalVarData.java
+++ b/src/main/java/emu/grasscutter/data/excels/quest/QuestGlobalVarData.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.data.excels.quest;
 
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.data.*;
 import lombok.*;
 import lombok.experimental.FieldDefaults;
 
diff --git a/src/main/java/emu/grasscutter/data/excels/reliquary/ReliquaryAffixData.java b/src/main/java/emu/grasscutter/data/excels/reliquary/ReliquaryAffixData.java
index 19f663686..83d5ab12c 100644
--- a/src/main/java/emu/grasscutter/data/excels/reliquary/ReliquaryAffixData.java
+++ b/src/main/java/emu/grasscutter/data/excels/reliquary/ReliquaryAffixData.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.data.excels.reliquary;
 
 import com.google.gson.annotations.SerializedName;
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.data.*;
 import emu.grasscutter.game.props.FightProperty;
 import lombok.Getter;
 
diff --git a/src/main/java/emu/grasscutter/data/excels/reliquary/ReliquaryLevelData.java b/src/main/java/emu/grasscutter/data/excels/reliquary/ReliquaryLevelData.java
index 6f7a775cf..0a71ccc70 100644
--- a/src/main/java/emu/grasscutter/data/excels/reliquary/ReliquaryLevelData.java
+++ b/src/main/java/emu/grasscutter/data/excels/reliquary/ReliquaryLevelData.java
@@ -1,13 +1,12 @@
 package emu.grasscutter.data.excels.reliquary;
 
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.data.*;
 import emu.grasscutter.game.props.FightProperty;
-import it.unimi.dsi.fastutil.ints.Int2FloatMap;
-import it.unimi.dsi.fastutil.ints.Int2FloatOpenHashMap;
-import java.util.List;
+import it.unimi.dsi.fastutil.ints.*;
 import lombok.Getter;
 
+import java.util.List;
+
 @ResourceType(name = "ReliquaryLevelExcelConfigData.json")
 public class ReliquaryLevelData extends GameResource {
     @Getter(onMethod_ = @Override)
diff --git a/src/main/java/emu/grasscutter/data/excels/reliquary/ReliquaryMainPropData.java b/src/main/java/emu/grasscutter/data/excels/reliquary/ReliquaryMainPropData.java
index b4746ef6a..5806db11b 100644
--- a/src/main/java/emu/grasscutter/data/excels/reliquary/ReliquaryMainPropData.java
+++ b/src/main/java/emu/grasscutter/data/excels/reliquary/ReliquaryMainPropData.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.data.excels.reliquary;
 
 import com.google.gson.annotations.SerializedName;
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.data.*;
 import emu.grasscutter.game.props.FightProperty;
 import lombok.Getter;
 
diff --git a/src/main/java/emu/grasscutter/data/excels/reliquary/ReliquarySetData.java b/src/main/java/emu/grasscutter/data/excels/reliquary/ReliquarySetData.java
index 986a1aebe..022d2997e 100644
--- a/src/main/java/emu/grasscutter/data/excels/reliquary/ReliquarySetData.java
+++ b/src/main/java/emu/grasscutter/data/excels/reliquary/ReliquarySetData.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.data.excels.reliquary;
 
 import com.google.gson.annotations.SerializedName;
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.data.*;
 
 @ResourceType(name = "ReliquarySetExcelConfigData.json")
 public class ReliquarySetData extends GameResource {
diff --git a/src/main/java/emu/grasscutter/data/excels/scene/MapLayerData.java b/src/main/java/emu/grasscutter/data/excels/scene/MapLayerData.java
index 1596860c8..caf93022c 100644
--- a/src/main/java/emu/grasscutter/data/excels/scene/MapLayerData.java
+++ b/src/main/java/emu/grasscutter/data/excels/scene/MapLayerData.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.data.excels.scene;
 
 import com.google.gson.annotations.SerializedName;
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.data.*;
 import lombok.Getter;
 
 @ResourceType(name = "MapLayerExcelConfigData.json")
diff --git a/src/main/java/emu/grasscutter/data/excels/scene/MapLayerFloorData.java b/src/main/java/emu/grasscutter/data/excels/scene/MapLayerFloorData.java
index 44ecc3fbb..60be676db 100644
--- a/src/main/java/emu/grasscutter/data/excels/scene/MapLayerFloorData.java
+++ b/src/main/java/emu/grasscutter/data/excels/scene/MapLayerFloorData.java
@@ -1,13 +1,12 @@
 package emu.grasscutter.data.excels.scene;
 
 import com.google.gson.annotations.SerializedName;
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
-import java.util.List;
-import lombok.AccessLevel;
-import lombok.Getter;
+import emu.grasscutter.data.*;
+import lombok.*;
 import lombok.experimental.FieldDefaults;
 
+import java.util.List;
+
 @ResourceType(name = "MapLayerFloorExcelConfigData.json")
 @Getter
 @FieldDefaults(level = AccessLevel.PRIVATE)
diff --git a/src/main/java/emu/grasscutter/data/excels/scene/MapLayerGroupData.java b/src/main/java/emu/grasscutter/data/excels/scene/MapLayerGroupData.java
index 7ddd2cc16..d095737c7 100644
--- a/src/main/java/emu/grasscutter/data/excels/scene/MapLayerGroupData.java
+++ b/src/main/java/emu/grasscutter/data/excels/scene/MapLayerGroupData.java
@@ -1,11 +1,11 @@
 package emu.grasscutter.data.excels.scene;
 
 import com.google.gson.annotations.SerializedName;
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
-import java.util.List;
+import emu.grasscutter.data.*;
 import lombok.Getter;
 
+import java.util.List;
+
 @ResourceType(name = "MapLayerGroupExcelConfigData.json")
 @Getter
 public final class MapLayerGroupData extends GameResource {
diff --git a/src/main/java/emu/grasscutter/data/excels/scene/SceneData.java b/src/main/java/emu/grasscutter/data/excels/scene/SceneData.java
index 07c6e25c2..e70086754 100644
--- a/src/main/java/emu/grasscutter/data/excels/scene/SceneData.java
+++ b/src/main/java/emu/grasscutter/data/excels/scene/SceneData.java
@@ -3,9 +3,10 @@ package emu.grasscutter.data.excels.scene;
 import com.google.gson.annotations.SerializedName;
 import emu.grasscutter.data.*;
 import emu.grasscutter.game.props.SceneType;
-import java.util.List;
 import lombok.Getter;
 
+import java.util.List;
+
 @ResourceType(name = "SceneExcelConfigData.json")
 @Getter
 public final class SceneData extends GameResource {
diff --git a/src/main/java/emu/grasscutter/data/excels/scene/SceneTagData.java b/src/main/java/emu/grasscutter/data/excels/scene/SceneTagData.java
index 0c7c5754a..0f3281003 100644
--- a/src/main/java/emu/grasscutter/data/excels/scene/SceneTagData.java
+++ b/src/main/java/emu/grasscutter/data/excels/scene/SceneTagData.java
@@ -1,11 +1,11 @@
 package emu.grasscutter.data.excels.scene;
 
 import com.google.gson.annotations.SerializedName;
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
-import java.util.List;
+import emu.grasscutter.data.*;
 import lombok.Getter;
 
+import java.util.List;
+
 @ResourceType(name = "SceneTagConfigData.json")
 @Getter
 public final class SceneTagData extends GameResource {
diff --git a/src/main/java/emu/grasscutter/data/excels/tower/TowerFloorData.java b/src/main/java/emu/grasscutter/data/excels/tower/TowerFloorData.java
index 1147068a6..196be5c02 100644
--- a/src/main/java/emu/grasscutter/data/excels/tower/TowerFloorData.java
+++ b/src/main/java/emu/grasscutter/data/excels/tower/TowerFloorData.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.data.excels.tower;
 
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.data.*;
 import lombok.Getter;
 
 @ResourceType(name = "TowerFloorExcelConfigData.json")
diff --git a/src/main/java/emu/grasscutter/data/excels/tower/TowerLevelData.java b/src/main/java/emu/grasscutter/data/excels/tower/TowerLevelData.java
index c623cf3ef..244b27f0b 100644
--- a/src/main/java/emu/grasscutter/data/excels/tower/TowerLevelData.java
+++ b/src/main/java/emu/grasscutter/data/excels/tower/TowerLevelData.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.data.excels.tower;
 
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.data.*;
 
 @ResourceType(name = "TowerLevelExcelConfigData.json")
 public class TowerLevelData extends GameResource {
diff --git a/src/main/java/emu/grasscutter/data/excels/tower/TowerScheduleData.java b/src/main/java/emu/grasscutter/data/excels/tower/TowerScheduleData.java
index 5c48ed147..815eb5a68 100644
--- a/src/main/java/emu/grasscutter/data/excels/tower/TowerScheduleData.java
+++ b/src/main/java/emu/grasscutter/data/excels/tower/TowerScheduleData.java
@@ -1,7 +1,7 @@
 package emu.grasscutter.data.excels.tower;
 
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.data.*;
+
 import java.util.List;
 
 @ResourceType(name = "TowerScheduleExcelConfigData.json")
diff --git a/src/main/java/emu/grasscutter/data/excels/trial/TrialAvatarActivityData.java b/src/main/java/emu/grasscutter/data/excels/trial/TrialAvatarActivityData.java
index 8559bbcb0..ac5ebea96 100644
--- a/src/main/java/emu/grasscutter/data/excels/trial/TrialAvatarActivityData.java
+++ b/src/main/java/emu/grasscutter/data/excels/trial/TrialAvatarActivityData.java
@@ -1,11 +1,11 @@
 package emu.grasscutter.data.excels.trial;
 
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.data.*;
 import emu.grasscutter.data.common.BaseTrialActivityData;
-import java.util.List;
 import lombok.*;
 
+import java.util.List;
+
 @ResourceType(name = "TrialAvatarActivityExcelConfigData.json")
 @EqualsAndHashCode(callSuper = false)
 @Data
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 d98de2264..6a532b91f 100644
--- a/src/main/java/emu/grasscutter/data/excels/trial/TrialAvatarActivityDataData.java
+++ b/src/main/java/emu/grasscutter/data/excels/trial/TrialAvatarActivityDataData.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.data.excels.trial;
 
-import emu.grasscutter.data.GameData;
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.data.*;
 import emu.grasscutter.data.excels.activity.ActivityWatcherData;
 import lombok.*;
 import lombok.experimental.FieldDefaults;
diff --git a/src/main/java/emu/grasscutter/data/excels/trial/TrialAvatarData.java b/src/main/java/emu/grasscutter/data/excels/trial/TrialAvatarData.java
index 82bda4818..2351d800d 100644
--- a/src/main/java/emu/grasscutter/data/excels/trial/TrialAvatarData.java
+++ b/src/main/java/emu/grasscutter/data/excels/trial/TrialAvatarData.java
@@ -1,10 +1,10 @@
 package emu.grasscutter.data.excels.trial;
 
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
-import java.util.List;
+import emu.grasscutter.data.*;
 import lombok.*;
 
+import java.util.List;
+
 @ResourceType(name = "TrialAvatarExcelConfigData.json")
 @EqualsAndHashCode(callSuper = false)
 @Data
diff --git a/src/main/java/emu/grasscutter/data/excels/trial/TrialAvatarTemplateData.java b/src/main/java/emu/grasscutter/data/excels/trial/TrialAvatarTemplateData.java
index e6fdad7ba..f8996e990 100644
--- a/src/main/java/emu/grasscutter/data/excels/trial/TrialAvatarTemplateData.java
+++ b/src/main/java/emu/grasscutter/data/excels/trial/TrialAvatarTemplateData.java
@@ -1,10 +1,10 @@
 package emu.grasscutter.data.excels.trial;
 
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
-import java.util.List;
+import emu.grasscutter.data.*;
 import lombok.*;
 
+import java.util.List;
+
 @ResourceType(name = "TrialAvatarTemplateExcelConfigData.json")
 @EqualsAndHashCode(callSuper = false)
 @Data
diff --git a/src/main/java/emu/grasscutter/data/excels/trial/TrialReliquaryData.java b/src/main/java/emu/grasscutter/data/excels/trial/TrialReliquaryData.java
index 4adf28628..b0eeaec4f 100644
--- a/src/main/java/emu/grasscutter/data/excels/trial/TrialReliquaryData.java
+++ b/src/main/java/emu/grasscutter/data/excels/trial/TrialReliquaryData.java
@@ -1,10 +1,10 @@
 package emu.grasscutter.data.excels.trial;
 
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
-import java.util.List;
+import emu.grasscutter.data.*;
 import lombok.*;
 
+import java.util.List;
+
 @ResourceType(name = "TrialReliquaryExcelConfigData.json")
 @EqualsAndHashCode(callSuper = false)
 @Data
diff --git a/src/main/java/emu/grasscutter/data/excels/weapon/WeaponCurveData.java b/src/main/java/emu/grasscutter/data/excels/weapon/WeaponCurveData.java
index 6f7f2a3a2..bae5bccf3 100644
--- a/src/main/java/emu/grasscutter/data/excels/weapon/WeaponCurveData.java
+++ b/src/main/java/emu/grasscutter/data/excels/weapon/WeaponCurveData.java
@@ -1,10 +1,9 @@
 package emu.grasscutter.data.excels.weapon;
 
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.data.*;
 import emu.grasscutter.data.common.CurveInfo;
-import java.util.HashMap;
-import java.util.Map;
+
+import java.util.*;
 import java.util.stream.Stream;
 
 @ResourceType(name = "WeaponCurveExcelConfigData.json")
diff --git a/src/main/java/emu/grasscutter/data/excels/weapon/WeaponLevelData.java b/src/main/java/emu/grasscutter/data/excels/weapon/WeaponLevelData.java
index 11d261e89..a35b9b9c2 100644
--- a/src/main/java/emu/grasscutter/data/excels/weapon/WeaponLevelData.java
+++ b/src/main/java/emu/grasscutter/data/excels/weapon/WeaponLevelData.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.data.excels.weapon;
 
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.data.*;
 
 @ResourceType(name = "WeaponLevelExcelConfigData.json")
 public class WeaponLevelData extends GameResource {
diff --git a/src/main/java/emu/grasscutter/data/excels/weapon/WeaponPromoteData.java b/src/main/java/emu/grasscutter/data/excels/weapon/WeaponPromoteData.java
index 9f1bb8fc9..34e85e2dc 100644
--- a/src/main/java/emu/grasscutter/data/excels/weapon/WeaponPromoteData.java
+++ b/src/main/java/emu/grasscutter/data/excels/weapon/WeaponPromoteData.java
@@ -1,9 +1,8 @@
 package emu.grasscutter.data.excels.weapon;
 
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
-import emu.grasscutter.data.common.FightPropData;
-import emu.grasscutter.data.common.ItemParamData;
+import emu.grasscutter.data.*;
+import emu.grasscutter.data.common.*;
+
 import java.util.ArrayList;
 
 @ResourceType(name = "WeaponPromoteExcelConfigData.json")
diff --git a/src/main/java/emu/grasscutter/data/excels/world/WeatherData.java b/src/main/java/emu/grasscutter/data/excels/world/WeatherData.java
index 917d45fed..631134257 100644
--- a/src/main/java/emu/grasscutter/data/excels/world/WeatherData.java
+++ b/src/main/java/emu/grasscutter/data/excels/world/WeatherData.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.data.excels.world;
 
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.data.*;
 import emu.grasscutter.game.props.ClimateType;
 import lombok.Getter;
 
diff --git a/src/main/java/emu/grasscutter/data/excels/world/WorldAreaData.java b/src/main/java/emu/grasscutter/data/excels/world/WorldAreaData.java
index af999a72a..45354bfc5 100644
--- a/src/main/java/emu/grasscutter/data/excels/world/WorldAreaData.java
+++ b/src/main/java/emu/grasscutter/data/excels/world/WorldAreaData.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.data.excels.world;
 
 import com.google.gson.annotations.SerializedName;
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.data.*;
 import emu.grasscutter.game.props.ElementType;
 import lombok.Getter;
 
diff --git a/src/main/java/emu/grasscutter/data/excels/world/WorldLevelData.java b/src/main/java/emu/grasscutter/data/excels/world/WorldLevelData.java
index 533a88946..0967c9871 100644
--- a/src/main/java/emu/grasscutter/data/excels/world/WorldLevelData.java
+++ b/src/main/java/emu/grasscutter/data/excels/world/WorldLevelData.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.data.excels.world;
 
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.data.*;
 
 @ResourceType(name = "WorldLevelExcelConfigData.json")
 public class WorldLevelData extends GameResource {
diff --git a/src/main/java/emu/grasscutter/data/server/ActivityCondGroup.java b/src/main/java/emu/grasscutter/data/server/ActivityCondGroup.java
index 8eb33a72a..1d0087249 100644
--- a/src/main/java/emu/grasscutter/data/server/ActivityCondGroup.java
+++ b/src/main/java/emu/grasscutter/data/server/ActivityCondGroup.java
@@ -1,8 +1,9 @@
 package emu.grasscutter.data.server;
 
-import java.util.List;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class ActivityCondGroup {
     int condGroupId;
diff --git a/src/main/java/emu/grasscutter/data/server/Grid.java b/src/main/java/emu/grasscutter/data/server/Grid.java
index 537376ce6..673811a86 100644
--- a/src/main/java/emu/grasscutter/data/server/Grid.java
+++ b/src/main/java/emu/grasscutter/data/server/Grid.java
@@ -3,9 +3,9 @@ package emu.grasscutter.data.server;
 import com.github.davidmoten.rtreemulti.RTree;
 import com.github.davidmoten.rtreemulti.geometry.Geometry;
 import emu.grasscutter.Grasscutter;
-import emu.grasscutter.game.world.GridPosition;
-import emu.grasscutter.game.world.Position;
+import emu.grasscutter.game.world.*;
 import emu.grasscutter.scripts.SceneIndexManager;
+
 import java.util.*;
 
 public class Grid {
diff --git a/src/main/java/emu/grasscutter/database/DatabaseCounter.java b/src/main/java/emu/grasscutter/database/DatabaseCounter.java
index 529770e10..68d03bad6 100644
--- a/src/main/java/emu/grasscutter/database/DatabaseCounter.java
+++ b/src/main/java/emu/grasscutter/database/DatabaseCounter.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.database;
 
-import dev.morphia.annotations.Entity;
-import dev.morphia.annotations.Id;
+import dev.morphia.annotations.*;
 
 @Entity(value = "counters", useDiscriminator = false)
 public class DatabaseCounter {
diff --git a/src/main/java/emu/grasscutter/database/DatabaseHelper.java b/src/main/java/emu/grasscutter/database/DatabaseHelper.java
index fffc6ab73..75bd32665 100644
--- a/src/main/java/emu/grasscutter/database/DatabaseHelper.java
+++ b/src/main/java/emu/grasscutter/database/DatabaseHelper.java
@@ -1,7 +1,5 @@
 package emu.grasscutter.database;
 
-import static com.mongodb.client.model.Filters.eq;
-
 import dev.morphia.query.*;
 import dev.morphia.query.experimental.filters.Filters;
 import emu.grasscutter.*;
@@ -21,11 +19,14 @@ import emu.grasscutter.game.quest.GameMainQuest;
 import emu.grasscutter.game.world.SceneGroupInstance;
 import emu.grasscutter.utils.objects.Returnable;
 import io.netty.util.concurrent.FastThreadLocalThread;
+import lombok.Getter;
+
+import javax.annotation.Nullable;
 import java.util.List;
 import java.util.concurrent.*;
 import java.util.stream.Stream;
-import javax.annotation.Nullable;
-import lombok.Getter;
+
+import static com.mongodb.client.model.Filters.eq;
 
 public final class DatabaseHelper {
     @Getter
diff --git a/src/main/java/emu/grasscutter/game/Account.java b/src/main/java/emu/grasscutter/game/Account.java
index da1193b98..0ffffc0f5 100644
--- a/src/main/java/emu/grasscutter/game/Account.java
+++ b/src/main/java/emu/grasscutter/game/Account.java
@@ -1,13 +1,14 @@
 package emu.grasscutter.game;
 
-import static emu.grasscutter.config.Configuration.*;
-
 import dev.morphia.annotations.*;
 import emu.grasscutter.database.DatabaseHelper;
 import emu.grasscutter.utils.*;
+import org.bson.Document;
+
 import java.util.*;
 import java.util.stream.Stream;
-import org.bson.Document;
+
+import static emu.grasscutter.config.Configuration.*;
 
 @Entity(value = "accounts", useDiscriminator = false)
 public class Account {
diff --git a/src/main/java/emu/grasscutter/game/HandbookActions.java b/src/main/java/emu/grasscutter/game/HandbookActions.java
index 5c946ad9a..b94d12e12 100644
--- a/src/main/java/emu/grasscutter/game/HandbookActions.java
+++ b/src/main/java/emu/grasscutter/game/HandbookActions.java
@@ -9,6 +9,7 @@ import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.props.ActionReason;
 import emu.grasscutter.server.packet.send.PacketAddNoGachaAvatarCardNotify;
 import emu.grasscutter.utils.objects.HandbookBody.*;
+
 import java.util.Objects;
 
 /** Commands executed by the handbook. */
diff --git a/src/main/java/emu/grasscutter/game/ability/Ability.java b/src/main/java/emu/grasscutter/game/ability/Ability.java
index 4bd07c8fd..398eef970 100644
--- a/src/main/java/emu/grasscutter/game/ability/Ability.java
+++ b/src/main/java/emu/grasscutter/game/ability/Ability.java
@@ -7,9 +7,10 @@ import emu.grasscutter.game.player.Player;
 import emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString;
 import emu.grasscutter.utils.Utils;
 import it.unimi.dsi.fastutil.objects.*;
-import java.util.*;
 import lombok.Getter;
 
+import java.util.*;
+
 public class Ability {
     @Getter private AbilityData data;
     @Getter private GameEntity owner;
diff --git a/src/main/java/emu/grasscutter/game/ability/AbilityLocalIdGenerator.java b/src/main/java/emu/grasscutter/game/ability/AbilityLocalIdGenerator.java
index 820751925..5b4ab8440 100644
--- a/src/main/java/emu/grasscutter/game/ability/AbilityLocalIdGenerator.java
+++ b/src/main/java/emu/grasscutter/game/ability/AbilityLocalIdGenerator.java
@@ -3,9 +3,10 @@ package emu.grasscutter.game.ability;
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.data.binout.AbilityMixinData;
 import emu.grasscutter.data.binout.AbilityModifier.AbilityModifierAction;
-import java.util.Map;
 import lombok.AllArgsConstructor;
 
+import java.util.Map;
+
 @SuppressWarnings("ALL")
 public class AbilityLocalIdGenerator {
     @AllArgsConstructor
diff --git a/src/main/java/emu/grasscutter/game/ability/AbilityModifierController.java b/src/main/java/emu/grasscutter/game/ability/AbilityModifierController.java
index c37ccb8c2..370412fe5 100644
--- a/src/main/java/emu/grasscutter/game/ability/AbilityModifierController.java
+++ b/src/main/java/emu/grasscutter/game/ability/AbilityModifierController.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.game.ability;
 
-import emu.grasscutter.data.binout.AbilityData;
-import emu.grasscutter.data.binout.AbilityModifier;
+import emu.grasscutter.data.binout.*;
 import lombok.Getter;
 
 public class AbilityModifierController {
diff --git a/src/main/java/emu/grasscutter/game/ability/actions/AbilityAction.java b/src/main/java/emu/grasscutter/game/ability/actions/AbilityAction.java
index 3f0ca03da..7e4753323 100644
--- a/src/main/java/emu/grasscutter/game/ability/actions/AbilityAction.java
+++ b/src/main/java/emu/grasscutter/game/ability/actions/AbilityAction.java
@@ -1,8 +1,8 @@
 package emu.grasscutter.game.ability.actions;
 
 import emu.grasscutter.data.binout.AbilityModifier.AbilityModifierAction;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
+
+import java.lang.annotation.*;
 
 @Retention(RetentionPolicy.RUNTIME)
 public @interface AbilityAction {
diff --git a/src/main/java/emu/grasscutter/game/ability/actions/ActionAvatarSkillStart.java b/src/main/java/emu/grasscutter/game/ability/actions/ActionAvatarSkillStart.java
index 165a693a8..6f014752e 100644
--- a/src/main/java/emu/grasscutter/game/ability/actions/ActionAvatarSkillStart.java
+++ b/src/main/java/emu/grasscutter/game/ability/actions/ActionAvatarSkillStart.java
@@ -4,8 +4,7 @@ import com.google.protobuf.ByteString;
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.data.binout.AbilityModifier.AbilityModifierAction;
 import emu.grasscutter.game.ability.Ability;
-import emu.grasscutter.game.entity.EntityAvatar;
-import emu.grasscutter.game.entity.GameEntity;
+import emu.grasscutter.game.entity.*;
 import emu.grasscutter.game.quest.enums.QuestContent;
 
 @AbilityAction(AbilityModifierAction.Type.AvatarSkillStart)
diff --git a/src/main/java/emu/grasscutter/game/ability/actions/ActionCreateGadget.java b/src/main/java/emu/grasscutter/game/ability/actions/ActionCreateGadget.java
index 54ab52ca7..cb26d8a3b 100644
--- a/src/main/java/emu/grasscutter/game/ability/actions/ActionCreateGadget.java
+++ b/src/main/java/emu/grasscutter/game/ability/actions/ActionCreateGadget.java
@@ -1,12 +1,10 @@
 package emu.grasscutter.game.ability.actions;
 
-import com.google.protobuf.ByteString;
-import com.google.protobuf.InvalidProtocolBufferException;
+import com.google.protobuf.*;
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.data.binout.AbilityModifier.AbilityModifierAction;
 import emu.grasscutter.game.ability.Ability;
-import emu.grasscutter.game.entity.EntityGadget;
-import emu.grasscutter.game.entity.GameEntity;
+import emu.grasscutter.game.entity.*;
 import emu.grasscutter.game.props.CampTargetType;
 import emu.grasscutter.game.world.Position;
 import emu.grasscutter.net.proto.AbilityActionCreateGadgetOuterClass.AbilityActionCreateGadget;
diff --git a/src/main/java/emu/grasscutter/game/ability/actions/ActionExecuteGadgetLua.java b/src/main/java/emu/grasscutter/game/ability/actions/ActionExecuteGadgetLua.java
index 89f062a63..cca594ee1 100644
--- a/src/main/java/emu/grasscutter/game/ability/actions/ActionExecuteGadgetLua.java
+++ b/src/main/java/emu/grasscutter/game/ability/actions/ActionExecuteGadgetLua.java
@@ -3,7 +3,7 @@ package emu.grasscutter.game.ability.actions;
 import com.google.protobuf.ByteString;
 import emu.grasscutter.data.binout.AbilityModifier.AbilityModifierAction;
 import emu.grasscutter.game.ability.Ability;
-import emu.grasscutter.game.entity.*;
+import emu.grasscutter.game.entity.GameEntity;
 
 @AbilityAction(AbilityModifierAction.Type.ExecuteGadgetLua)
 public class ActionExecuteGadgetLua extends AbilityActionHandler {
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 7073e77f2..33df2270b 100644
--- a/src/main/java/emu/grasscutter/game/ability/actions/ActionGenerateElemBall.java
+++ b/src/main/java/emu/grasscutter/game/ability/actions/ActionGenerateElemBall.java
@@ -1,16 +1,13 @@
 package emu.grasscutter.game.ability.actions;
 
-import com.google.protobuf.ByteString;
-import com.google.protobuf.InvalidProtocolBufferException;
+import com.google.protobuf.*;
 import emu.grasscutter.*;
 import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.binout.AbilityModifier.AbilityModifierAction;
 import emu.grasscutter.data.binout.AbilityModifier.AbilityModifierAction.DropType;
 import emu.grasscutter.data.binout.config.ConfigLevelEntity;
 import emu.grasscutter.game.ability.Ability;
-import emu.grasscutter.game.entity.EntityAvatar;
-import emu.grasscutter.game.entity.EntityItem;
-import emu.grasscutter.game.entity.GameEntity;
+import emu.grasscutter.game.entity.*;
 import emu.grasscutter.game.props.SceneType;
 import emu.grasscutter.game.world.Position;
 import emu.grasscutter.net.proto.AbilityActionGenerateElemBallOuterClass.AbilityActionGenerateElemBall;
diff --git a/src/main/java/emu/grasscutter/game/ability/actions/ActionHealHP.java b/src/main/java/emu/grasscutter/game/ability/actions/ActionHealHP.java
index f041af8f3..48af2bbe6 100644
--- a/src/main/java/emu/grasscutter/game/ability/actions/ActionHealHP.java
+++ b/src/main/java/emu/grasscutter/game/ability/actions/ActionHealHP.java
@@ -4,8 +4,7 @@ import com.google.protobuf.ByteString;
 import emu.grasscutter.*;
 import emu.grasscutter.data.binout.AbilityModifier.AbilityModifierAction;
 import emu.grasscutter.game.ability.Ability;
-import emu.grasscutter.game.entity.EntityClientGadget;
-import emu.grasscutter.game.entity.GameEntity;
+import emu.grasscutter.game.entity.*;
 import emu.grasscutter.game.props.FightProperty;
 
 @AbilityAction(AbilityModifierAction.Type.HealHP)
diff --git a/src/main/java/emu/grasscutter/game/ability/actions/ActionLoseHP.java b/src/main/java/emu/grasscutter/game/ability/actions/ActionLoseHP.java
index ec9b8bc80..2e01a97b7 100644
--- a/src/main/java/emu/grasscutter/game/ability/actions/ActionLoseHP.java
+++ b/src/main/java/emu/grasscutter/game/ability/actions/ActionLoseHP.java
@@ -3,8 +3,7 @@ package emu.grasscutter.game.ability.actions;
 import com.google.protobuf.ByteString;
 import emu.grasscutter.data.binout.AbilityModifier.AbilityModifierAction;
 import emu.grasscutter.game.ability.Ability;
-import emu.grasscutter.game.entity.EntityClientGadget;
-import emu.grasscutter.game.entity.GameEntity;
+import emu.grasscutter.game.entity.*;
 import emu.grasscutter.game.props.FightProperty;
 
 @AbilityAction(AbilityModifierAction.Type.LoseHP)
diff --git a/src/main/java/emu/grasscutter/game/ability/actions/ActionSetRandomOverrideMapValue.java b/src/main/java/emu/grasscutter/game/ability/actions/ActionSetRandomOverrideMapValue.java
index 934284c5c..f7631221d 100644
--- a/src/main/java/emu/grasscutter/game/ability/actions/ActionSetRandomOverrideMapValue.java
+++ b/src/main/java/emu/grasscutter/game/ability/actions/ActionSetRandomOverrideMapValue.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.game.ability.actions;
 
-import com.google.protobuf.ByteString;
-import com.google.protobuf.InvalidProtocolBufferException;
+import com.google.protobuf.*;
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.data.binout.AbilityModifier.AbilityModifierAction;
 import emu.grasscutter.game.ability.Ability;
diff --git a/src/main/java/emu/grasscutter/game/ability/mixins/AbilityMixin.java b/src/main/java/emu/grasscutter/game/ability/mixins/AbilityMixin.java
index b849419de..511990bc4 100644
--- a/src/main/java/emu/grasscutter/game/ability/mixins/AbilityMixin.java
+++ b/src/main/java/emu/grasscutter/game/ability/mixins/AbilityMixin.java
@@ -1,8 +1,8 @@
 package emu.grasscutter.game.ability.mixins;
 
 import emu.grasscutter.data.binout.AbilityMixinData;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
+
+import java.lang.annotation.*;
 
 @Retention(RetentionPolicy.RUNTIME)
 public @interface AbilityMixin {
diff --git a/src/main/java/emu/grasscutter/game/achievement/Achievement.java b/src/main/java/emu/grasscutter/game/achievement/Achievement.java
index f4b14a3ac..6f3a7dae1 100644
--- a/src/main/java/emu/grasscutter/game/achievement/Achievement.java
+++ b/src/main/java/emu/grasscutter/game/achievement/Achievement.java
@@ -1,7 +1,7 @@
 package emu.grasscutter.game.achievement;
 
 import dev.morphia.annotations.Entity;
-import emu.grasscutter.net.proto.*;
+import emu.grasscutter.net.proto.AchievementOuterClass;
 import emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Status;
 import lombok.*;
 
diff --git a/src/main/java/emu/grasscutter/game/achievement/Achievements.java b/src/main/java/emu/grasscutter/game/achievement/Achievements.java
index 929c382cb..77db3627a 100644
--- a/src/main/java/emu/grasscutter/game/achievement/Achievements.java
+++ b/src/main/java/emu/grasscutter/game/achievement/Achievements.java
@@ -12,12 +12,13 @@ import emu.grasscutter.game.props.ActionReason;
 import emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Status;
 import emu.grasscutter.server.event.player.PlayerCompleteAchievementEvent;
 import emu.grasscutter.server.packet.send.*;
+import lombok.*;
+import org.bson.types.ObjectId;
+
+import javax.annotation.Nullable;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.IntSupplier;
-import javax.annotation.Nullable;
-import lombok.*;
-import org.bson.types.ObjectId;
 
 @Entity("achievements")
 @Data
diff --git a/src/main/java/emu/grasscutter/game/activity/ActivityConfigItem.java b/src/main/java/emu/grasscutter/game/activity/ActivityConfigItem.java
index 31b57fce9..ace61d9ea 100644
--- a/src/main/java/emu/grasscutter/game/activity/ActivityConfigItem.java
+++ b/src/main/java/emu/grasscutter/game/activity/ActivityConfigItem.java
@@ -1,11 +1,10 @@
 package emu.grasscutter.game.activity;
 
-import java.util.Date;
-import java.util.List;
-import lombok.AccessLevel;
-import lombok.Data;
+import lombok.*;
 import lombok.experimental.FieldDefaults;
 
+import java.util.*;
+
 @Data
 @FieldDefaults(level = AccessLevel.PRIVATE)
 public class ActivityConfigItem {
diff --git a/src/main/java/emu/grasscutter/game/activity/ActivityHandler.java b/src/main/java/emu/grasscutter/game/activity/ActivityHandler.java
index a1371376e..bd75213dd 100644
--- a/src/main/java/emu/grasscutter/game/activity/ActivityHandler.java
+++ b/src/main/java/emu/grasscutter/game/activity/ActivityHandler.java
@@ -10,12 +10,11 @@ import emu.grasscutter.game.props.WatcherTriggerType;
 import emu.grasscutter.game.quest.enums.QuestCond;
 import emu.grasscutter.net.proto.ActivityInfoOuterClass;
 import emu.grasscutter.utils.helpers.DateHelper;
+import lombok.*;
+import lombok.experimental.FieldDefaults;
+
 import java.util.*;
 import java.util.stream.Collectors;
-import lombok.AccessLevel;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.experimental.FieldDefaults;
 
 @Getter
 @Setter
diff --git a/src/main/java/emu/grasscutter/game/activity/ActivityWatcher.java b/src/main/java/emu/grasscutter/game/activity/ActivityWatcher.java
index 7393d0834..da3cfe7ab 100644
--- a/src/main/java/emu/grasscutter/game/activity/ActivityWatcher.java
+++ b/src/main/java/emu/grasscutter/game/activity/ActivityWatcher.java
@@ -1,9 +1,7 @@
 package emu.grasscutter.game.activity;
 
 import emu.grasscutter.data.excels.activity.ActivityWatcherData;
-import lombok.AccessLevel;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.*;
 import lombok.experimental.FieldDefaults;
 
 @Getter
diff --git a/src/main/java/emu/grasscutter/game/activity/ActivityWatcherType.java b/src/main/java/emu/grasscutter/game/activity/ActivityWatcherType.java
index 234c003fb..a52137e78 100644
--- a/src/main/java/emu/grasscutter/game/activity/ActivityWatcherType.java
+++ b/src/main/java/emu/grasscutter/game/activity/ActivityWatcherType.java
@@ -1,10 +1,8 @@
 package emu.grasscutter.game.activity;
 
 import emu.grasscutter.game.props.WatcherTriggerType;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
+
+import java.lang.annotation.*;
 
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
diff --git a/src/main/java/emu/grasscutter/game/activity/GameActivity.java b/src/main/java/emu/grasscutter/game/activity/GameActivity.java
index c74ec792b..d8137f93b 100644
--- a/src/main/java/emu/grasscutter/game/activity/GameActivity.java
+++ b/src/main/java/emu/grasscutter/game/activity/GameActivity.java
@@ -1,10 +1,8 @@
 package emu.grasscutter.game.activity;
 
 import emu.grasscutter.game.props.ActivityType;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
+
+import java.lang.annotation.*;
 
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
diff --git a/src/main/java/emu/grasscutter/game/activity/PlayerActivityData.java b/src/main/java/emu/grasscutter/game/activity/PlayerActivityData.java
index 9681852e4..30eef7d0b 100644
--- a/src/main/java/emu/grasscutter/game/activity/PlayerActivityData.java
+++ b/src/main/java/emu/grasscutter/game/activity/PlayerActivityData.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.game.activity;
 
-import dev.morphia.annotations.Entity;
-import dev.morphia.annotations.Id;
-import dev.morphia.annotations.Transient;
+import dev.morphia.annotations.*;
 import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.common.ItemParamData;
 import emu.grasscutter.data.excels.activity.ActivityWatcherData;
@@ -13,15 +11,11 @@ import emu.grasscutter.game.props.ActionReason;
 import emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass;
 import emu.grasscutter.server.packet.send.PacketActivityUpdateWatcherNotify;
 import emu.grasscutter.utils.JsonUtils;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import lombok.AccessLevel;
-import lombok.Builder;
-import lombok.Data;
+import lombok.*;
 import lombok.experimental.FieldDefaults;
 
+import java.util.*;
+
 @Entity("activities")
 @Data
 @FieldDefaults(level = AccessLevel.PRIVATE)
diff --git a/src/main/java/emu/grasscutter/game/activity/condition/ActivityCondition.java b/src/main/java/emu/grasscutter/game/activity/condition/ActivityCondition.java
index 6897bdf81..0ff4f13d1 100644
--- a/src/main/java/emu/grasscutter/game/activity/condition/ActivityCondition.java
+++ b/src/main/java/emu/grasscutter/game/activity/condition/ActivityCondition.java
@@ -1,8 +1,8 @@
 package emu.grasscutter.game.activity.condition;
 
 import emu.grasscutter.data.excels.activity.ActivityCondExcelConfigData;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
+
+import java.lang.annotation.*;
 
 /**
  * This annotation marks condition types for NewActivityCondExcelConfigData.json ({@link
diff --git a/src/main/java/emu/grasscutter/game/activity/condition/ActivityConditionBaseHandler.java b/src/main/java/emu/grasscutter/game/activity/condition/ActivityConditionBaseHandler.java
index 7f40face2..abf45b02d 100644
--- a/src/main/java/emu/grasscutter/game/activity/condition/ActivityConditionBaseHandler.java
+++ b/src/main/java/emu/grasscutter/game/activity/condition/ActivityConditionBaseHandler.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.game.activity.condition;
 
 import emu.grasscutter.data.excels.activity.ActivityCondExcelConfigData;
-import emu.grasscutter.game.activity.ActivityConfigItem;
-import emu.grasscutter.game.activity.PlayerActivityData;
+import emu.grasscutter.game.activity.*;
 
 /**
  * Base handler for all activity conditions that are listed in NewActivityCondExcelConfigData.json
diff --git a/src/main/java/emu/grasscutter/game/activity/condition/AllActivityConditionBuilder.java b/src/main/java/emu/grasscutter/game/activity/condition/AllActivityConditionBuilder.java
index bb2769429..0a8170cb4 100644
--- a/src/main/java/emu/grasscutter/game/activity/condition/AllActivityConditionBuilder.java
+++ b/src/main/java/emu/grasscutter/game/activity/condition/AllActivityConditionBuilder.java
@@ -2,11 +2,11 @@ package emu.grasscutter.game.activity.condition;
 
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.data.excels.activity.ActivityCondExcelConfigData;
-import java.util.AbstractMap;
-import java.util.Map;
-import java.util.stream.Collectors;
 import org.reflections.Reflections;
 
+import java.util.*;
+import java.util.stream.Collectors;
+
 /**
  * Class that used for scanning classpath, picking up all activity conditions (for
  * NewActivityCondExcelConfigData.json {@link ActivityCondExcelConfigData}) and saving them to map.
diff --git a/src/main/java/emu/grasscutter/game/activity/condition/BasicActivityConditionExecutor.java b/src/main/java/emu/grasscutter/game/activity/condition/BasicActivityConditionExecutor.java
index c0ea940ac..8610e8089 100644
--- a/src/main/java/emu/grasscutter/game/activity/condition/BasicActivityConditionExecutor.java
+++ b/src/main/java/emu/grasscutter/game/activity/condition/BasicActivityConditionExecutor.java
@@ -2,13 +2,12 @@ package emu.grasscutter.game.activity.condition;
 
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.data.excels.activity.ActivityCondExcelConfigData;
-import emu.grasscutter.game.activity.ActivityConfigItem;
-import emu.grasscutter.game.activity.PlayerActivityData;
+import emu.grasscutter.game.activity.*;
 import emu.grasscutter.game.activity.condition.all.UnknownActivityConditionHandler;
 import emu.grasscutter.game.quest.enums.LogicType;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import java.util.List;
-import java.util.Map;
+
+import java.util.*;
 import java.util.function.BooleanSupplier;
 import java.util.stream.Collectors;
 
diff --git a/src/main/java/emu/grasscutter/game/activity/condition/PlayerActivityDataMappingBuilder.java b/src/main/java/emu/grasscutter/game/activity/condition/PlayerActivityDataMappingBuilder.java
index 97ab43e30..ba5d50a49 100644
--- a/src/main/java/emu/grasscutter/game/activity/condition/PlayerActivityDataMappingBuilder.java
+++ b/src/main/java/emu/grasscutter/game/activity/condition/PlayerActivityDataMappingBuilder.java
@@ -4,8 +4,8 @@ import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.excels.activity.ActivityCondExcelConfigData;
 import emu.grasscutter.game.activity.PlayerActivityData;
 import it.unimi.dsi.fastutil.ints.AbstractInt2ObjectMap.BasicEntry;
-import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap;
+import it.unimi.dsi.fastutil.ints.*;
+
 import java.util.Map;
 
 /** This class is used for building mapping for PlayerActivityData */
diff --git a/src/main/java/emu/grasscutter/game/activity/condition/all/DayLess.java b/src/main/java/emu/grasscutter/game/activity/condition/all/DayLess.java
index 162d0c799..0abec7027 100644
--- a/src/main/java/emu/grasscutter/game/activity/condition/all/DayLess.java
+++ b/src/main/java/emu/grasscutter/game/activity/condition/all/DayLess.java
@@ -1,11 +1,9 @@
 package emu.grasscutter.game.activity.condition.all;
 
-import static emu.grasscutter.game.activity.condition.ActivityConditions.NEW_ACTIVITY_COND_DAYS_LESS;
+import emu.grasscutter.game.activity.*;
+import emu.grasscutter.game.activity.condition.*;
 
-import emu.grasscutter.game.activity.ActivityConfigItem;
-import emu.grasscutter.game.activity.PlayerActivityData;
-import emu.grasscutter.game.activity.condition.ActivityCondition;
-import emu.grasscutter.game.activity.condition.ActivityConditionBaseHandler;
+import static emu.grasscutter.game.activity.condition.ActivityConditions.NEW_ACTIVITY_COND_DAYS_LESS;
 
 @ActivityCondition(NEW_ACTIVITY_COND_DAYS_LESS)
 public class DayLess extends ActivityConditionBaseHandler {
diff --git a/src/main/java/emu/grasscutter/game/activity/condition/all/DaysGreatEqual.java b/src/main/java/emu/grasscutter/game/activity/condition/all/DaysGreatEqual.java
index 7d663bfc2..e7b751422 100644
--- a/src/main/java/emu/grasscutter/game/activity/condition/all/DaysGreatEqual.java
+++ b/src/main/java/emu/grasscutter/game/activity/condition/all/DaysGreatEqual.java
@@ -1,13 +1,12 @@
 package emu.grasscutter.game.activity.condition.all;
 
-import static emu.grasscutter.game.activity.condition.ActivityConditions.NEW_ACTIVITY_COND_DAYS_GREAT_EQUAL;
+import emu.grasscutter.game.activity.*;
+import emu.grasscutter.game.activity.condition.*;
 
-import emu.grasscutter.game.activity.ActivityConfigItem;
-import emu.grasscutter.game.activity.PlayerActivityData;
-import emu.grasscutter.game.activity.condition.ActivityCondition;
-import emu.grasscutter.game.activity.condition.ActivityConditionBaseHandler;
 import java.util.Date;
 
+import static emu.grasscutter.game.activity.condition.ActivityConditions.NEW_ACTIVITY_COND_DAYS_GREAT_EQUAL;
+
 @ActivityCondition(NEW_ACTIVITY_COND_DAYS_GREAT_EQUAL)
 public class DaysGreatEqual extends ActivityConditionBaseHandler {
     @Override
diff --git a/src/main/java/emu/grasscutter/game/activity/condition/all/FinishWatcher.java b/src/main/java/emu/grasscutter/game/activity/condition/all/FinishWatcher.java
index 872b5121f..184be7fd6 100644
--- a/src/main/java/emu/grasscutter/game/activity/condition/all/FinishWatcher.java
+++ b/src/main/java/emu/grasscutter/game/activity/condition/all/FinishWatcher.java
@@ -1,10 +1,7 @@
 package emu.grasscutter.game.activity.condition.all;
 
-import emu.grasscutter.game.activity.ActivityConfigItem;
-import emu.grasscutter.game.activity.PlayerActivityData;
-import emu.grasscutter.game.activity.condition.ActivityCondition;
-import emu.grasscutter.game.activity.condition.ActivityConditionBaseHandler;
-import emu.grasscutter.game.activity.condition.ActivityConditions;
+import emu.grasscutter.game.activity.*;
+import emu.grasscutter.game.activity.condition.*;
 import lombok.val;
 
 @ActivityCondition(ActivityConditions.NEW_ACTIVITY_COND_FINISH_WATCHER)
diff --git a/src/main/java/emu/grasscutter/game/activity/condition/all/NotFinishTalk.java b/src/main/java/emu/grasscutter/game/activity/condition/all/NotFinishTalk.java
index e5d56b511..b1736b268 100644
--- a/src/main/java/emu/grasscutter/game/activity/condition/all/NotFinishTalk.java
+++ b/src/main/java/emu/grasscutter/game/activity/condition/all/NotFinishTalk.java
@@ -1,11 +1,9 @@
 package emu.grasscutter.game.activity.condition.all;
 
-import static emu.grasscutter.game.activity.condition.ActivityConditions.NEW_ACTIVITY_COND_NOT_FINISH_TALK;
+import emu.grasscutter.game.activity.*;
+import emu.grasscutter.game.activity.condition.*;
 
-import emu.grasscutter.game.activity.ActivityConfigItem;
-import emu.grasscutter.game.activity.PlayerActivityData;
-import emu.grasscutter.game.activity.condition.ActivityCondition;
-import emu.grasscutter.game.activity.condition.ActivityConditionBaseHandler;
+import static emu.grasscutter.game.activity.condition.ActivityConditions.NEW_ACTIVITY_COND_NOT_FINISH_TALK;
 
 @ActivityCondition(NEW_ACTIVITY_COND_NOT_FINISH_TALK)
 public class NotFinishTalk extends ActivityConditionBaseHandler {
diff --git a/src/main/java/emu/grasscutter/game/activity/condition/all/PlayerLevelGreatEqualActivityActivityCondition.java b/src/main/java/emu/grasscutter/game/activity/condition/all/PlayerLevelGreatEqualActivityActivityCondition.java
index bc3cf17a7..c088cf5fd 100644
--- a/src/main/java/emu/grasscutter/game/activity/condition/all/PlayerLevelGreatEqualActivityActivityCondition.java
+++ b/src/main/java/emu/grasscutter/game/activity/condition/all/PlayerLevelGreatEqualActivityActivityCondition.java
@@ -1,11 +1,9 @@
 package emu.grasscutter.game.activity.condition.all;
 
-import static emu.grasscutter.game.activity.condition.ActivityConditions.NEW_ACTIVITY_COND_PLAYER_LEVEL_GREAT_EQUAL;
+import emu.grasscutter.game.activity.*;
+import emu.grasscutter.game.activity.condition.*;
 
-import emu.grasscutter.game.activity.ActivityConfigItem;
-import emu.grasscutter.game.activity.PlayerActivityData;
-import emu.grasscutter.game.activity.condition.ActivityCondition;
-import emu.grasscutter.game.activity.condition.ActivityConditionBaseHandler;
+import static emu.grasscutter.game.activity.condition.ActivityConditions.NEW_ACTIVITY_COND_PLAYER_LEVEL_GREAT_EQUAL;
 
 @ActivityCondition(NEW_ACTIVITY_COND_PLAYER_LEVEL_GREAT_EQUAL)
 public class PlayerLevelGreatEqualActivityActivityCondition extends ActivityConditionBaseHandler {
diff --git a/src/main/java/emu/grasscutter/game/activity/condition/all/QuestFinished.java b/src/main/java/emu/grasscutter/game/activity/condition/all/QuestFinished.java
index f87aaa253..6a7257cb0 100644
--- a/src/main/java/emu/grasscutter/game/activity/condition/all/QuestFinished.java
+++ b/src/main/java/emu/grasscutter/game/activity/condition/all/QuestFinished.java
@@ -1,14 +1,12 @@
 package emu.grasscutter.game.activity.condition.all;
 
-import static emu.grasscutter.game.activity.condition.ActivityConditions.NEW_ACTIVITY_COND_QUEST_FINISH;
-
-import emu.grasscutter.game.activity.ActivityConfigItem;
-import emu.grasscutter.game.activity.PlayerActivityData;
-import emu.grasscutter.game.activity.condition.ActivityCondition;
-import emu.grasscutter.game.activity.condition.ActivityConditionBaseHandler;
+import emu.grasscutter.game.activity.*;
+import emu.grasscutter.game.activity.condition.*;
 import emu.grasscutter.game.quest.GameQuest;
 import emu.grasscutter.game.quest.enums.QuestState;
 
+import static emu.grasscutter.game.activity.condition.ActivityConditions.NEW_ACTIVITY_COND_QUEST_FINISH;
+
 @ActivityCondition(NEW_ACTIVITY_COND_QUEST_FINISH)
 public class QuestFinished extends ActivityConditionBaseHandler {
     @Override
diff --git a/src/main/java/emu/grasscutter/game/activity/condition/all/SalesmanCanDeliver.java b/src/main/java/emu/grasscutter/game/activity/condition/all/SalesmanCanDeliver.java
index 76f12107d..65059660e 100644
--- a/src/main/java/emu/grasscutter/game/activity/condition/all/SalesmanCanDeliver.java
+++ b/src/main/java/emu/grasscutter/game/activity/condition/all/SalesmanCanDeliver.java
@@ -1,11 +1,9 @@
 package emu.grasscutter.game.activity.condition.all;
 
-import static emu.grasscutter.game.activity.condition.ActivityConditions.NEW_ACTIVITY_COND_SALESMAN_CAN_DELIVER;
+import emu.grasscutter.game.activity.*;
+import emu.grasscutter.game.activity.condition.*;
 
-import emu.grasscutter.game.activity.ActivityConfigItem;
-import emu.grasscutter.game.activity.PlayerActivityData;
-import emu.grasscutter.game.activity.condition.ActivityCondition;
-import emu.grasscutter.game.activity.condition.ActivityConditionBaseHandler;
+import static emu.grasscutter.game.activity.condition.ActivityConditions.NEW_ACTIVITY_COND_SALESMAN_CAN_DELIVER;
 
 @ActivityCondition(NEW_ACTIVITY_COND_SALESMAN_CAN_DELIVER)
 public class SalesmanCanDeliver extends ActivityConditionBaseHandler {
diff --git a/src/main/java/emu/grasscutter/game/activity/condition/all/UnknownActivityConditionHandler.java b/src/main/java/emu/grasscutter/game/activity/condition/all/UnknownActivityConditionHandler.java
index b833d8db0..e40e3bcbf 100644
--- a/src/main/java/emu/grasscutter/game/activity/condition/all/UnknownActivityConditionHandler.java
+++ b/src/main/java/emu/grasscutter/game/activity/condition/all/UnknownActivityConditionHandler.java
@@ -1,10 +1,8 @@
 package emu.grasscutter.game.activity.condition.all;
 
 import emu.grasscutter.Grasscutter;
-import emu.grasscutter.game.activity.ActivityConfigItem;
-import emu.grasscutter.game.activity.PlayerActivityData;
-import emu.grasscutter.game.activity.condition.ActivityConditionBaseHandler;
-import emu.grasscutter.game.activity.condition.ActivityConditions;
+import emu.grasscutter.game.activity.*;
+import emu.grasscutter.game.activity.condition.*;
 import lombok.AllArgsConstructor;
 
 /** This class is used when condition was not found */
diff --git a/src/main/java/emu/grasscutter/game/activity/musicgame/MusicGameActivityHandler.java b/src/main/java/emu/grasscutter/game/activity/musicgame/MusicGameActivityHandler.java
index 2a8be33fe..4cfc1b169 100644
--- a/src/main/java/emu/grasscutter/game/activity/musicgame/MusicGameActivityHandler.java
+++ b/src/main/java/emu/grasscutter/game/activity/musicgame/MusicGameActivityHandler.java
@@ -1,12 +1,10 @@
 package emu.grasscutter.game.activity.musicgame;
 
-import emu.grasscutter.game.activity.ActivityHandler;
-import emu.grasscutter.game.activity.GameActivity;
-import emu.grasscutter.game.activity.PlayerActivityData;
+import emu.grasscutter.game.activity.*;
 import emu.grasscutter.game.props.ActivityType;
-import emu.grasscutter.net.proto.ActivityInfoOuterClass;
-import emu.grasscutter.net.proto.MusicGameActivityDetailInfoOuterClass;
+import emu.grasscutter.net.proto.*;
 import emu.grasscutter.utils.JsonUtils;
+
 import java.util.stream.Collectors;
 
 @GameActivity(ActivityType.NEW_ACTIVITY_MUSIC_GAME)
diff --git a/src/main/java/emu/grasscutter/game/activity/musicgame/MusicGameBeatmap.java b/src/main/java/emu/grasscutter/game/activity/musicgame/MusicGameBeatmap.java
index 05f666693..3c8741a52 100644
--- a/src/main/java/emu/grasscutter/game/activity/musicgame/MusicGameBeatmap.java
+++ b/src/main/java/emu/grasscutter/game/activity/musicgame/MusicGameBeatmap.java
@@ -1,19 +1,13 @@
 package emu.grasscutter.game.activity.musicgame;
 
-import dev.morphia.annotations.Entity;
-import dev.morphia.annotations.Id;
+import dev.morphia.annotations.*;
 import emu.grasscutter.database.DatabaseHelper;
-import emu.grasscutter.net.proto.UgcMusicBriefInfoOuterClass;
-import emu.grasscutter.net.proto.UgcMusicNoteOuterClass;
-import emu.grasscutter.net.proto.UgcMusicRecordOuterClass;
-import emu.grasscutter.net.proto.UgcMusicTrackOuterClass;
-import java.util.List;
-import java.util.Random;
-import lombok.AccessLevel;
-import lombok.Builder;
-import lombok.Data;
+import emu.grasscutter.net.proto.*;
+import lombok.*;
 import lombok.experimental.FieldDefaults;
 
+import java.util.*;
+
 @Entity("music_game_beatmaps")
 @Data
 @FieldDefaults(level = AccessLevel.PRIVATE)
diff --git a/src/main/java/emu/grasscutter/game/activity/musicgame/MusicGamePlayerData.java b/src/main/java/emu/grasscutter/game/activity/musicgame/MusicGamePlayerData.java
index c9b963e15..97874188d 100644
--- a/src/main/java/emu/grasscutter/game/activity/musicgame/MusicGamePlayerData.java
+++ b/src/main/java/emu/grasscutter/game/activity/musicgame/MusicGamePlayerData.java
@@ -2,16 +2,13 @@ package emu.grasscutter.game.activity.musicgame;
 
 import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.excels.MusicGameBasicData;
-import emu.grasscutter.net.proto.MusicGameRecordOuterClass;
-import emu.grasscutter.net.proto.UgcMusicBriefInfoOuterClass;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.stream.Collectors;
-import lombok.AccessLevel;
-import lombok.Builder;
-import lombok.Data;
+import emu.grasscutter.net.proto.*;
+import lombok.*;
 import lombok.experimental.FieldDefaults;
 
+import java.util.*;
+import java.util.stream.Collectors;
+
 @Data
 @FieldDefaults(level = AccessLevel.PRIVATE)
 @Builder(builderMethodName = "of")
diff --git a/src/main/java/emu/grasscutter/game/activity/musicgame/MusicGameScoreTrigger.java b/src/main/java/emu/grasscutter/game/activity/musicgame/MusicGameScoreTrigger.java
index fcf4a4edf..7b089a3a8 100644
--- a/src/main/java/emu/grasscutter/game/activity/musicgame/MusicGameScoreTrigger.java
+++ b/src/main/java/emu/grasscutter/game/activity/musicgame/MusicGameScoreTrigger.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.game.activity.musicgame;
 
-import emu.grasscutter.game.activity.ActivityWatcher;
-import emu.grasscutter.game.activity.ActivityWatcherType;
+import emu.grasscutter.game.activity.*;
 import emu.grasscutter.game.props.WatcherTriggerType;
 
 @ActivityWatcherType(WatcherTriggerType.TRIGGER_FLEUR_FAIR_MUSIC_GAME_REACH_SCORE)
diff --git a/src/main/java/emu/grasscutter/game/activity/trialavatar/TrialAvatarActivityChallengeTrigger.java b/src/main/java/emu/grasscutter/game/activity/trialavatar/TrialAvatarActivityChallengeTrigger.java
index 2e6d767ac..98063fffc 100644
--- a/src/main/java/emu/grasscutter/game/activity/trialavatar/TrialAvatarActivityChallengeTrigger.java
+++ b/src/main/java/emu/grasscutter/game/activity/trialavatar/TrialAvatarActivityChallengeTrigger.java
@@ -1,12 +1,11 @@
 package emu.grasscutter.game.activity.trialavatar;
 
-import emu.grasscutter.game.activity.ActivityWatcher;
-import emu.grasscutter.game.activity.ActivityWatcherType;
-import emu.grasscutter.game.activity.PlayerActivityData;
+import emu.grasscutter.game.activity.*;
 import emu.grasscutter.game.props.WatcherTriggerType;
-import java.util.stream.Stream;
 import lombok.val;
 
+import java.util.stream.Stream;
+
 @ActivityWatcherType(WatcherTriggerType.TRIGGER_FINISH_CHALLENGE)
 public class TrialAvatarActivityChallengeTrigger extends ActivityWatcher {
     @Override
diff --git a/src/main/java/emu/grasscutter/game/activity/trialavatar/TrialAvatarActivityHandler.java b/src/main/java/emu/grasscutter/game/activity/trialavatar/TrialAvatarActivityHandler.java
index 5c18a274e..9723dff3f 100644
--- a/src/main/java/emu/grasscutter/game/activity/trialavatar/TrialAvatarActivityHandler.java
+++ b/src/main/java/emu/grasscutter/game/activity/trialavatar/TrialAvatarActivityHandler.java
@@ -4,25 +4,19 @@ import com.esotericsoftware.reflectasm.ConstructorAccess;
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.excels.RewardData;
-import emu.grasscutter.game.activity.ActivityHandler;
-import emu.grasscutter.game.activity.ActivityWatcher;
-import emu.grasscutter.game.activity.DefaultWatcher;
-import emu.grasscutter.game.activity.GameActivity;
-import emu.grasscutter.game.activity.PlayerActivityData;
+import emu.grasscutter.game.activity.*;
 import emu.grasscutter.game.dungeons.DungeonTrialTeam;
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.game.props.ActionReason;
-import emu.grasscutter.game.props.ActivityType;
-import emu.grasscutter.game.props.WatcherTriggerType;
+import emu.grasscutter.game.props.*;
 import emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo;
 import emu.grasscutter.net.proto.TrialAvatarGrantRecordOuterClass.TrialAvatarGrantRecord.GrantReason;
-import emu.grasscutter.server.packet.send.PacketActivityInfoNotify;
-import emu.grasscutter.server.packet.send.PacketScenePlayerLocationNotify;
+import emu.grasscutter.server.packet.send.*;
 import emu.grasscutter.utils.JsonUtils;
-import java.util.*;
-import java.util.stream.*;
 import lombok.*;
 
+import java.util.*;
+import java.util.stream.Stream;
+
 @GameActivity(ActivityType.NEW_ACTIVITY_TRIAL_AVATAR)
 public class TrialAvatarActivityHandler extends ActivityHandler {
     @Getter @Setter private int selectedTrialAvatarIndex;
diff --git a/src/main/java/emu/grasscutter/game/activity/trialavatar/TrialAvatarPlayerData.java b/src/main/java/emu/grasscutter/game/activity/trialavatar/TrialAvatarPlayerData.java
index e2c0fddd9..e133968b1 100644
--- a/src/main/java/emu/grasscutter/game/activity/trialavatar/TrialAvatarPlayerData.java
+++ b/src/main/java/emu/grasscutter/game/activity/trialavatar/TrialAvatarPlayerData.java
@@ -4,13 +4,11 @@ import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.common.BaseTrialActivityData;
 import emu.grasscutter.net.proto.TrialAvatarActivityDetailInfoOuterClass.TrialAvatarActivityDetailInfo;
 import emu.grasscutter.net.proto.TrialAvatarActivityRewardDetailInfoOuterClass.TrialAvatarActivityRewardDetailInfo;
+import lombok.*;
+import lombok.experimental.FieldDefaults;
+
 import java.util.List;
 import java.util.stream.*;
-import lombok.AccessLevel;
-import lombok.Builder;
-import lombok.Data;
-import lombok.experimental.FieldDefaults;
-import lombok.val;
 
 @Data
 @FieldDefaults(level = AccessLevel.PRIVATE)
diff --git a/src/main/java/emu/grasscutter/game/avatar/Avatar.java b/src/main/java/emu/grasscutter/game/avatar/Avatar.java
index fc272ed95..e14776d81 100644
--- a/src/main/java/emu/grasscutter/game/avatar/Avatar.java
+++ b/src/main/java/emu/grasscutter/game/avatar/Avatar.java
@@ -1,7 +1,5 @@
 package emu.grasscutter.game.avatar;
 
-import static emu.grasscutter.config.Configuration.GAME_OPTIONS;
-
 import dev.morphia.annotations.*;
 import emu.grasscutter.GameConstants;
 import emu.grasscutter.data.GameData;
@@ -32,12 +30,15 @@ import emu.grasscutter.net.proto.TrialAvatarInfoOuterClass.TrialAvatarInfo;
 import emu.grasscutter.server.packet.send.*;
 import emu.grasscutter.utils.helpers.ProtoHelper;
 import it.unimi.dsi.fastutil.ints.*;
-import java.util.*;
-import java.util.stream.Stream;
-import javax.annotation.*;
 import lombok.*;
 import org.bson.types.ObjectId;
 
+import javax.annotation.*;
+import java.util.*;
+import java.util.stream.Stream;
+
+import static emu.grasscutter.config.Configuration.GAME_OPTIONS;
+
 @Entity(value = "avatars", useDiscriminator = false)
 public class Avatar {
     @Transient @Getter private final Int2ObjectMap equips;
diff --git a/src/main/java/emu/grasscutter/game/avatar/AvatarStorage.java b/src/main/java/emu/grasscutter/game/avatar/AvatarStorage.java
index 49dfcfd6b..0a238f5f6 100644
--- a/src/main/java/emu/grasscutter/game/avatar/AvatarStorage.java
+++ b/src/main/java/emu/grasscutter/game/avatar/AvatarStorage.java
@@ -1,22 +1,17 @@
 package emu.grasscutter.game.avatar;
 
 import emu.grasscutter.data.GameData;
-import emu.grasscutter.data.excels.avatar.AvatarData;
-import emu.grasscutter.data.excels.avatar.AvatarSkillDepotData;
+import emu.grasscutter.data.excels.avatar.*;
 import emu.grasscutter.database.DatabaseHelper;
 import emu.grasscutter.game.entity.EntityAvatar;
 import emu.grasscutter.game.inventory.GameItem;
-import emu.grasscutter.game.player.BasePlayerManager;
-import emu.grasscutter.game.player.Player;
+import emu.grasscutter.game.player.*;
 import emu.grasscutter.server.event.entity.EntityCreationEvent;
-import emu.grasscutter.server.packet.send.PacketAvatarChangeCostumeNotify;
-import emu.grasscutter.server.packet.send.PacketAvatarFlycloakChangeNotify;
-import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
-import it.unimi.dsi.fastutil.longs.Long2ObjectMap;
-import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap;
-import java.util.Iterator;
-import java.util.List;
+import emu.grasscutter.server.packet.send.*;
+import it.unimi.dsi.fastutil.ints.*;
+import it.unimi.dsi.fastutil.longs.*;
+
+import java.util.*;
 
 public class AvatarStorage extends BasePlayerManager implements Iterable {
     private final Int2ObjectMap avatars;
diff --git a/src/main/java/emu/grasscutter/game/battlepass/BattlePassManager.java b/src/main/java/emu/grasscutter/game/battlepass/BattlePassManager.java
index 0d48355a5..df93a4239 100644
--- a/src/main/java/emu/grasscutter/game/battlepass/BattlePassManager.java
+++ b/src/main/java/emu/grasscutter/game/battlepass/BattlePassManager.java
@@ -14,11 +14,12 @@ import emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.BattlePass
 import emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassSchedule;
 import emu.grasscutter.net.proto.BattlePassUnlockStatusOuterClass.BattlePassUnlockStatus;
 import emu.grasscutter.server.packet.send.*;
+import lombok.Getter;
+import org.bson.types.ObjectId;
+
 import java.time.*;
 import java.time.temporal.TemporalAdjusters;
 import java.util.*;
-import lombok.Getter;
-import org.bson.types.ObjectId;
 
 @Entity(value = "battlepass", useDiscriminator = false)
 public class BattlePassManager extends BasePlayerDataManager {
diff --git a/src/main/java/emu/grasscutter/game/battlepass/BattlePassMission.java b/src/main/java/emu/grasscutter/game/battlepass/BattlePassMission.java
index f9cf7bf9a..afd895224 100644
--- a/src/main/java/emu/grasscutter/game/battlepass/BattlePassMission.java
+++ b/src/main/java/emu/grasscutter/game/battlepass/BattlePassMission.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.game.battlepass;
 
-import dev.morphia.annotations.Entity;
-import dev.morphia.annotations.Transient;
+import dev.morphia.annotations.*;
 import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.excels.BattlePassMissionData;
 import emu.grasscutter.game.props.BattlePassMissionStatus;
diff --git a/src/main/java/emu/grasscutter/game/battlepass/BattlePassReward.java b/src/main/java/emu/grasscutter/game/battlepass/BattlePassReward.java
index 8b73cf171..6433563d7 100644
--- a/src/main/java/emu/grasscutter/game/battlepass/BattlePassReward.java
+++ b/src/main/java/emu/grasscutter/game/battlepass/BattlePassReward.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.game.battlepass;
 
-import dev.morphia.annotations.Entity;
-import dev.morphia.annotations.Transient;
+import dev.morphia.annotations.*;
 import emu.grasscutter.data.excels.BattlePassMissionData;
 import emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag;
 import emu.grasscutter.net.proto.BattlePassUnlockStatusOuterClass.BattlePassUnlockStatus;
diff --git a/src/main/java/emu/grasscutter/game/battlepass/BattlePassSystem.java b/src/main/java/emu/grasscutter/game/battlepass/BattlePassSystem.java
index c5369731a..75b086bd9 100644
--- a/src/main/java/emu/grasscutter/game/battlepass/BattlePassSystem.java
+++ b/src/main/java/emu/grasscutter/game/battlepass/BattlePassSystem.java
@@ -3,16 +3,12 @@ package emu.grasscutter.game.battlepass;
 import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.excels.BattlePassMissionData;
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.game.props.BattlePassMissionStatus;
-import emu.grasscutter.game.props.WatcherTriggerType;
+import emu.grasscutter.game.props.*;
 import emu.grasscutter.server.event.player.PlayerFinishBattlePassMission;
-import emu.grasscutter.server.game.BaseGameSystem;
-import emu.grasscutter.server.game.GameServer;
+import emu.grasscutter.server.game.*;
 import emu.grasscutter.server.packet.send.PacketBattlePassMissionUpdateNotify;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+
+import java.util.*;
 
 public class BattlePassSystem extends BaseGameSystem {
     private final Map> cachedTriggers;
diff --git a/src/main/java/emu/grasscutter/game/chat/ChatSystem.java b/src/main/java/emu/grasscutter/game/chat/ChatSystem.java
index 07cdbe963..247c38001 100644
--- a/src/main/java/emu/grasscutter/game/chat/ChatSystem.java
+++ b/src/main/java/emu/grasscutter/game/chat/ChatSystem.java
@@ -1,24 +1,19 @@
 package emu.grasscutter.game.chat;
 
-import static emu.grasscutter.config.Configuration.GAME_INFO;
-
 import emu.grasscutter.GameConstants;
 import emu.grasscutter.command.CommandMap;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo;
 import emu.grasscutter.server.event.player.PlayerChatEvent;
 import emu.grasscutter.server.game.GameServer;
-import emu.grasscutter.server.packet.send.PacketPlayerChatNotify;
-import emu.grasscutter.server.packet.send.PacketPrivateChatNotify;
-import emu.grasscutter.server.packet.send.PacketPullPrivateChatRsp;
-import emu.grasscutter.server.packet.send.PacketPullRecentChatRsp;
+import emu.grasscutter.server.packet.send.*;
 import emu.grasscutter.utils.Utils;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+
+import java.util.*;
 import java.util.regex.Pattern;
 
+import static emu.grasscutter.config.Configuration.GAME_INFO;
+
 public class ChatSystem implements ChatSystemHandler {
     static final String PREFIXES = "[/!]";
     static final Pattern RE_PREFIXES = Pattern.compile(PREFIXES);
diff --git a/src/main/java/emu/grasscutter/game/city/CityInfoData.java b/src/main/java/emu/grasscutter/game/city/CityInfoData.java
index bc386bdec..5c8bde72f 100644
--- a/src/main/java/emu/grasscutter/game/city/CityInfoData.java
+++ b/src/main/java/emu/grasscutter/game/city/CityInfoData.java
@@ -2,8 +2,7 @@ package emu.grasscutter.game.city;
 
 import dev.morphia.annotations.Entity;
 import emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.*;
 
 @Entity
 public class CityInfoData {
diff --git a/src/main/java/emu/grasscutter/game/combine/CombineManger.java b/src/main/java/emu/grasscutter/game/combine/CombineManger.java
index 090c82024..1dbc30b6b 100644
--- a/src/main/java/emu/grasscutter/game/combine/CombineManger.java
+++ b/src/main/java/emu/grasscutter/game/combine/CombineManger.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.game.combine;
 
 import emu.grasscutter.Grasscutter;
-import emu.grasscutter.data.DataLoader;
-import emu.grasscutter.data.GameData;
+import emu.grasscutter.data.*;
 import emu.grasscutter.data.common.ItemParamData;
 import emu.grasscutter.data.excels.CombineData;
 import emu.grasscutter.game.inventory.GameItem;
@@ -10,16 +9,12 @@ import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.props.ActionReason;
 import emu.grasscutter.net.proto.RetcodeOuterClass;
 import emu.grasscutter.net.proto.RetcodeOuterClass.Retcode;
-import emu.grasscutter.server.game.BaseGameSystem;
-import emu.grasscutter.server.game.GameServer;
-import emu.grasscutter.server.packet.send.PacketCombineFormulaDataNotify;
-import emu.grasscutter.server.packet.send.PacketCombineRsp;
-import emu.grasscutter.server.packet.send.PacketReliquaryDecomposeRsp;
+import emu.grasscutter.server.game.*;
+import emu.grasscutter.server.packet.send.*;
 import emu.grasscutter.utils.Utils;
-import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
-import java.util.ArrayList;
-import java.util.List;
+import it.unimi.dsi.fastutil.ints.*;
+
+import java.util.*;
 
 public class CombineManger extends BaseGameSystem {
     private static final Int2ObjectMap> reliquaryDecomposeData =
diff --git a/src/main/java/emu/grasscutter/game/combine/CombineResult.java b/src/main/java/emu/grasscutter/game/combine/CombineResult.java
index df8ace74b..f71d25d2d 100644
--- a/src/main/java/emu/grasscutter/game/combine/CombineResult.java
+++ b/src/main/java/emu/grasscutter/game/combine/CombineResult.java
@@ -1,6 +1,7 @@
 package emu.grasscutter.game.combine;
 
 import emu.grasscutter.data.common.ItemParamData;
+
 import java.util.List;
 
 public class CombineResult {
diff --git a/src/main/java/emu/grasscutter/game/drop/DropSystem.java b/src/main/java/emu/grasscutter/game/drop/DropSystem.java
index 88baa66fb..8c2760945 100644
--- a/src/main/java/emu/grasscutter/game/drop/DropSystem.java
+++ b/src/main/java/emu/grasscutter/game/drop/DropSystem.java
@@ -1,23 +1,18 @@
 package emu.grasscutter.game.drop;
 
 import emu.grasscutter.Grasscutter;
-import emu.grasscutter.data.DataLoader;
-import emu.grasscutter.data.GameData;
+import emu.grasscutter.data.*;
 import emu.grasscutter.data.common.DropItemData;
-import emu.grasscutter.data.excels.DropMaterialData;
-import emu.grasscutter.data.excels.DropTableData;
-import emu.grasscutter.game.entity.EntityMonster;
-import emu.grasscutter.game.entity.GameEntity;
-import emu.grasscutter.game.inventory.GameItem;
-import emu.grasscutter.game.inventory.ItemType;
+import emu.grasscutter.data.excels.*;
+import emu.grasscutter.game.entity.*;
+import emu.grasscutter.game.inventory.*;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.props.ActionReason;
 import emu.grasscutter.scripts.data.SceneMonster;
-import emu.grasscutter.server.game.BaseGameSystem;
-import emu.grasscutter.server.game.GameServer;
-import emu.grasscutter.server.packet.send.PacketDropHintNotify;
-import emu.grasscutter.server.packet.send.PacketGadgetAutoPickDropInfoNotify;
+import emu.grasscutter.server.game.*;
+import emu.grasscutter.server.packet.send.*;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
+
 import java.util.*;
 
 public final class DropSystem extends BaseGameSystem {
diff --git a/src/main/java/emu/grasscutter/game/drop/DropSystemLegacy.java b/src/main/java/emu/grasscutter/game/drop/DropSystemLegacy.java
index af0e6a193..6e6985cf3 100644
--- a/src/main/java/emu/grasscutter/game/drop/DropSystemLegacy.java
+++ b/src/main/java/emu/grasscutter/game/drop/DropSystemLegacy.java
@@ -1,22 +1,17 @@
 package emu.grasscutter.game.drop;
 
 import emu.grasscutter.Grasscutter;
-import emu.grasscutter.data.DataLoader;
-import emu.grasscutter.data.GameData;
+import emu.grasscutter.data.*;
 import emu.grasscutter.data.excels.ItemData;
-import emu.grasscutter.game.entity.EntityItem;
-import emu.grasscutter.game.entity.EntityMonster;
-import emu.grasscutter.game.inventory.GameItem;
-import emu.grasscutter.game.inventory.ItemType;
+import emu.grasscutter.game.entity.*;
+import emu.grasscutter.game.inventory.*;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.props.ActionReason;
-import emu.grasscutter.game.world.Position;
-import emu.grasscutter.game.world.Scene;
-import emu.grasscutter.server.game.BaseGameSystem;
-import emu.grasscutter.server.game.GameServer;
+import emu.grasscutter.game.world.*;
+import emu.grasscutter.server.game.*;
 import emu.grasscutter.utils.Utils;
-import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
+import it.unimi.dsi.fastutil.ints.*;
+
 import java.util.List;
 
 @SuppressWarnings("deprecation")
diff --git a/src/main/java/emu/grasscutter/game/dungeons/DungeonManager.java b/src/main/java/emu/grasscutter/game/dungeons/DungeonManager.java
index 714ceb9b2..406b82d20 100644
--- a/src/main/java/emu/grasscutter/game/dungeons/DungeonManager.java
+++ b/src/main/java/emu/grasscutter/game/dungeons/DungeonManager.java
@@ -18,10 +18,11 @@ import emu.grasscutter.server.event.player.PlayerFinishDungeonEvent;
 import emu.grasscutter.server.packet.send.*;
 import emu.grasscutter.utils.Utils;
 import it.unimi.dsi.fastutil.ints.*;
+import lombok.*;
+
+import javax.annotation.Nullable;
 import java.util.*;
 import java.util.stream.*;
-import javax.annotation.Nullable;
-import lombok.*;
 
 /**
  * TODO handle time limits TODO handle respawn points TODO handle team wipes and respawns TODO check
diff --git a/src/main/java/emu/grasscutter/game/dungeons/DungeonTrialTeam.java b/src/main/java/emu/grasscutter/game/dungeons/DungeonTrialTeam.java
index fe6dfa7f9..ee590db0f 100644
--- a/src/main/java/emu/grasscutter/game/dungeons/DungeonTrialTeam.java
+++ b/src/main/java/emu/grasscutter/game/dungeons/DungeonTrialTeam.java
@@ -1,9 +1,9 @@
 package emu.grasscutter.game.dungeons;
 
 import emu.grasscutter.net.proto.TrialAvatarGrantRecordOuterClass.TrialAvatarGrantRecord;
+import lombok.*;
+
 import java.util.List;
-import lombok.AllArgsConstructor;
-import lombok.Data;
 
 @Data
 @AllArgsConstructor
diff --git a/src/main/java/emu/grasscutter/game/dungeons/DungeonValue.java b/src/main/java/emu/grasscutter/game/dungeons/DungeonValue.java
index f9f280fa8..b07510383 100644
--- a/src/main/java/emu/grasscutter/game/dungeons/DungeonValue.java
+++ b/src/main/java/emu/grasscutter/game/dungeons/DungeonValue.java
@@ -1,8 +1,8 @@
 package emu.grasscutter.game.dungeons;
 
 import emu.grasscutter.game.dungeons.enums.DungeonPassConditionType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
+
+import java.lang.annotation.*;
 
 @Retention(RetentionPolicy.RUNTIME)
 public @interface DungeonValue {
diff --git a/src/main/java/emu/grasscutter/game/dungeons/TowerDungeonSettleListener.java b/src/main/java/emu/grasscutter/game/dungeons/TowerDungeonSettleListener.java
index 7e544e471..ba8af7d9b 100644
--- a/src/main/java/emu/grasscutter/game/dungeons/TowerDungeonSettleListener.java
+++ b/src/main/java/emu/grasscutter/game/dungeons/TowerDungeonSettleListener.java
@@ -2,8 +2,7 @@ package emu.grasscutter.game.dungeons;
 
 import emu.grasscutter.game.dungeons.dungeon_results.BaseDungeonResult.DungeonEndReason;
 import emu.grasscutter.game.dungeons.dungeon_results.TowerResult;
-import emu.grasscutter.server.packet.send.PacketDungeonSettleNotify;
-import emu.grasscutter.server.packet.send.PacketTowerFloorRecordChangeNotify;
+import emu.grasscutter.server.packet.send.*;
 
 public class TowerDungeonSettleListener implements DungeonSettleListener {
 
diff --git a/src/main/java/emu/grasscutter/game/dungeons/challenge/DungeonChallenge.java b/src/main/java/emu/grasscutter/game/dungeons/challenge/DungeonChallenge.java
index a9582a813..86a27021b 100644
--- a/src/main/java/emu/grasscutter/game/dungeons/challenge/DungeonChallenge.java
+++ b/src/main/java/emu/grasscutter/game/dungeons/challenge/DungeonChallenge.java
@@ -1,7 +1,7 @@
 package emu.grasscutter.game.dungeons.challenge;
 
-import emu.grasscutter.game.dungeons.enums.DungeonPassConditionType;
 import emu.grasscutter.game.dungeons.challenge.trigger.ChallengeTrigger;
+import emu.grasscutter.game.dungeons.enums.DungeonPassConditionType;
 import emu.grasscutter.game.world.Scene;
 import emu.grasscutter.scripts.data.SceneGroup;
 
diff --git a/src/main/java/emu/grasscutter/game/dungeons/challenge/WorldChallenge.java b/src/main/java/emu/grasscutter/game/dungeons/challenge/WorldChallenge.java
index b755566e6..bb3ddf993 100644
--- a/src/main/java/emu/grasscutter/game/dungeons/challenge/WorldChallenge.java
+++ b/src/main/java/emu/grasscutter/game/dungeons/challenge/WorldChallenge.java
@@ -9,9 +9,10 @@ import emu.grasscutter.game.world.Scene;
 import emu.grasscutter.scripts.constants.EventType;
 import emu.grasscutter.scripts.data.*;
 import emu.grasscutter.server.packet.send.*;
+import lombok.*;
+
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
-import lombok.*;
 
 @Getter
 @Setter
diff --git a/src/main/java/emu/grasscutter/game/dungeons/challenge/factory/ChallengeFactory.java b/src/main/java/emu/grasscutter/game/dungeons/challenge/factory/ChallengeFactory.java
index 1047e7f14..9263fe589 100644
--- a/src/main/java/emu/grasscutter/game/dungeons/challenge/factory/ChallengeFactory.java
+++ b/src/main/java/emu/grasscutter/game/dungeons/challenge/factory/ChallengeFactory.java
@@ -4,10 +4,10 @@ import emu.grasscutter.data.GameData;
 import emu.grasscutter.game.dungeons.challenge.WorldChallenge;
 import emu.grasscutter.game.world.Scene;
 import emu.grasscutter.scripts.data.SceneGroup;
-import java.util.ArrayList;
-import java.util.List;
 import lombok.val;
 
+import java.util.*;
+
 public abstract class ChallengeFactory {
     private static final List challengeFactoryHandlers = new ArrayList<>();
 
diff --git a/src/main/java/emu/grasscutter/game/dungeons/challenge/factory/KillAndGuardChallengeFactoryHandler.java b/src/main/java/emu/grasscutter/game/dungeons/challenge/factory/KillAndGuardChallengeFactoryHandler.java
index 90765d8ef..0a15a1cf8 100644
--- a/src/main/java/emu/grasscutter/game/dungeons/challenge/factory/KillAndGuardChallengeFactoryHandler.java
+++ b/src/main/java/emu/grasscutter/game/dungeons/challenge/factory/KillAndGuardChallengeFactoryHandler.java
@@ -1,16 +1,16 @@
 package emu.grasscutter.game.dungeons.challenge.factory;
 
-import static emu.grasscutter.game.dungeons.challenge.enums.ChallengeType.CHALLENGE_KILL_COUNT_GUARD_HP;
-
 import emu.grasscutter.game.dungeons.challenge.WorldChallenge;
 import emu.grasscutter.game.dungeons.challenge.enums.ChallengeType;
-import emu.grasscutter.game.dungeons.challenge.trigger.GuardTrigger;
-import emu.grasscutter.game.dungeons.challenge.trigger.KillMonsterCountTrigger;
+import emu.grasscutter.game.dungeons.challenge.trigger.*;
 import emu.grasscutter.game.world.Scene;
 import emu.grasscutter.scripts.data.SceneGroup;
-import java.util.List;
 import lombok.val;
 
+import java.util.List;
+
+import static emu.grasscutter.game.dungeons.challenge.enums.ChallengeType.CHALLENGE_KILL_COUNT_GUARD_HP;
+
 public class KillAndGuardChallengeFactoryHandler implements ChallengeFactoryHandler {
     @Override
     public boolean isThisType(ChallengeType challengeType) {
diff --git a/src/main/java/emu/grasscutter/game/dungeons/challenge/factory/KillMonsterCountChallengeFactoryHandler.java b/src/main/java/emu/grasscutter/game/dungeons/challenge/factory/KillMonsterCountChallengeFactoryHandler.java
index 4756b440c..7167d408b 100644
--- a/src/main/java/emu/grasscutter/game/dungeons/challenge/factory/KillMonsterCountChallengeFactoryHandler.java
+++ b/src/main/java/emu/grasscutter/game/dungeons/challenge/factory/KillMonsterCountChallengeFactoryHandler.java
@@ -5,9 +5,10 @@ import emu.grasscutter.game.dungeons.challenge.enums.ChallengeType;
 import emu.grasscutter.game.dungeons.challenge.trigger.KillMonsterCountTrigger;
 import emu.grasscutter.game.world.Scene;
 import emu.grasscutter.scripts.data.SceneGroup;
-import java.util.List;
 import lombok.val;
 
+import java.util.List;
+
 public class KillMonsterCountChallengeFactoryHandler implements ChallengeFactoryHandler {
     @Override
     public boolean isThisType(ChallengeType challengeType) {
diff --git a/src/main/java/emu/grasscutter/game/dungeons/challenge/factory/KillMonsterCountInTimeIncChallengeFactoryHandler.java b/src/main/java/emu/grasscutter/game/dungeons/challenge/factory/KillMonsterCountInTimeIncChallengeFactoryHandler.java
index f76b614c8..358adb0bd 100644
--- a/src/main/java/emu/grasscutter/game/dungeons/challenge/factory/KillMonsterCountInTimeIncChallengeFactoryHandler.java
+++ b/src/main/java/emu/grasscutter/game/dungeons/challenge/factory/KillMonsterCountInTimeIncChallengeFactoryHandler.java
@@ -2,14 +2,13 @@ package emu.grasscutter.game.dungeons.challenge.factory;
 
 import emu.grasscutter.game.dungeons.challenge.WorldChallenge;
 import emu.grasscutter.game.dungeons.challenge.enums.ChallengeType;
-import emu.grasscutter.game.dungeons.challenge.trigger.InTimeTrigger;
-import emu.grasscutter.game.dungeons.challenge.trigger.KillMonsterCountTrigger;
-import emu.grasscutter.game.dungeons.challenge.trigger.KillMonsterTimeIncTrigger;
+import emu.grasscutter.game.dungeons.challenge.trigger.*;
 import emu.grasscutter.game.world.Scene;
 import emu.grasscutter.scripts.data.SceneGroup;
-import java.util.List;
 import lombok.val;
 
+import java.util.List;
+
 public class KillMonsterCountInTimeIncChallengeFactoryHandler implements ChallengeFactoryHandler {
     @Override
     public boolean isThisType(ChallengeType challengeType) {
diff --git a/src/main/java/emu/grasscutter/game/dungeons/challenge/factory/KillMonsterInTimeChallengeFactoryHandler.java b/src/main/java/emu/grasscutter/game/dungeons/challenge/factory/KillMonsterInTimeChallengeFactoryHandler.java
index f11692db5..d99dddb03 100644
--- a/src/main/java/emu/grasscutter/game/dungeons/challenge/factory/KillMonsterInTimeChallengeFactoryHandler.java
+++ b/src/main/java/emu/grasscutter/game/dungeons/challenge/factory/KillMonsterInTimeChallengeFactoryHandler.java
@@ -2,13 +2,13 @@ package emu.grasscutter.game.dungeons.challenge.factory;
 
 import emu.grasscutter.game.dungeons.challenge.WorldChallenge;
 import emu.grasscutter.game.dungeons.challenge.enums.ChallengeType;
-import emu.grasscutter.game.dungeons.challenge.trigger.InTimeTrigger;
-import emu.grasscutter.game.dungeons.challenge.trigger.KillMonsterTrigger;
+import emu.grasscutter.game.dungeons.challenge.trigger.*;
 import emu.grasscutter.game.world.Scene;
 import emu.grasscutter.scripts.data.SceneGroup;
-import java.util.List;
 import lombok.val;
 
+import java.util.List;
+
 public class KillMonsterInTimeChallengeFactoryHandler implements ChallengeFactoryHandler {
     @Override
     public boolean isThisType(ChallengeType challengeType) {
diff --git a/src/main/java/emu/grasscutter/game/dungeons/challenge/factory/KillMonsterTimeChallengeFactoryHandler.java b/src/main/java/emu/grasscutter/game/dungeons/challenge/factory/KillMonsterTimeChallengeFactoryHandler.java
index 2634932a6..88960ffe9 100644
--- a/src/main/java/emu/grasscutter/game/dungeons/challenge/factory/KillMonsterTimeChallengeFactoryHandler.java
+++ b/src/main/java/emu/grasscutter/game/dungeons/challenge/factory/KillMonsterTimeChallengeFactoryHandler.java
@@ -2,13 +2,13 @@ package emu.grasscutter.game.dungeons.challenge.factory;
 
 import emu.grasscutter.game.dungeons.challenge.WorldChallenge;
 import emu.grasscutter.game.dungeons.challenge.enums.ChallengeType;
-import emu.grasscutter.game.dungeons.challenge.trigger.InTimeTrigger;
-import emu.grasscutter.game.dungeons.challenge.trigger.KillMonsterCountTrigger;
+import emu.grasscutter.game.dungeons.challenge.trigger.*;
 import emu.grasscutter.game.world.Scene;
 import emu.grasscutter.scripts.data.SceneGroup;
-import java.util.List;
 import lombok.val;
 
+import java.util.List;
+
 public class KillMonsterTimeChallengeFactoryHandler implements ChallengeFactoryHandler {
     @Override
     public boolean isThisType(ChallengeType challengeType) {
diff --git a/src/main/java/emu/grasscutter/game/dungeons/challenge/factory/SurviveChallengeFactoryHandler.java b/src/main/java/emu/grasscutter/game/dungeons/challenge/factory/SurviveChallengeFactoryHandler.java
index ddf4596a7..1995f134e 100644
--- a/src/main/java/emu/grasscutter/game/dungeons/challenge/factory/SurviveChallengeFactoryHandler.java
+++ b/src/main/java/emu/grasscutter/game/dungeons/challenge/factory/SurviveChallengeFactoryHandler.java
@@ -1,14 +1,15 @@
 package emu.grasscutter.game.dungeons.challenge.factory;
 
-import static emu.grasscutter.game.dungeons.challenge.enums.ChallengeType.CHALLENGE_SURVIVE;
-
 import emu.grasscutter.game.dungeons.challenge.WorldChallenge;
 import emu.grasscutter.game.dungeons.challenge.enums.ChallengeType;
 import emu.grasscutter.game.dungeons.challenge.trigger.ForTimeTrigger;
 import emu.grasscutter.game.world.Scene;
 import emu.grasscutter.scripts.data.SceneGroup;
+
 import java.util.List;
 
+import static emu.grasscutter.game.dungeons.challenge.enums.ChallengeType.CHALLENGE_SURVIVE;
+
 public class SurviveChallengeFactoryHandler implements ChallengeFactoryHandler {
     @Override
     public boolean isThisType(ChallengeType challengeType) {
diff --git a/src/main/java/emu/grasscutter/game/dungeons/challenge/factory/TriggerInTimeChallengeFactoryHandler.java b/src/main/java/emu/grasscutter/game/dungeons/challenge/factory/TriggerInTimeChallengeFactoryHandler.java
index 71fc6872e..8269a7e53 100644
--- a/src/main/java/emu/grasscutter/game/dungeons/challenge/factory/TriggerInTimeChallengeFactoryHandler.java
+++ b/src/main/java/emu/grasscutter/game/dungeons/challenge/factory/TriggerInTimeChallengeFactoryHandler.java
@@ -1,15 +1,15 @@
 package emu.grasscutter.game.dungeons.challenge.factory;
 
-import static emu.grasscutter.game.dungeons.challenge.enums.ChallengeType.CHALLENGE_TRIGGER_IN_TIME;
-
 import emu.grasscutter.game.dungeons.challenge.WorldChallenge;
 import emu.grasscutter.game.dungeons.challenge.enums.ChallengeType;
-import emu.grasscutter.game.dungeons.challenge.trigger.InTimeTrigger;
-import emu.grasscutter.game.dungeons.challenge.trigger.TriggerGroupTriggerTrigger;
+import emu.grasscutter.game.dungeons.challenge.trigger.*;
 import emu.grasscutter.game.world.Scene;
 import emu.grasscutter.scripts.data.SceneGroup;
+
 import java.util.List;
 
+import static emu.grasscutter.game.dungeons.challenge.enums.ChallengeType.CHALLENGE_TRIGGER_IN_TIME;
+
 public class TriggerInTimeChallengeFactoryHandler implements ChallengeFactoryHandler {
     @Override
     public boolean isThisType(ChallengeType challengeType) {
diff --git a/src/main/java/emu/grasscutter/game/dungeons/challenge/trigger/ChallengeTrigger.java b/src/main/java/emu/grasscutter/game/dungeons/challenge/trigger/ChallengeTrigger.java
index 2248cb02c..455f57dd6 100644
--- a/src/main/java/emu/grasscutter/game/dungeons/challenge/trigger/ChallengeTrigger.java
+++ b/src/main/java/emu/grasscutter/game/dungeons/challenge/trigger/ChallengeTrigger.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.game.dungeons.challenge.trigger;
 
 import emu.grasscutter.game.dungeons.challenge.WorldChallenge;
-import emu.grasscutter.game.entity.EntityGadget;
-import emu.grasscutter.game.entity.EntityMonster;
+import emu.grasscutter.game.entity.*;
 import emu.grasscutter.scripts.data.SceneTrigger;
 
 public abstract class ChallengeTrigger {
diff --git a/src/main/java/emu/grasscutter/game/dungeons/dungeon_results/TowerResult.java b/src/main/java/emu/grasscutter/game/dungeons/dungeon_results/TowerResult.java
index 2600f743d..2e742efca 100644
--- a/src/main/java/emu/grasscutter/game/dungeons/dungeon_results/TowerResult.java
+++ b/src/main/java/emu/grasscutter/game/dungeons/dungeon_results/TowerResult.java
@@ -4,8 +4,7 @@ import emu.grasscutter.data.excels.dungeon.DungeonData;
 import emu.grasscutter.game.dungeons.DungeonEndStats;
 import emu.grasscutter.game.dungeons.challenge.WorldChallenge;
 import emu.grasscutter.game.tower.TowerManager;
-import emu.grasscutter.net.proto.DungeonSettleNotifyOuterClass;
-import emu.grasscutter.net.proto.ItemParamOuterClass;
+import emu.grasscutter.net.proto.*;
 import emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify;
 import emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify.ContinueStateType;
 
diff --git a/src/main/java/emu/grasscutter/game/entity/EntityBaseGadget.java b/src/main/java/emu/grasscutter/game/entity/EntityBaseGadget.java
index 8f80cef44..050fe4d4c 100644
--- a/src/main/java/emu/grasscutter/game/entity/EntityBaseGadget.java
+++ b/src/main/java/emu/grasscutter/game/entity/EntityBaseGadget.java
@@ -1,16 +1,15 @@
 package emu.grasscutter.game.entity;
 
-import static emu.grasscutter.scripts.constants.EventType.EVENT_SPECIFIC_GADGET_HP_CHANGE;
-
 import emu.grasscutter.data.binout.config.ConfigEntityGadget;
 import emu.grasscutter.game.props.FightProperty;
 import emu.grasscutter.game.quest.enums.QuestContent;
-import emu.grasscutter.game.world.Position;
-import emu.grasscutter.game.world.Scene;
+import emu.grasscutter.game.world.*;
 import emu.grasscutter.scripts.data.ScriptArgs;
 import emu.grasscutter.server.event.entity.EntityDamageEvent;
 import lombok.Getter;
 
+import static emu.grasscutter.scripts.constants.EventType.EVENT_SPECIFIC_GADGET_HP_CHANGE;
+
 public abstract class EntityBaseGadget extends GameEntity {
     @Getter(onMethod_ = @Override)
     protected final Position position;
diff --git a/src/main/java/emu/grasscutter/game/entity/EntityClientGadget.java b/src/main/java/emu/grasscutter/game/entity/EntityClientGadget.java
index 0d20bcfca..8296c09c9 100644
--- a/src/main/java/emu/grasscutter/game/entity/EntityClientGadget.java
+++ b/src/main/java/emu/grasscutter/game/entity/EntityClientGadget.java
@@ -6,8 +6,7 @@ import emu.grasscutter.data.binout.config.fields.ConfigAbilityData;
 import emu.grasscutter.data.excels.GadgetData;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.props.PlayerProperty;
-import emu.grasscutter.game.world.Position;
-import emu.grasscutter.game.world.Scene;
+import emu.grasscutter.game.world.*;
 import emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo;
 import emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPair;
 import emu.grasscutter.net.proto.ClientGadgetInfoOuterClass;
diff --git a/src/main/java/emu/grasscutter/game/entity/EntityGadget.java b/src/main/java/emu/grasscutter/game/entity/EntityGadget.java
index 55d0fd3ff..3a54d7488 100644
--- a/src/main/java/emu/grasscutter/game/entity/EntityGadget.java
+++ b/src/main/java/emu/grasscutter/game/entity/EntityGadget.java
@@ -6,12 +6,10 @@ import emu.grasscutter.data.binout.config.ConfigEntityGadget;
 import emu.grasscutter.data.binout.config.fields.ConfigAbilityData;
 import emu.grasscutter.data.excels.GadgetData;
 import emu.grasscutter.game.entity.gadget.*;
-import emu.grasscutter.game.entity.gadget.platform.BaseRoute;
-import emu.grasscutter.game.entity.gadget.platform.ConfigRoute;
+import emu.grasscutter.game.entity.gadget.platform.*;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.props.*;
 import emu.grasscutter.game.world.*;
-import emu.grasscutter.net.proto.*;
 import emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo;
 import emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPair;
 import emu.grasscutter.net.proto.EntityAuthorityInfoOuterClass.EntityAuthorityInfo;
@@ -19,6 +17,7 @@ import emu.grasscutter.net.proto.EntityClientDataOuterClass.EntityClientData;
 import emu.grasscutter.net.proto.EntityRendererChangedInfoOuterClass.EntityRendererChangedInfo;
 import emu.grasscutter.net.proto.GadgetInteractReqOuterClass.GadgetInteractReq;
 import emu.grasscutter.net.proto.MotionInfoOuterClass.MotionInfo;
+import emu.grasscutter.net.proto.*;
 import emu.grasscutter.net.proto.PropPairOuterClass.PropPair;
 import emu.grasscutter.net.proto.ProtEntityTypeOuterClass.ProtEntityType;
 import emu.grasscutter.net.proto.SceneEntityAiInfoOuterClass.SceneEntityAiInfo;
@@ -31,10 +30,11 @@ import emu.grasscutter.scripts.data.*;
 import emu.grasscutter.server.packet.send.*;
 import emu.grasscutter.utils.helpers.ProtoHelper;
 import it.unimi.dsi.fastutil.ints.*;
-import java.util.*;
-import javax.annotation.Nullable;
 import lombok.*;
 
+import javax.annotation.Nullable;
+import java.util.*;
+
 @ToString(callSuper = true)
 public class EntityGadget extends EntityBaseGadget {
     @Getter private final GadgetData gadgetData;
diff --git a/src/main/java/emu/grasscutter/game/entity/EntityNPC.java b/src/main/java/emu/grasscutter/game/entity/EntityNPC.java
index 49e708d8a..ee75d8b01 100644
--- a/src/main/java/emu/grasscutter/game/entity/EntityNPC.java
+++ b/src/main/java/emu/grasscutter/game/entity/EntityNPC.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.game.entity;
 
 import emu.grasscutter.game.props.EntityIdType;
-import emu.grasscutter.game.world.Position;
-import emu.grasscutter.game.world.Scene;
+import emu.grasscutter.game.world.*;
 import emu.grasscutter.net.proto.*;
 import emu.grasscutter.scripts.data.SceneNPC;
 import it.unimi.dsi.fastutil.ints.Int2FloatMap;
diff --git a/src/main/java/emu/grasscutter/game/entity/EntityRegion.java b/src/main/java/emu/grasscutter/game/entity/EntityRegion.java
index fd424f25c..84d0b4220 100644
--- a/src/main/java/emu/grasscutter/game/entity/EntityRegion.java
+++ b/src/main/java/emu/grasscutter/game/entity/EntityRegion.java
@@ -1,14 +1,14 @@
 package emu.grasscutter.game.entity;
 
 import emu.grasscutter.game.props.EntityIdType;
-import emu.grasscutter.game.world.Position;
-import emu.grasscutter.game.world.Scene;
+import emu.grasscutter.game.world.*;
 import emu.grasscutter.net.proto.SceneEntityInfoOuterClass;
 import emu.grasscutter.scripts.data.SceneRegion;
 import it.unimi.dsi.fastutil.ints.Int2FloatMap;
+import lombok.Getter;
+
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
-import lombok.Getter;
 
 @Getter
 public class EntityRegion extends GameEntity {
diff --git a/src/main/java/emu/grasscutter/game/entity/EntityScene.java b/src/main/java/emu/grasscutter/game/entity/EntityScene.java
index 59f768e6b..edd745272 100644
--- a/src/main/java/emu/grasscutter/game/entity/EntityScene.java
+++ b/src/main/java/emu/grasscutter/game/entity/EntityScene.java
@@ -2,11 +2,9 @@ package emu.grasscutter.game.entity;
 
 import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.binout.AbilityData;
-import emu.grasscutter.game.world.Position;
-import emu.grasscutter.game.world.Scene;
+import emu.grasscutter.game.world.*;
 import emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo;
-import it.unimi.dsi.fastutil.ints.Int2FloatArrayMap;
-import it.unimi.dsi.fastutil.ints.Int2FloatMap;
+import it.unimi.dsi.fastutil.ints.*;
 
 public class EntityScene extends GameEntity {
 
diff --git a/src/main/java/emu/grasscutter/game/entity/EntityTeam.java b/src/main/java/emu/grasscutter/game/entity/EntityTeam.java
index d6116752b..949b003ab 100644
--- a/src/main/java/emu/grasscutter/game/entity/EntityTeam.java
+++ b/src/main/java/emu/grasscutter/game/entity/EntityTeam.java
@@ -4,11 +4,9 @@ import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.binout.AbilityData;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.props.EntityIdType;
-import emu.grasscutter.game.world.Position;
-import emu.grasscutter.game.world.World;
+import emu.grasscutter.game.world.*;
 import emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo;
-import it.unimi.dsi.fastutil.ints.Int2FloatArrayMap;
-import it.unimi.dsi.fastutil.ints.Int2FloatMap;
+import it.unimi.dsi.fastutil.ints.*;
 
 public class EntityTeam extends GameEntity {
 
diff --git a/src/main/java/emu/grasscutter/game/entity/EntityVehicle.java b/src/main/java/emu/grasscutter/game/entity/EntityVehicle.java
index 6e379ab96..b320474ef 100644
--- a/src/main/java/emu/grasscutter/game/entity/EntityVehicle.java
+++ b/src/main/java/emu/grasscutter/game/entity/EntityVehicle.java
@@ -4,11 +4,8 @@ import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.binout.config.ConfigEntityGadget;
 import emu.grasscutter.data.excels.GadgetData;
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.game.props.EntityIdType;
-import emu.grasscutter.game.props.FightProperty;
-import emu.grasscutter.game.props.PlayerProperty;
-import emu.grasscutter.game.world.Position;
-import emu.grasscutter.game.world.Scene;
+import emu.grasscutter.game.props.*;
+import emu.grasscutter.game.world.*;
 import emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo;
 import emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPair;
 import emu.grasscutter.net.proto.EntityAuthorityInfoOuterClass.EntityAuthorityInfo;
@@ -23,13 +20,11 @@ import emu.grasscutter.net.proto.VectorOuterClass.Vector;
 import emu.grasscutter.net.proto.VehicleInfoOuterClass.VehicleInfo;
 import emu.grasscutter.net.proto.VehicleMemberOuterClass.VehicleMember;
 import emu.grasscutter.utils.helpers.ProtoHelper;
-import it.unimi.dsi.fastutil.ints.Int2FloatMap;
-import it.unimi.dsi.fastutil.ints.Int2FloatOpenHashMap;
-import java.util.ArrayList;
-import java.util.List;
+import it.unimi.dsi.fastutil.ints.*;
+import lombok.*;
+
 import javax.annotation.Nullable;
-import lombok.Getter;
-import lombok.Setter;
+import java.util.*;
 
 public class EntityVehicle extends EntityBaseGadget {
 
diff --git a/src/main/java/emu/grasscutter/game/entity/EntityWeapon.java b/src/main/java/emu/grasscutter/game/entity/EntityWeapon.java
index 4816603db..f8f4cf42a 100644
--- a/src/main/java/emu/grasscutter/game/entity/EntityWeapon.java
+++ b/src/main/java/emu/grasscutter/game/entity/EntityWeapon.java
@@ -10,9 +10,10 @@ import emu.grasscutter.game.world.*;
 import emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo;
 import emu.grasscutter.scripts.EntityControllerScriptManager;
 import it.unimi.dsi.fastutil.ints.*;
-import javax.annotation.Nullable;
 import lombok.*;
 
+import javax.annotation.Nullable;
+
 @ToString(callSuper = true)
 public class EntityWeapon extends EntityBaseGadget {
     @Getter private final GadgetData gadgetData;
diff --git a/src/main/java/emu/grasscutter/game/entity/EntityWorld.java b/src/main/java/emu/grasscutter/game/entity/EntityWorld.java
index 70dc36cf8..50692cd72 100644
--- a/src/main/java/emu/grasscutter/game/entity/EntityWorld.java
+++ b/src/main/java/emu/grasscutter/game/entity/EntityWorld.java
@@ -2,12 +2,9 @@ package emu.grasscutter.game.entity;
 
 import emu.grasscutter.data.GameData;
 import emu.grasscutter.game.props.EntityIdType;
-import emu.grasscutter.game.world.Position;
-import emu.grasscutter.game.world.Scene;
-import emu.grasscutter.game.world.World;
+import emu.grasscutter.game.world.*;
 import emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo;
-import it.unimi.dsi.fastutil.ints.Int2FloatArrayMap;
-import it.unimi.dsi.fastutil.ints.Int2FloatMap;
+import it.unimi.dsi.fastutil.ints.*;
 import lombok.Getter;
 
 public class EntityWorld extends GameEntity {
diff --git a/src/main/java/emu/grasscutter/game/entity/GameEntity.java b/src/main/java/emu/grasscutter/game/entity/GameEntity.java
index 3574825af..1b0854f25 100644
--- a/src/main/java/emu/grasscutter/game/entity/GameEntity.java
+++ b/src/main/java/emu/grasscutter/game/entity/GameEntity.java
@@ -15,9 +15,10 @@ import emu.grasscutter.scripts.data.controller.EntityController;
 import emu.grasscutter.server.event.entity.*;
 import emu.grasscutter.server.packet.send.PacketEntityFightPropUpdateNotify;
 import it.unimi.dsi.fastutil.ints.*;
-import java.util.*;
 import lombok.*;
 
+import java.util.*;
+
 public abstract class GameEntity {
     @Getter private final Scene scene;
     @Getter protected int id;
diff --git a/src/main/java/emu/grasscutter/game/entity/gadget/GadgetAbility.java b/src/main/java/emu/grasscutter/game/entity/gadget/GadgetAbility.java
index afb3aa27c..3fc91e587 100644
--- a/src/main/java/emu/grasscutter/game/entity/gadget/GadgetAbility.java
+++ b/src/main/java/emu/grasscutter/game/entity/gadget/GadgetAbility.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.game.entity.gadget;
 
-import emu.grasscutter.game.entity.EntityBaseGadget;
-import emu.grasscutter.game.entity.EntityGadget;
+import emu.grasscutter.game.entity.*;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.net.proto.AbilityGadgetInfoOuterClass;
 import emu.grasscutter.net.proto.GadgetInteractReqOuterClass.GadgetInteractReq;
diff --git a/src/main/java/emu/grasscutter/game/entity/gadget/GadgetChest.java b/src/main/java/emu/grasscutter/game/entity/gadget/GadgetChest.java
index 9250633cd..70d4c9746 100644
--- a/src/main/java/emu/grasscutter/game/entity/gadget/GadgetChest.java
+++ b/src/main/java/emu/grasscutter/game/entity/gadget/GadgetChest.java
@@ -9,14 +9,12 @@ import emu.grasscutter.game.props.WatcherTriggerType;
 import emu.grasscutter.net.proto.BossChestInfoOuterClass.BossChestInfo;
 import emu.grasscutter.net.proto.GadgetInteractReqOuterClass.GadgetInteractReq;
 import emu.grasscutter.net.proto.InterOpTypeOuterClass.InterOpType;
-import emu.grasscutter.net.proto.InteractTypeOuterClass;
+import emu.grasscutter.net.proto.*;
 import emu.grasscutter.net.proto.InteractTypeOuterClass.InteractType;
-import emu.grasscutter.net.proto.ResinCostTypeOuterClass;
 import emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfo;
 import emu.grasscutter.scripts.constants.ScriptGadgetState;
 import emu.grasscutter.scripts.data.SceneGadget;
-import emu.grasscutter.server.packet.send.PacketGadgetInteractRsp;
-import emu.grasscutter.server.packet.send.PacketWorldChestOpenNotify;
+import emu.grasscutter.server.packet.send.*;
 
 public class GadgetChest extends GadgetContent {
 
diff --git a/src/main/java/emu/grasscutter/game/entity/gadget/GadgetGatherObject.java b/src/main/java/emu/grasscutter/game/entity/gadget/GadgetGatherObject.java
index 23bf615d9..03aab7d27 100644
--- a/src/main/java/emu/grasscutter/game/entity/gadget/GadgetGatherObject.java
+++ b/src/main/java/emu/grasscutter/game/entity/gadget/GadgetGatherObject.java
@@ -2,10 +2,8 @@ package emu.grasscutter.game.entity.gadget;
 
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.data.GameData;
-import emu.grasscutter.data.excels.GatherData;
-import emu.grasscutter.data.excels.ItemData;
-import emu.grasscutter.game.entity.EntityGadget;
-import emu.grasscutter.game.entity.EntityItem;
+import emu.grasscutter.data.excels.*;
+import emu.grasscutter.game.entity.*;
 import emu.grasscutter.game.inventory.GameItem;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.props.ActionReason;
diff --git a/src/main/java/emu/grasscutter/game/entity/gadget/GadgetObject.java b/src/main/java/emu/grasscutter/game/entity/gadget/GadgetObject.java
index 15d07dce6..1af4aa83d 100644
--- a/src/main/java/emu/grasscutter/game/entity/gadget/GadgetObject.java
+++ b/src/main/java/emu/grasscutter/game/entity/gadget/GadgetObject.java
@@ -1,15 +1,12 @@
 package emu.grasscutter.game.entity.gadget;
 
 import emu.grasscutter.data.GameData;
-import emu.grasscutter.data.excels.GatherData;
-import emu.grasscutter.data.excels.ItemData;
+import emu.grasscutter.data.excels.*;
 import emu.grasscutter.game.entity.EntityGadget;
 import emu.grasscutter.game.inventory.GameItem;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.props.ActionReason;
-import emu.grasscutter.net.proto.GadgetInteractReqOuterClass;
-import emu.grasscutter.net.proto.InteractTypeOuterClass;
-import emu.grasscutter.net.proto.SceneGadgetInfoOuterClass;
+import emu.grasscutter.net.proto.*;
 import emu.grasscutter.scripts.constants.EventType;
 import emu.grasscutter.scripts.data.ScriptArgs;
 import emu.grasscutter.server.packet.send.PacketGadgetInteractRsp;
diff --git a/src/main/java/emu/grasscutter/game/entity/gadget/GadgetWorktop.java b/src/main/java/emu/grasscutter/game/entity/gadget/GadgetWorktop.java
index f0614bf0c..0a5a4dcb0 100644
--- a/src/main/java/emu/grasscutter/game/entity/gadget/GadgetWorktop.java
+++ b/src/main/java/emu/grasscutter/game/entity/gadget/GadgetWorktop.java
@@ -9,10 +9,8 @@ import emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfo;
 import emu.grasscutter.net.proto.SelectWorktopOptionReqOuterClass.SelectWorktopOptionReq;
 import emu.grasscutter.net.proto.WorktopInfoOuterClass.WorktopInfo;
 import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
+
+import java.util.*;
 
 public final class GadgetWorktop extends GadgetContent {
     private Set worktopOptions;
diff --git a/src/main/java/emu/grasscutter/game/entity/gadget/chest/BossChestInteractHandler.java b/src/main/java/emu/grasscutter/game/entity/gadget/chest/BossChestInteractHandler.java
index 587e2bf92..a332b06c0 100644
--- a/src/main/java/emu/grasscutter/game/entity/gadget/chest/BossChestInteractHandler.java
+++ b/src/main/java/emu/grasscutter/game/entity/gadget/chest/BossChestInteractHandler.java
@@ -7,8 +7,8 @@ import emu.grasscutter.game.inventory.GameItem;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.props.ActionReason;
 import emu.grasscutter.server.packet.send.PacketGadgetAutoPickDropInfoNotify;
-import java.util.ArrayList;
-import java.util.List;
+
+import java.util.*;
 
 public class BossChestInteractHandler implements ChestInteractHandler {
     @Override
diff --git a/src/main/java/emu/grasscutter/game/entity/gadget/chest/NormalChestInteractHandler.java b/src/main/java/emu/grasscutter/game/entity/gadget/chest/NormalChestInteractHandler.java
index ef4599efb..b668b485c 100644
--- a/src/main/java/emu/grasscutter/game/entity/gadget/chest/NormalChestInteractHandler.java
+++ b/src/main/java/emu/grasscutter/game/entity/gadget/chest/NormalChestInteractHandler.java
@@ -4,6 +4,7 @@ import emu.grasscutter.game.entity.gadget.GadgetChest;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.world.ChestReward;
 import emu.grasscutter.server.event.player.PlayerOpenChestEvent;
+
 import java.util.Random;
 
 public class NormalChestInteractHandler implements ChestInteractHandler {
diff --git a/src/main/java/emu/grasscutter/game/entity/gadget/platform/AbilityRoute.java b/src/main/java/emu/grasscutter/game/entity/gadget/platform/AbilityRoute.java
index 436fddb19..a9235a8c9 100644
--- a/src/main/java/emu/grasscutter/game/entity/gadget/platform/AbilityRoute.java
+++ b/src/main/java/emu/grasscutter/game/entity/gadget/platform/AbilityRoute.java
@@ -2,8 +2,7 @@ package emu.grasscutter.game.entity.gadget.platform;
 
 import emu.grasscutter.game.world.Position;
 import emu.grasscutter.net.proto.MathQuaternionOuterClass.MathQuaternion;
-import emu.grasscutter.net.proto.MovingPlatformTypeOuterClass;
-import emu.grasscutter.net.proto.PlatformInfoOuterClass;
+import emu.grasscutter.net.proto.*;
 
 /** TODO mostly hardcoded for EntitySolarIsotomaElevatorPlatform, should be more generic */
 public class AbilityRoute extends BaseRoute {
diff --git a/src/main/java/emu/grasscutter/game/entity/gadget/platform/BaseRoute.java b/src/main/java/emu/grasscutter/game/entity/gadget/platform/BaseRoute.java
index d3b27e71a..0575e2ad9 100644
--- a/src/main/java/emu/grasscutter/game/entity/gadget/platform/BaseRoute.java
+++ b/src/main/java/emu/grasscutter/game/entity/gadget/platform/BaseRoute.java
@@ -1,13 +1,10 @@
 package emu.grasscutter.game.entity.gadget.platform;
 
-import emu.grasscutter.game.world.Position;
-import emu.grasscutter.game.world.Scene;
+import emu.grasscutter.game.world.*;
 import emu.grasscutter.net.proto.MathQuaternionOuterClass.MathQuaternion;
 import emu.grasscutter.net.proto.PlatformInfoOuterClass.PlatformInfo;
 import emu.grasscutter.scripts.data.SceneGadget;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.val;
+import lombok.*;
 
 public abstract class BaseRoute {
     @Getter @Setter private boolean isStarted;
diff --git a/src/main/java/emu/grasscutter/game/entity/gadget/platform/ConfigRoute.java b/src/main/java/emu/grasscutter/game/entity/gadget/platform/ConfigRoute.java
index 9abf58f17..47bc2fc0f 100644
--- a/src/main/java/emu/grasscutter/game/entity/gadget/platform/ConfigRoute.java
+++ b/src/main/java/emu/grasscutter/game/entity/gadget/platform/ConfigRoute.java
@@ -1,13 +1,11 @@
 package emu.grasscutter.game.entity.gadget.platform;
 
 import emu.grasscutter.game.world.Position;
-import emu.grasscutter.net.proto.MovingPlatformTypeOuterClass;
-import emu.grasscutter.net.proto.PlatformInfoOuterClass;
+import emu.grasscutter.net.proto.*;
 import emu.grasscutter.scripts.data.SceneGadget;
-import java.util.ArrayList;
-import java.util.List;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.*;
+
+import java.util.*;
 
 public class ConfigRoute extends BaseRoute {
 
diff --git a/src/main/java/emu/grasscutter/game/entity/gadget/platform/PointArrayRoute.java b/src/main/java/emu/grasscutter/game/entity/gadget/platform/PointArrayRoute.java
index 0642372d5..cd0c67efe 100644
--- a/src/main/java/emu/grasscutter/game/entity/gadget/platform/PointArrayRoute.java
+++ b/src/main/java/emu/grasscutter/game/entity/gadget/platform/PointArrayRoute.java
@@ -1,11 +1,9 @@
 package emu.grasscutter.game.entity.gadget.platform;
 
 import emu.grasscutter.game.world.Position;
-import emu.grasscutter.net.proto.MovingPlatformTypeOuterClass;
-import emu.grasscutter.net.proto.PlatformInfoOuterClass;
+import emu.grasscutter.net.proto.*;
 import emu.grasscutter.scripts.data.SceneGadget;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.*;
 
 /** TODO implement point array routes, read from missing resources */
 public class PointArrayRoute extends BaseRoute {
diff --git a/src/main/java/emu/grasscutter/game/entity/platform/EntitySolarIsotomaElevatorPlatform.java b/src/main/java/emu/grasscutter/game/entity/platform/EntitySolarIsotomaElevatorPlatform.java
index bf0113c7d..97d8d84da 100644
--- a/src/main/java/emu/grasscutter/game/entity/platform/EntitySolarIsotomaElevatorPlatform.java
+++ b/src/main/java/emu/grasscutter/game/entity/platform/EntitySolarIsotomaElevatorPlatform.java
@@ -5,8 +5,7 @@ import emu.grasscutter.data.binout.config.ConfigEntityGadget;
 import emu.grasscutter.game.entity.*;
 import emu.grasscutter.game.entity.gadget.GadgetAbility;
 import emu.grasscutter.game.entity.gadget.platform.AbilityRoute;
-import emu.grasscutter.game.world.Position;
-import emu.grasscutter.game.world.Scene;
+import emu.grasscutter.game.world.*;
 
 public class EntitySolarIsotomaElevatorPlatform extends EntityGadget {
     @SuppressWarnings("removal")
diff --git a/src/main/java/emu/grasscutter/game/expedition/ExpeditionInfo.java b/src/main/java/emu/grasscutter/game/expedition/ExpeditionInfo.java
index 8f791f964..07ed568ec 100644
--- a/src/main/java/emu/grasscutter/game/expedition/ExpeditionInfo.java
+++ b/src/main/java/emu/grasscutter/game/expedition/ExpeditionInfo.java
@@ -2,8 +2,7 @@ package emu.grasscutter.game.expedition;
 
 import dev.morphia.annotations.Entity;
 import emu.grasscutter.net.proto.AvatarExpeditionInfoOuterClass.AvatarExpeditionInfo;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.*;
 
 @Entity
 @Getter
diff --git a/src/main/java/emu/grasscutter/game/expedition/ExpeditionRewardDataList.java b/src/main/java/emu/grasscutter/game/expedition/ExpeditionRewardDataList.java
index 98fb97f47..6d0bfa51a 100644
--- a/src/main/java/emu/grasscutter/game/expedition/ExpeditionRewardDataList.java
+++ b/src/main/java/emu/grasscutter/game/expedition/ExpeditionRewardDataList.java
@@ -1,10 +1,10 @@
 package emu.grasscutter.game.expedition;
 
 import emu.grasscutter.game.inventory.GameItem;
-import java.util.ArrayList;
-import java.util.List;
 import lombok.Getter;
 
+import java.util.*;
+
 public class ExpeditionRewardDataList {
     @Getter private int hourTime;
     @Getter private List expeditionRewardData;
diff --git a/src/main/java/emu/grasscutter/game/expedition/ExpeditionRewardInfo.java b/src/main/java/emu/grasscutter/game/expedition/ExpeditionRewardInfo.java
index b39475b83..6aa6a85d1 100644
--- a/src/main/java/emu/grasscutter/game/expedition/ExpeditionRewardInfo.java
+++ b/src/main/java/emu/grasscutter/game/expedition/ExpeditionRewardInfo.java
@@ -1,8 +1,9 @@
 package emu.grasscutter.game.expedition;
 
-import java.util.List;
 import lombok.Getter;
 
+import java.util.List;
+
 public class ExpeditionRewardInfo {
     @Getter private int expId;
     @Getter private List expeditionRewardDataList;
diff --git a/src/main/java/emu/grasscutter/game/expedition/ExpeditionSystem.java b/src/main/java/emu/grasscutter/game/expedition/ExpeditionSystem.java
index 4e33d36a2..2285276c7 100644
--- a/src/main/java/emu/grasscutter/game/expedition/ExpeditionSystem.java
+++ b/src/main/java/emu/grasscutter/game/expedition/ExpeditionSystem.java
@@ -2,10 +2,9 @@ package emu.grasscutter.game.expedition;
 
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.data.DataLoader;
-import emu.grasscutter.server.game.BaseGameSystem;
-import emu.grasscutter.server.game.GameServer;
-import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
+import emu.grasscutter.server.game.*;
+import it.unimi.dsi.fastutil.ints.*;
+
 import java.util.List;
 
 public class ExpeditionSystem extends BaseGameSystem {
diff --git a/src/main/java/emu/grasscutter/game/friends/FriendsList.java b/src/main/java/emu/grasscutter/game/friends/FriendsList.java
index 21f04cbc0..3c031434e 100644
--- a/src/main/java/emu/grasscutter/game/friends/FriendsList.java
+++ b/src/main/java/emu/grasscutter/game/friends/FriendsList.java
@@ -1,12 +1,11 @@
 package emu.grasscutter.game.friends;
 
 import emu.grasscutter.database.DatabaseHelper;
-import emu.grasscutter.game.player.BasePlayerManager;
-import emu.grasscutter.game.player.Player;
+import emu.grasscutter.game.player.*;
 import emu.grasscutter.net.proto.DealAddFriendResultTypeOuterClass.DealAddFriendResultType;
 import emu.grasscutter.server.packet.send.*;
-import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
+import it.unimi.dsi.fastutil.ints.*;
+
 import java.util.List;
 
 public class FriendsList extends BasePlayerManager {
diff --git a/src/main/java/emu/grasscutter/game/friends/Friendship.java b/src/main/java/emu/grasscutter/game/friends/Friendship.java
index 2282b7857..0f3f55592 100644
--- a/src/main/java/emu/grasscutter/game/friends/Friendship.java
+++ b/src/main/java/emu/grasscutter/game/friends/Friendship.java
@@ -1,9 +1,6 @@
 package emu.grasscutter.game.friends;
 
-import dev.morphia.annotations.Entity;
-import dev.morphia.annotations.Id;
-import dev.morphia.annotations.Indexed;
-import dev.morphia.annotations.Transient;
+import dev.morphia.annotations.*;
 import emu.grasscutter.database.DatabaseHelper;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief;
diff --git a/src/main/java/emu/grasscutter/game/friends/PlayerProfile.java b/src/main/java/emu/grasscutter/game/friends/PlayerProfile.java
index d8106a7f8..44b1fe11c 100644
--- a/src/main/java/emu/grasscutter/game/friends/PlayerProfile.java
+++ b/src/main/java/emu/grasscutter/game/friends/PlayerProfile.java
@@ -1,13 +1,8 @@
 package emu.grasscutter.game.friends;
 
-import dev.morphia.annotations.AlsoLoad;
-import dev.morphia.annotations.Entity;
-
+import dev.morphia.annotations.*;
 import emu.grasscutter.Grasscutter;
-
-import dev.morphia.annotations.Transient;
 import emu.grasscutter.game.home.GameHome;
-
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.net.proto.FriendEnterHomeOptionOuterClass;
 import emu.grasscutter.utils.Utils;
diff --git a/src/main/java/emu/grasscutter/game/gacha/GachaBanner.java b/src/main/java/emu/grasscutter/game/gacha/GachaBanner.java
index b1bdaeef2..ecd4b3dd6 100644
--- a/src/main/java/emu/grasscutter/game/gacha/GachaBanner.java
+++ b/src/main/java/emu/grasscutter/game/gacha/GachaBanner.java
@@ -1,7 +1,5 @@
 package emu.grasscutter.game.gacha;
 
-import static emu.grasscutter.config.Configuration.*;
-
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.data.common.ItemParamData;
 import emu.grasscutter.game.player.Player;
@@ -10,6 +8,8 @@ import emu.grasscutter.net.proto.GachaUpInfoOuterClass.GachaUpInfo;
 import emu.grasscutter.utils.Utils;
 import lombok.Getter;
 
+import static emu.grasscutter.config.Configuration.*;
+
 public class GachaBanner {
     // Constants used by the BannerType enum
     static final int[][] DEFAULT_WEIGHTS_4 = {{1, 510}, {8, 510}, {10, 10000}};
diff --git a/src/main/java/emu/grasscutter/game/gacha/GachaRecord.java b/src/main/java/emu/grasscutter/game/gacha/GachaRecord.java
index b552df216..fee28789d 100644
--- a/src/main/java/emu/grasscutter/game/gacha/GachaRecord.java
+++ b/src/main/java/emu/grasscutter/game/gacha/GachaRecord.java
@@ -1,11 +1,10 @@
 package emu.grasscutter.game.gacha;
 
-import dev.morphia.annotations.Entity;
-import dev.morphia.annotations.Id;
-import dev.morphia.annotations.Indexed;
-import java.util.Date;
+import dev.morphia.annotations.*;
 import org.bson.types.ObjectId;
 
+import java.util.Date;
+
 @Entity(value = "gachas", useDiscriminator = false)
 public class GachaRecord {
     @Id private ObjectId id;
diff --git a/src/main/java/emu/grasscutter/game/gacha/PlayerGachaBannerInfo.java b/src/main/java/emu/grasscutter/game/gacha/PlayerGachaBannerInfo.java
index feae85a0f..e896aee1e 100644
--- a/src/main/java/emu/grasscutter/game/gacha/PlayerGachaBannerInfo.java
+++ b/src/main/java/emu/grasscutter/game/gacha/PlayerGachaBannerInfo.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.game.gacha;
 
 import dev.morphia.annotations.Entity;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.*;
 
 @Entity
 public class PlayerGachaBannerInfo {
diff --git a/src/main/java/emu/grasscutter/game/home/FurnitureMakeSlotItem.java b/src/main/java/emu/grasscutter/game/home/FurnitureMakeSlotItem.java
index 09568708e..8163f252d 100644
--- a/src/main/java/emu/grasscutter/game/home/FurnitureMakeSlotItem.java
+++ b/src/main/java/emu/grasscutter/game/home/FurnitureMakeSlotItem.java
@@ -1,11 +1,8 @@
 package emu.grasscutter.game.home;
 
-import dev.morphia.annotations.Entity;
-import dev.morphia.annotations.Id;
+import dev.morphia.annotations.*;
 import emu.grasscutter.net.proto.FurnitureMakeDataOuterClass;
-import lombok.AccessLevel;
-import lombok.Builder;
-import lombok.Data;
+import lombok.*;
 import lombok.experimental.FieldDefaults;
 
 @Entity
diff --git a/src/main/java/emu/grasscutter/game/home/GameHome.java b/src/main/java/emu/grasscutter/game/home/GameHome.java
index 250a0e25a..bcc2d68f0 100644
--- a/src/main/java/emu/grasscutter/game/home/GameHome.java
+++ b/src/main/java/emu/grasscutter/game/home/GameHome.java
@@ -10,9 +10,7 @@ import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.props.SceneType;
 import emu.grasscutter.server.packet.send.*;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import lombok.AccessLevel;
-import lombok.Builder;
-import lombok.Data;
+import lombok.*;
 import lombok.experimental.FieldDefaults;
 
 import java.time.ZonedDateTime;
diff --git a/src/main/java/emu/grasscutter/game/home/HomeAnimalItem.java b/src/main/java/emu/grasscutter/game/home/HomeAnimalItem.java
index bf3fe2492..75ac253c4 100644
--- a/src/main/java/emu/grasscutter/game/home/HomeAnimalItem.java
+++ b/src/main/java/emu/grasscutter/game/home/HomeAnimalItem.java
@@ -3,9 +3,7 @@ package emu.grasscutter.game.home;
 import dev.morphia.annotations.Entity;
 import emu.grasscutter.game.world.Position;
 import emu.grasscutter.net.proto.HomeAnimalDataOuterClass;
-import lombok.AccessLevel;
-import lombok.Builder;
-import lombok.Data;
+import lombok.*;
 import lombok.experimental.FieldDefaults;
 
 @Entity
diff --git a/src/main/java/emu/grasscutter/game/home/HomeBlockItem.java b/src/main/java/emu/grasscutter/game/home/HomeBlockItem.java
index e2b1f0d8b..aadeb9484 100644
--- a/src/main/java/emu/grasscutter/game/home/HomeBlockItem.java
+++ b/src/main/java/emu/grasscutter/game/home/HomeBlockItem.java
@@ -1,16 +1,12 @@
 package emu.grasscutter.game.home;
 
-import dev.morphia.annotations.Entity;
-import dev.morphia.annotations.Id;
+import dev.morphia.annotations.*;
 import emu.grasscutter.data.binout.HomeworldDefaultSaveData;
 import emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.HomeBlockArrangementInfo;
-import lombok.AccessLevel;
-import lombok.Builder;
-import lombok.Data;
+import lombok.*;
 import lombok.experimental.FieldDefaults;
 
-import java.util.Collection;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Stream;
 
 @Entity
diff --git a/src/main/java/emu/grasscutter/game/home/HomeFurnitureItem.java b/src/main/java/emu/grasscutter/game/home/HomeFurnitureItem.java
index 11752f5e2..d52cd31f4 100644
--- a/src/main/java/emu/grasscutter/game/home/HomeFurnitureItem.java
+++ b/src/main/java/emu/grasscutter/game/home/HomeFurnitureItem.java
@@ -5,11 +5,8 @@ import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.binout.HomeworldDefaultSaveData;
 import emu.grasscutter.data.excels.ItemData;
 import emu.grasscutter.game.world.Position;
-import emu.grasscutter.net.proto.HomeFurnitureDataOuterClass;
-import emu.grasscutter.net.proto.HomeMarkPointFurnitureDataOuterClass;
-import lombok.AccessLevel;
-import lombok.Builder;
-import lombok.Data;
+import emu.grasscutter.net.proto.*;
+import lombok.*;
 import lombok.experimental.FieldDefaults;
 import org.jetbrains.annotations.Nullable;
 
diff --git a/src/main/java/emu/grasscutter/game/home/HomeNPCItem.java b/src/main/java/emu/grasscutter/game/home/HomeNPCItem.java
index 129b60248..f4d4d54a9 100644
--- a/src/main/java/emu/grasscutter/game/home/HomeNPCItem.java
+++ b/src/main/java/emu/grasscutter/game/home/HomeNPCItem.java
@@ -3,12 +3,8 @@ package emu.grasscutter.game.home;
 import dev.morphia.annotations.Entity;
 import emu.grasscutter.data.GameData;
 import emu.grasscutter.game.world.Position;
-import emu.grasscutter.net.proto.HomeMarkPointFurnitureDataOuterClass;
-import emu.grasscutter.net.proto.HomeMarkPointNPCDataOuterClass;
-import emu.grasscutter.net.proto.HomeNpcDataOuterClass;
-import lombok.AccessLevel;
-import lombok.Builder;
-import lombok.Data;
+import emu.grasscutter.net.proto.*;
+import lombok.*;
 import lombok.experimental.FieldDefaults;
 import org.jetbrains.annotations.Nullable;
 
diff --git a/src/main/java/emu/grasscutter/game/home/HomeSceneItem.java b/src/main/java/emu/grasscutter/game/home/HomeSceneItem.java
index c3c38ef71..1db1261b9 100644
--- a/src/main/java/emu/grasscutter/game/home/HomeSceneItem.java
+++ b/src/main/java/emu/grasscutter/game/home/HomeSceneItem.java
@@ -1,14 +1,11 @@
 package emu.grasscutter.game.home;
 
-import dev.morphia.annotations.Entity;
-import dev.morphia.annotations.Id;
+import dev.morphia.annotations.*;
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.data.binout.HomeworldDefaultSaveData;
 import emu.grasscutter.game.world.Position;
 import emu.grasscutter.net.proto.HomeSceneArrangementInfoOuterClass.HomeSceneArrangementInfo;
-import lombok.AccessLevel;
-import lombok.Builder;
-import lombok.Data;
+import lombok.*;
 import lombok.experimental.FieldDefaults;
 
 import java.util.Map;
diff --git a/src/main/java/emu/grasscutter/game/home/HomeWorld.java b/src/main/java/emu/grasscutter/game/home/HomeWorld.java
index 592d385e7..a62580a85 100644
--- a/src/main/java/emu/grasscutter/game/home/HomeWorld.java
+++ b/src/main/java/emu/grasscutter/game/home/HomeWorld.java
@@ -2,13 +2,11 @@ package emu.grasscutter.game.home;
 
 import emu.grasscutter.game.entity.EntityTeam;
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.game.world.Scene;
-import emu.grasscutter.game.world.World;
+import emu.grasscutter.game.world.*;
 import emu.grasscutter.net.packet.BasePacket;
 import emu.grasscutter.net.proto.ChatInfoOuterClass;
 import emu.grasscutter.server.game.GameServer;
-import emu.grasscutter.server.packet.send.PacketDelTeamEntityNotify;
-import emu.grasscutter.server.packet.send.PacketPlayerChatNotify;
+import emu.grasscutter.server.packet.send.*;
 import lombok.Getter;
 
 import java.util.List;
diff --git a/src/main/java/emu/grasscutter/game/home/HomeWorldMPSystem.java b/src/main/java/emu/grasscutter/game/home/HomeWorldMPSystem.java
index 1cd8b06d8..f1a1ab3b8 100644
--- a/src/main/java/emu/grasscutter/game/home/HomeWorldMPSystem.java
+++ b/src/main/java/emu/grasscutter/game/home/HomeWorldMPSystem.java
@@ -2,18 +2,11 @@ package emu.grasscutter.game.home;
 
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.props.EnterReason;
-import emu.grasscutter.game.world.Position;
-import emu.grasscutter.game.world.World;
+import emu.grasscutter.game.world.*;
 import emu.grasscutter.game.world.data.TeleportProperties;
-import emu.grasscutter.net.proto.EnterTypeOuterClass;
-import emu.grasscutter.net.proto.OtherPlayerEnterHomeNotifyOuterClass;
-import emu.grasscutter.net.proto.PlayerApplyEnterHomeResultNotifyOuterClass;
-import emu.grasscutter.net.proto.RetcodeOuterClass;
-import emu.grasscutter.server.event.player.PlayerEnterHomeEvent;
-import emu.grasscutter.server.event.player.PlayerLeaveHomeEvent;
-import emu.grasscutter.server.event.player.PlayerTeleportEvent;
-import emu.grasscutter.server.game.BaseGameSystem;
-import emu.grasscutter.server.game.GameServer;
+import emu.grasscutter.net.proto.*;
+import emu.grasscutter.server.event.player.*;
+import emu.grasscutter.server.game.*;
 import emu.grasscutter.server.packet.send.*;
 
 public class HomeWorldMPSystem extends BaseGameSystem {
diff --git a/src/main/java/emu/grasscutter/game/inventory/BagTab.java b/src/main/java/emu/grasscutter/game/inventory/BagTab.java
index 697374b75..63b8f0770 100644
--- a/src/main/java/emu/grasscutter/game/inventory/BagTab.java
+++ b/src/main/java/emu/grasscutter/game/inventory/BagTab.java
@@ -1,9 +1,10 @@
 package emu.grasscutter.game.inventory;
 
 import it.unimi.dsi.fastutil.ints.*;
+import lombok.*;
+
 import java.util.*;
 import java.util.stream.Stream;
-import lombok.*;
 
 @RequiredArgsConstructor
 public enum BagTab {
diff --git a/src/main/java/emu/grasscutter/game/inventory/EquipInventoryTab.java b/src/main/java/emu/grasscutter/game/inventory/EquipInventoryTab.java
index 3d2f8fd5d..5da1ae1ca 100644
--- a/src/main/java/emu/grasscutter/game/inventory/EquipInventoryTab.java
+++ b/src/main/java/emu/grasscutter/game/inventory/EquipInventoryTab.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.game.inventory;
 
-import java.util.HashSet;
-import java.util.Set;
+import java.util.*;
 
 public class EquipInventoryTab implements InventoryTab {
     private final Set items;
diff --git a/src/main/java/emu/grasscutter/game/inventory/EquipType.java b/src/main/java/emu/grasscutter/game/inventory/EquipType.java
index 0feb59cf3..b9721a317 100644
--- a/src/main/java/emu/grasscutter/game/inventory/EquipType.java
+++ b/src/main/java/emu/grasscutter/game/inventory/EquipType.java
@@ -1,12 +1,11 @@
 package emu.grasscutter.game.inventory;
 
-import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.stream.Stream;
+import it.unimi.dsi.fastutil.ints.*;
 import lombok.Getter;
 
+import java.util.*;
+import java.util.stream.Stream;
+
 public enum EquipType {
     EQUIP_NONE(0),
     EQUIP_BRACER(1),
diff --git a/src/main/java/emu/grasscutter/game/inventory/GameItem.java b/src/main/java/emu/grasscutter/game/inventory/GameItem.java
index 4dbfbbb45..00e370f08 100644
--- a/src/main/java/emu/grasscutter/game/inventory/GameItem.java
+++ b/src/main/java/emu/grasscutter/game/inventory/GameItem.java
@@ -1,12 +1,10 @@
 package emu.grasscutter.game.inventory;
 
 import dev.morphia.annotations.*;
-import emu.grasscutter.data.GameData;
-import emu.grasscutter.data.GameDepot;
+import emu.grasscutter.data.*;
 import emu.grasscutter.data.common.ItemParamData;
 import emu.grasscutter.data.excels.ItemData;
-import emu.grasscutter.data.excels.reliquary.ReliquaryAffixData;
-import emu.grasscutter.data.excels.reliquary.ReliquaryMainPropData;
+import emu.grasscutter.data.excels.reliquary.*;
 import emu.grasscutter.database.DatabaseHelper;
 import emu.grasscutter.game.entity.EntityWeapon;
 import emu.grasscutter.game.player.Player;
@@ -23,14 +21,11 @@ import emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.SceneReliquaryInfo
 import emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfo;
 import emu.grasscutter.net.proto.WeaponOuterClass.Weapon;
 import emu.grasscutter.utils.objects.WeightedList;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.*;
 import org.bson.types.ObjectId;
 
+import java.util.*;
+
 @Entity(value = "items", useDiscriminator = false)
 public class GameItem {
     @Id private ObjectId id;
diff --git a/src/main/java/emu/grasscutter/game/inventory/Inventory.java b/src/main/java/emu/grasscutter/game/inventory/Inventory.java
index 9a293f0f0..8f15deb07 100644
--- a/src/main/java/emu/grasscutter/game/inventory/Inventory.java
+++ b/src/main/java/emu/grasscutter/game/inventory/Inventory.java
@@ -1,7 +1,5 @@
 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;
@@ -18,10 +16,13 @@ import emu.grasscutter.server.packet.send.*;
 import emu.grasscutter.utils.Utils;
 import it.unimi.dsi.fastutil.ints.*;
 import it.unimi.dsi.fastutil.longs.*;
-import java.util.*;
-import javax.annotation.Nullable;
 import lombok.val;
 
+import javax.annotation.Nullable;
+import java.util.*;
+
+import static emu.grasscutter.config.Configuration.INVENTORY_LIMITS;
+
 public class Inventory extends BasePlayerManager implements Iterable {
     private final Long2ObjectMap store;
     private final Int2ObjectMap inventoryTypes;
diff --git a/src/main/java/emu/grasscutter/game/inventory/ItemQuality.java b/src/main/java/emu/grasscutter/game/inventory/ItemQuality.java
index e9938d36d..8d49de6af 100644
--- a/src/main/java/emu/grasscutter/game/inventory/ItemQuality.java
+++ b/src/main/java/emu/grasscutter/game/inventory/ItemQuality.java
@@ -1,12 +1,11 @@
 package emu.grasscutter.game.inventory;
 
-import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.stream.Stream;
+import it.unimi.dsi.fastutil.ints.*;
 import lombok.Getter;
 
+import java.util.*;
+import java.util.stream.Stream;
+
 public enum ItemQuality {
     QUALITY_NONE(0),
     QUALITY_WHITE(1),
diff --git a/src/main/java/emu/grasscutter/game/inventory/ItemType.java b/src/main/java/emu/grasscutter/game/inventory/ItemType.java
index 42bdb4250..4eef06095 100644
--- a/src/main/java/emu/grasscutter/game/inventory/ItemType.java
+++ b/src/main/java/emu/grasscutter/game/inventory/ItemType.java
@@ -1,12 +1,11 @@
 package emu.grasscutter.game.inventory;
 
-import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.stream.Stream;
+import it.unimi.dsi.fastutil.ints.*;
 import lombok.Getter;
 
+import java.util.*;
+import java.util.stream.Stream;
+
 public enum ItemType {
     ITEM_NONE(0),
     ITEM_VIRTUAL(1),
diff --git a/src/main/java/emu/grasscutter/game/inventory/MaterialInventoryTab.java b/src/main/java/emu/grasscutter/game/inventory/MaterialInventoryTab.java
index 5f71839c4..1cd700d0c 100644
--- a/src/main/java/emu/grasscutter/game/inventory/MaterialInventoryTab.java
+++ b/src/main/java/emu/grasscutter/game/inventory/MaterialInventoryTab.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.game.inventory;
 
-import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
+import it.unimi.dsi.fastutil.ints.*;
 import lombok.val;
 
 public class MaterialInventoryTab implements InventoryTab {
diff --git a/src/main/java/emu/grasscutter/game/inventory/MaterialType.java b/src/main/java/emu/grasscutter/game/inventory/MaterialType.java
index 85913eceb..9440eceea 100644
--- a/src/main/java/emu/grasscutter/game/inventory/MaterialType.java
+++ b/src/main/java/emu/grasscutter/game/inventory/MaterialType.java
@@ -1,12 +1,11 @@
 package emu.grasscutter.game.inventory;
 
-import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.stream.Stream;
+import it.unimi.dsi.fastutil.ints.*;
 import lombok.Getter;
 
+import java.util.*;
+import java.util.stream.Stream;
+
 public enum MaterialType {
     MATERIAL_NONE(0),
     MATERIAL_FOOD(1),
diff --git a/src/main/java/emu/grasscutter/game/mail/Mail.java b/src/main/java/emu/grasscutter/game/mail/Mail.java
index 2cb42c609..da3120f33 100644
--- a/src/main/java/emu/grasscutter/game/mail/Mail.java
+++ b/src/main/java/emu/grasscutter/game/mail/Mail.java
@@ -1,22 +1,19 @@
 package emu.grasscutter.game.mail;
 
-import static emu.grasscutter.net.proto.MailItemOuterClass.MailItem.*;
-
-import dev.morphia.annotations.Entity;
-import dev.morphia.annotations.Id;
-import dev.morphia.annotations.Indexed;
-import dev.morphia.annotations.Transient;
+import dev.morphia.annotations.*;
 import emu.grasscutter.database.DatabaseHelper;
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.net.proto.*;
 import emu.grasscutter.net.proto.EquipParamOuterClass.EquipParam;
 import emu.grasscutter.net.proto.MailCollectStateOuterClass.MailCollectState;
+import emu.grasscutter.net.proto.*;
 import emu.grasscutter.net.proto.MailTextContentOuterClass.MailTextContent;
-import java.time.Instant;
-import java.util.ArrayList;
-import java.util.List;
 import org.bson.types.ObjectId;
 
+import java.time.Instant;
+import java.util.*;
+
+import static emu.grasscutter.net.proto.MailItemOuterClass.MailItem.newBuilder;
+
 @Entity(value = "mail", useDiscriminator = false)
 public final class Mail {
     @Id private ObjectId id;
diff --git a/src/main/java/emu/grasscutter/game/mail/MailHandler.java b/src/main/java/emu/grasscutter/game/mail/MailHandler.java
index d53da4641..1d24787ed 100644
--- a/src/main/java/emu/grasscutter/game/mail/MailHandler.java
+++ b/src/main/java/emu/grasscutter/game/mail/MailHandler.java
@@ -2,14 +2,11 @@ package emu.grasscutter.game.mail;
 
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.database.DatabaseHelper;
-import emu.grasscutter.game.player.BasePlayerManager;
-import emu.grasscutter.game.player.Player;
+import emu.grasscutter.game.player.*;
 import emu.grasscutter.server.event.player.PlayerReceiveMailEvent;
-import emu.grasscutter.server.packet.send.PacketDelMailRsp;
-import emu.grasscutter.server.packet.send.PacketMailChangeNotify;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
+import emu.grasscutter.server.packet.send.*;
+
+import java.util.*;
 
 public class MailHandler extends BasePlayerManager {
     private final List mail;
diff --git a/src/main/java/emu/grasscutter/game/managers/FurnitureManager.java b/src/main/java/emu/grasscutter/game/managers/FurnitureManager.java
index 905c5318f..55347f46b 100644
--- a/src/main/java/emu/grasscutter/game/managers/FurnitureManager.java
+++ b/src/main/java/emu/grasscutter/game/managers/FurnitureManager.java
@@ -2,15 +2,14 @@ package emu.grasscutter.game.managers;
 
 import emu.grasscutter.data.GameData;
 import emu.grasscutter.game.home.FurnitureMakeSlotItem;
-import emu.grasscutter.game.player.BasePlayerManager;
-import emu.grasscutter.game.player.Player;
+import emu.grasscutter.game.player.*;
 import emu.grasscutter.game.props.ActionReason;
 import emu.grasscutter.net.proto.ItemParamOuterClass;
 import emu.grasscutter.net.proto.RetcodeOuterClass.Retcode;
 import emu.grasscutter.server.packet.send.*;
 import emu.grasscutter.utils.Utils;
-import java.util.ArrayList;
-import java.util.List;
+
+import java.util.*;
 
 public class FurnitureManager extends BasePlayerManager {
 
diff --git a/src/main/java/emu/grasscutter/game/managers/ResinManager.java b/src/main/java/emu/grasscutter/game/managers/ResinManager.java
index c46bc680e..051309079 100644
--- a/src/main/java/emu/grasscutter/game/managers/ResinManager.java
+++ b/src/main/java/emu/grasscutter/game/managers/ResinManager.java
@@ -1,18 +1,14 @@
 package emu.grasscutter.game.managers;
 
-import static emu.grasscutter.config.Configuration.GAME_OPTIONS;
-
 import emu.grasscutter.game.inventory.GameItem;
-import emu.grasscutter.game.player.BasePlayerManager;
-import emu.grasscutter.game.player.Player;
-import emu.grasscutter.game.props.ActionReason;
-import emu.grasscutter.game.props.PlayerProperty;
-import emu.grasscutter.game.props.WatcherTriggerType;
+import emu.grasscutter.game.player.*;
+import emu.grasscutter.game.props.*;
 import emu.grasscutter.net.proto.RetcodeOuterClass;
-import emu.grasscutter.server.packet.send.PacketItemAddHintNotify;
-import emu.grasscutter.server.packet.send.PacketResinChangeNotify;
+import emu.grasscutter.server.packet.send.*;
 import emu.grasscutter.utils.Utils;
 
+import static emu.grasscutter.config.Configuration.GAME_OPTIONS;
+
 public class ResinManager extends BasePlayerManager {
     public static final int MAX_RESIN_BUYING_COUNT = 6;
     public static final int AMOUNT_TO_ADD = 60;
diff --git a/src/main/java/emu/grasscutter/game/managers/SatiationManager.java b/src/main/java/emu/grasscutter/game/managers/SatiationManager.java
index bb6dcb8a4..e4f920869 100644
--- a/src/main/java/emu/grasscutter/game/managers/SatiationManager.java
+++ b/src/main/java/emu/grasscutter/game/managers/SatiationManager.java
@@ -1,15 +1,11 @@
 package emu.grasscutter.game.managers;
 
 import emu.grasscutter.game.avatar.Avatar;
-import emu.grasscutter.game.player.BasePlayerManager;
-import emu.grasscutter.game.player.Player;
+import emu.grasscutter.game.player.*;
 import emu.grasscutter.game.props.PlayerProperty;
-import emu.grasscutter.server.packet.send.PacketAvatarPropNotify;
-import emu.grasscutter.server.packet.send.PacketAvatarSatiationDataNotify;
-import emu.grasscutter.server.packet.send.PacketPlayerGameTimeNotify;
-import emu.grasscutter.server.packet.send.PacketPlayerTimeNotify;
-import java.util.HashMap;
-import java.util.Map;
+import emu.grasscutter.server.packet.send.*;
+
+import java.util.*;
 
 public class SatiationManager extends BasePlayerManager {
 
diff --git a/src/main/java/emu/grasscutter/game/managers/SotSManager.java b/src/main/java/emu/grasscutter/game/managers/SotSManager.java
index 8c88fca3d..e48778f3c 100644
--- a/src/main/java/emu/grasscutter/game/managers/SotSManager.java
+++ b/src/main/java/emu/grasscutter/game/managers/SotSManager.java
@@ -3,27 +3,18 @@ package emu.grasscutter.game.managers;
 import ch.qos.logback.classic.Logger;
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.data.GameData;
-import emu.grasscutter.data.excels.CityData;
-import emu.grasscutter.data.excels.RewardData;
+import emu.grasscutter.data.excels.*;
 import emu.grasscutter.game.city.CityInfoData;
 import emu.grasscutter.game.entity.EntityAvatar;
-import emu.grasscutter.game.player.BasePlayerManager;
-import emu.grasscutter.game.player.Player;
-import emu.grasscutter.game.props.ActionReason;
-import emu.grasscutter.game.props.FightProperty;
-import emu.grasscutter.game.props.PlayerProperty;
+import emu.grasscutter.game.player.*;
+import emu.grasscutter.game.props.*;
 import emu.grasscutter.game.quest.enums.QuestContent;
 import emu.grasscutter.net.proto.ChangeHpReasonOuterClass.ChangeHpReason;
 import emu.grasscutter.net.proto.PropChangeReasonOuterClass.PropChangeReason;
 import emu.grasscutter.server.event.player.PlayerLevelStatueEvent;
-import emu.grasscutter.server.packet.send.PacketEntityFightPropChangeReasonNotify;
-import emu.grasscutter.server.packet.send.PacketEntityFightPropUpdateNotify;
-import emu.grasscutter.server.packet.send.PacketLevelupCityRsp;
-import emu.grasscutter.server.packet.send.PacketSceneForceUnlockNotify;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Timer;
-import java.util.TimerTask;
+import emu.grasscutter.server.packet.send.*;
+
+import java.util.*;
 
 // Statue of the Seven Manager
 public class SotSManager extends BasePlayerManager {
diff --git a/src/main/java/emu/grasscutter/game/managers/blossom/BlossomActivity.java b/src/main/java/emu/grasscutter/game/managers/blossom/BlossomActivity.java
index d3cd02118..6f2735345 100644
--- a/src/main/java/emu/grasscutter/game/managers/blossom/BlossomActivity.java
+++ b/src/main/java/emu/grasscutter/game/managers/blossom/BlossomActivity.java
@@ -2,21 +2,14 @@ package emu.grasscutter.game.managers.blossom;
 
 import emu.grasscutter.data.GameData;
 import emu.grasscutter.game.dungeons.challenge.WorldChallenge;
-import emu.grasscutter.game.dungeons.challenge.trigger.ChallengeTrigger;
-import emu.grasscutter.game.dungeons.challenge.trigger.KillMonsterCountTrigger;
-import emu.grasscutter.game.entity.EntityGadget;
-import emu.grasscutter.game.entity.EntityMonster;
+import emu.grasscutter.game.dungeons.challenge.trigger.*;
+import emu.grasscutter.game.entity.*;
 import emu.grasscutter.game.props.FightProperty;
-import emu.grasscutter.game.world.Position;
-import emu.grasscutter.game.world.Scene;
-import emu.grasscutter.scripts.data.SceneBossChest;
-import emu.grasscutter.scripts.data.SceneGadget;
-import emu.grasscutter.scripts.data.SceneGroup;
+import emu.grasscutter.game.world.*;
+import emu.grasscutter.scripts.data.*;
 import emu.grasscutter.utils.Utils;
-import java.util.ArrayDeque;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Queue;
+
+import java.util.*;
 
 public final class BlossomActivity {
 
diff --git a/src/main/java/emu/grasscutter/game/managers/blossom/BlossomConfig.java b/src/main/java/emu/grasscutter/game/managers/blossom/BlossomConfig.java
index 92052cbe2..703b3a46d 100644
--- a/src/main/java/emu/grasscutter/game/managers/blossom/BlossomConfig.java
+++ b/src/main/java/emu/grasscutter/game/managers/blossom/BlossomConfig.java
@@ -1,9 +1,9 @@
 package emu.grasscutter.game.managers.blossom;
 
-import java.util.List;
-import java.util.Map;
 import lombok.Getter;
 
+import java.util.*;
+
 public class BlossomConfig {
     @Getter private int monsterFightingVolume;
     // @Getter private Int2ObjectMap monsterIdsPerDifficulty;  // Need to wrangle Gson for
diff --git a/src/main/java/emu/grasscutter/game/managers/blossom/BlossomManager.java b/src/main/java/emu/grasscutter/game/managers/blossom/BlossomManager.java
index 5b28f45df..3177d0788 100644
--- a/src/main/java/emu/grasscutter/game/managers/blossom/BlossomManager.java
+++ b/src/main/java/emu/grasscutter/game/managers/blossom/BlossomManager.java
@@ -1,26 +1,21 @@
 package emu.grasscutter.game.managers.blossom;
 
 import emu.grasscutter.Grasscutter;
-import emu.grasscutter.data.GameData;
-import emu.grasscutter.data.GameDepot;
+import emu.grasscutter.data.*;
 import emu.grasscutter.data.common.ItemParamData;
 import emu.grasscutter.data.excels.RewardPreviewData;
-import emu.grasscutter.game.entity.EntityGadget;
-import emu.grasscutter.game.entity.GameEntity;
+import emu.grasscutter.game.entity.*;
 import emu.grasscutter.game.entity.gadget.GadgetWorktop;
 import emu.grasscutter.game.inventory.GameItem;
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.game.world.Scene;
-import emu.grasscutter.game.world.SpawnDataEntry;
+import emu.grasscutter.game.world.*;
 import emu.grasscutter.game.world.SpawnDataEntry.SpawnGroupEntry;
-import emu.grasscutter.net.proto.BlossomBriefInfoOuterClass;
-import emu.grasscutter.net.proto.VisionTypeOuterClass;
+import emu.grasscutter.net.proto.*;
 import emu.grasscutter.server.packet.send.PacketBlossomBriefInfoNotify;
 import emu.grasscutter.utils.Utils;
-import it.unimi.dsi.fastutil.ints.IntArrayList;
-import it.unimi.dsi.fastutil.ints.IntList;
-import java.util.ArrayList;
-import java.util.List;
+import it.unimi.dsi.fastutil.ints.*;
+
+import java.util.*;
 
 public class BlossomManager {
     private final Scene scene;
diff --git a/src/main/java/emu/grasscutter/game/managers/blossom/BlossomType.java b/src/main/java/emu/grasscutter/game/managers/blossom/BlossomType.java
index 83adcd5b6..51f184911 100644
--- a/src/main/java/emu/grasscutter/game/managers/blossom/BlossomType.java
+++ b/src/main/java/emu/grasscutter/game/managers/blossom/BlossomType.java
@@ -1,12 +1,11 @@
 package emu.grasscutter.game.managers.blossom;
 
 import emu.grasscutter.utils.Utils;
-import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
+import it.unimi.dsi.fastutil.ints.*;
 import lombok.Getter;
 
+import java.util.stream.*;
+
 public enum BlossomType {
     GOLD(70360056, 101001001, 1),
     BLUE(70360057, 101002003, 2);
diff --git a/src/main/java/emu/grasscutter/game/managers/cooking/CookingCompoundManager.java b/src/main/java/emu/grasscutter/game/managers/cooking/CookingCompoundManager.java
index b24eadbfc..f09228e46 100644
--- a/src/main/java/emu/grasscutter/game/managers/cooking/CookingCompoundManager.java
+++ b/src/main/java/emu/grasscutter/game/managers/cooking/CookingCompoundManager.java
@@ -4,8 +4,7 @@ import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.common.ItemParamData;
 import emu.grasscutter.data.excels.CompoundData;
 import emu.grasscutter.game.inventory.GameItem;
-import emu.grasscutter.game.player.BasePlayerManager;
-import emu.grasscutter.game.player.Player;
+import emu.grasscutter.game.player.*;
 import emu.grasscutter.game.props.ActionReason;
 import emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData;
 import emu.grasscutter.net.proto.GetCompoundDataReqOuterClass.GetCompoundDataReq;
@@ -13,11 +12,9 @@ import emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam;
 import emu.grasscutter.net.proto.PlayerCompoundMaterialReqOuterClass.PlayerCompoundMaterialReq;
 import emu.grasscutter.net.proto.RetcodeOuterClass.Retcode;
 import emu.grasscutter.net.proto.TakeCompoundOutputReqOuterClass.TakeCompoundOutputReq;
-import emu.grasscutter.server.packet.send.PackageTakeCompoundOutputRsp;
-import emu.grasscutter.server.packet.send.PacketCompoundDataNotify;
-import emu.grasscutter.server.packet.send.PacketGetCompoundDataRsp;
-import emu.grasscutter.server.packet.send.PacketPlayerCompoundMaterialRsp;
+import emu.grasscutter.server.packet.send.*;
 import emu.grasscutter.utils.Utils;
+
 import java.util.*;
 
 public class CookingCompoundManager extends BasePlayerManager {
diff --git a/src/main/java/emu/grasscutter/game/managers/cooking/CookingManager.java b/src/main/java/emu/grasscutter/game/managers/cooking/CookingManager.java
index a709c244b..ce38621c7 100644
--- a/src/main/java/emu/grasscutter/game/managers/cooking/CookingManager.java
+++ b/src/main/java/emu/grasscutter/game/managers/cooking/CookingManager.java
@@ -4,22 +4,16 @@ import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.common.ItemParamData;
 import emu.grasscutter.data.excels.ItemData;
 import emu.grasscutter.game.inventory.GameItem;
-import emu.grasscutter.game.player.BasePlayerManager;
-import emu.grasscutter.game.player.Player;
+import emu.grasscutter.game.player.*;
 import emu.grasscutter.game.props.ActionReason;
 import emu.grasscutter.net.proto.CookRecipeDataOuterClass;
 import emu.grasscutter.net.proto.PlayerCookArgsReqOuterClass.PlayerCookArgsReq;
 import emu.grasscutter.net.proto.PlayerCookReqOuterClass.PlayerCookReq;
 import emu.grasscutter.net.proto.RetcodeOuterClass.Retcode;
-import emu.grasscutter.server.packet.send.PacketCookDataNotify;
-import emu.grasscutter.server.packet.send.PacketCookRecipeDataNotify;
-import emu.grasscutter.server.packet.send.PacketPlayerCookArgsRsp;
-import emu.grasscutter.server.packet.send.PacketPlayerCookRsp;
+import emu.grasscutter.server.packet.send.*;
 import io.netty.util.internal.ThreadLocalRandom;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+
+import java.util.*;
 
 public class CookingManager extends BasePlayerManager {
     private static final int MANUAL_PERFECT_COOK_QUALITY = 3;
diff --git a/src/main/java/emu/grasscutter/game/managers/deforestation/DeforestationManager.java b/src/main/java/emu/grasscutter/game/managers/deforestation/DeforestationManager.java
index 9ced9b53e..7dedc7a23 100644
--- a/src/main/java/emu/grasscutter/game/managers/deforestation/DeforestationManager.java
+++ b/src/main/java/emu/grasscutter/game/managers/deforestation/DeforestationManager.java
@@ -3,14 +3,11 @@ package emu.grasscutter.game.managers.deforestation;
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.data.GameData;
 import emu.grasscutter.game.entity.EntityItem;
-import emu.grasscutter.game.player.BasePlayerManager;
-import emu.grasscutter.game.player.Player;
-import emu.grasscutter.game.world.Position;
-import emu.grasscutter.game.world.Scene;
-import emu.grasscutter.net.proto.HitTreeNotifyOuterClass;
-import emu.grasscutter.net.proto.VectorOuterClass;
-import java.util.ArrayList;
-import java.util.HashMap;
+import emu.grasscutter.game.player.*;
+import emu.grasscutter.game.world.*;
+import emu.grasscutter.net.proto.*;
+
+import java.util.*;
 
 public class DeforestationManager extends BasePlayerManager {
     static final int RECORD_EXPIRED_SECONDS = 60 * 5; // 5 min
diff --git a/src/main/java/emu/grasscutter/game/managers/energy/EnergyManager.java b/src/main/java/emu/grasscutter/game/managers/energy/EnergyManager.java
index 9b70c822e..53c792da6 100644
--- a/src/main/java/emu/grasscutter/game/managers/energy/EnergyManager.java
+++ b/src/main/java/emu/grasscutter/game/managers/energy/EnergyManager.java
@@ -1,22 +1,15 @@
 package emu.grasscutter.game.managers.energy;
 
-import static emu.grasscutter.config.Configuration.GAME_OPTIONS;
-
 import com.google.protobuf.InvalidProtocolBufferException;
 import emu.grasscutter.Grasscutter;
-import emu.grasscutter.data.DataLoader;
-import emu.grasscutter.data.GameData;
+import emu.grasscutter.data.*;
 import emu.grasscutter.data.excels.ItemData;
 import emu.grasscutter.data.excels.avatar.AvatarSkillDepotData;
 import emu.grasscutter.data.excels.monster.MonsterData.HpDrops;
 import emu.grasscutter.game.avatar.Avatar;
 import emu.grasscutter.game.entity.*;
-import emu.grasscutter.game.player.BasePlayerManager;
-import emu.grasscutter.game.player.Player;
-import emu.grasscutter.game.props.ElementType;
-import emu.grasscutter.game.props.FightProperty;
-import emu.grasscutter.game.props.MonsterType;
-import emu.grasscutter.game.props.WeaponType;
+import emu.grasscutter.game.player.*;
+import emu.grasscutter.game.props.*;
 import emu.grasscutter.game.world.Position;
 import emu.grasscutter.net.proto.AbilityActionGenerateElemBallOuterClass.AbilityActionGenerateElemBall;
 import emu.grasscutter.net.proto.AbilityIdentifierOuterClass.AbilityIdentifier;
@@ -26,15 +19,15 @@ import emu.grasscutter.net.proto.ChangeEnergyReasonOuterClass.ChangeEnergyReason
 import emu.grasscutter.net.proto.EvtBeingHitInfoOuterClass.EvtBeingHitInfo;
 import emu.grasscutter.net.proto.PropChangeReasonOuterClass.PropChangeReason;
 import emu.grasscutter.server.game.GameSession;
-import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
-import it.unimi.dsi.fastutil.objects.Object2IntMap;
-import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
-import java.util.List;
-import java.util.Optional;
-import java.util.concurrent.ThreadLocalRandom;
+import it.unimi.dsi.fastutil.ints.*;
+import it.unimi.dsi.fastutil.objects.*;
 import lombok.Getter;
 
+import java.util.*;
+import java.util.concurrent.ThreadLocalRandom;
+
+import static emu.grasscutter.config.Configuration.GAME_OPTIONS;
+
 public class EnergyManager extends BasePlayerManager {
     private static final Int2ObjectMap> energyDropData =
             new Int2ObjectOpenHashMap<>();
diff --git a/src/main/java/emu/grasscutter/game/managers/forging/ForgingManager.java b/src/main/java/emu/grasscutter/game/managers/forging/ForgingManager.java
index 083238997..bdd85e873 100644
--- a/src/main/java/emu/grasscutter/game/managers/forging/ForgingManager.java
+++ b/src/main/java/emu/grasscutter/game/managers/forging/ForgingManager.java
@@ -2,13 +2,10 @@ package emu.grasscutter.game.managers.forging;
 
 import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.common.ItemParamData;
-import emu.grasscutter.data.excels.ForgeData;
-import emu.grasscutter.data.excels.ItemData;
+import emu.grasscutter.data.excels.*;
 import emu.grasscutter.game.inventory.GameItem;
-import emu.grasscutter.game.player.BasePlayerManager;
-import emu.grasscutter.game.player.Player;
-import emu.grasscutter.game.props.ActionReason;
-import emu.grasscutter.game.props.WatcherTriggerType;
+import emu.grasscutter.game.player.*;
+import emu.grasscutter.game.props.*;
 import emu.grasscutter.net.proto.ForgeQueueDataOuterClass.ForgeQueueData;
 import emu.grasscutter.net.proto.ForgeQueueManipulateReqOuterClass.ForgeQueueManipulateReq;
 import emu.grasscutter.net.proto.ForgeQueueManipulateTypeOuterClass.ForgeQueueManipulateType;
@@ -17,10 +14,8 @@ import emu.grasscutter.net.proto.RetcodeOuterClass.Retcode;
 import emu.grasscutter.server.event.player.PlayerForgeItemEvent;
 import emu.grasscutter.server.packet.send.*;
 import emu.grasscutter.utils.Utils;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+
+import java.util.*;
 
 public final class ForgingManager extends BasePlayerManager {
 
diff --git a/src/main/java/emu/grasscutter/game/managers/mapmark/MapMarksManager.java b/src/main/java/emu/grasscutter/game/managers/mapmark/MapMarksManager.java
index 9b048f425..e9d46189f 100644
--- a/src/main/java/emu/grasscutter/game/managers/mapmark/MapMarksManager.java
+++ b/src/main/java/emu/grasscutter/game/managers/mapmark/MapMarksManager.java
@@ -1,15 +1,14 @@
 package emu.grasscutter.game.managers.mapmark;
 
 import emu.grasscutter.config.Configuration;
-import emu.grasscutter.game.player.BasePlayerManager;
-import emu.grasscutter.game.player.Player;
+import emu.grasscutter.game.player.*;
 import emu.grasscutter.game.world.Position;
 import emu.grasscutter.net.proto.MapMarkPointTypeOuterClass.MapMarkPointType;
 import emu.grasscutter.net.proto.MarkMapReqOuterClass.MarkMapReq;
 import emu.grasscutter.net.proto.MarkMapReqOuterClass.MarkMapReq.Operation;
 import emu.grasscutter.server.event.player.PlayerTeleportEvent.TeleportType;
-import emu.grasscutter.server.packet.send.PacketMarkMapRsp;
-import emu.grasscutter.server.packet.send.PacketSceneEntityAppearNotify;
+import emu.grasscutter.server.packet.send.*;
+
 import java.util.Map;
 
 public class MapMarksManager extends BasePlayerManager {
diff --git a/src/main/java/emu/grasscutter/game/player/InvokeHandler.java b/src/main/java/emu/grasscutter/game/player/InvokeHandler.java
index e689dd12b..57f9720e0 100644
--- a/src/main/java/emu/grasscutter/game/player/InvokeHandler.java
+++ b/src/main/java/emu/grasscutter/game/player/InvokeHandler.java
@@ -2,8 +2,8 @@ package emu.grasscutter.game.player;
 
 import emu.grasscutter.net.packet.BasePacket;
 import emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType;
-import java.util.ArrayList;
-import java.util.List;
+
+import java.util.*;
 
 public class InvokeHandler {
     private final List entryListForwardAll;
diff --git a/src/main/java/emu/grasscutter/game/player/Player.java b/src/main/java/emu/grasscutter/game/player/Player.java
index 95303eaef..d4b242d31 100644
--- a/src/main/java/emu/grasscutter/game/player/Player.java
+++ b/src/main/java/emu/grasscutter/game/player/Player.java
@@ -17,26 +17,15 @@ import emu.grasscutter.game.entity.GameEntity;
 import emu.grasscutter.game.expedition.ExpeditionInfo;
 import emu.grasscutter.game.friends.*;
 import emu.grasscutter.game.gacha.PlayerGachaInfo;
-import emu.grasscutter.game.home.EnterHomeRequest;
-import emu.grasscutter.game.home.GameHome;
-import emu.grasscutter.game.home.HomeWorld;
-import emu.grasscutter.game.inventory.GameItem;
-import emu.grasscutter.game.inventory.Inventory;
-import emu.grasscutter.game.mail.Mail;
-import emu.grasscutter.game.mail.MailHandler;
-import emu.grasscutter.game.managers.FurnitureManager;
-import emu.grasscutter.game.managers.ResinManager;
-import emu.grasscutter.game.managers.SatiationManager;
-import emu.grasscutter.game.managers.SotSManager;
-import emu.grasscutter.game.managers.cooking.ActiveCookCompoundData;
-import emu.grasscutter.game.managers.cooking.CookingCompoundManager;
-import emu.grasscutter.game.managers.cooking.CookingManager;
+import emu.grasscutter.game.home.*;
+import emu.grasscutter.game.inventory.*;
+import emu.grasscutter.game.mail.*;
+import emu.grasscutter.game.managers.*;
+import emu.grasscutter.game.managers.cooking.*;
 import emu.grasscutter.game.managers.deforestation.DeforestationManager;
 import emu.grasscutter.game.managers.energy.EnergyManager;
-import emu.grasscutter.game.managers.forging.ActiveForgeData;
-import emu.grasscutter.game.managers.forging.ForgingManager;
-import emu.grasscutter.game.managers.mapmark.MapMark;
-import emu.grasscutter.game.managers.mapmark.MapMarksManager;
+import emu.grasscutter.game.managers.forging.*;
+import emu.grasscutter.game.managers.mapmark.*;
 import emu.grasscutter.game.managers.stamina.StaminaManager;
 import emu.grasscutter.game.props.*;
 import emu.grasscutter.game.quest.QuestManager;
@@ -64,8 +53,7 @@ import emu.grasscutter.server.event.player.*;
 import emu.grasscutter.server.game.*;
 import emu.grasscutter.server.game.GameSession.SessionState;
 import emu.grasscutter.server.packet.send.*;
-import emu.grasscutter.utils.DispatchUtils;
-import emu.grasscutter.utils.Utils;
+import emu.grasscutter.utils.*;
 import emu.grasscutter.utils.helpers.DateHelper;
 import emu.grasscutter.utils.objects.FieldFetch;
 import it.unimi.dsi.fastutil.ints.*;
diff --git a/src/main/java/emu/grasscutter/game/player/PlayerBuffManager.java b/src/main/java/emu/grasscutter/game/player/PlayerBuffManager.java
index 9a6f369ef..2ea66e482 100644
--- a/src/main/java/emu/grasscutter/game/player/PlayerBuffManager.java
+++ b/src/main/java/emu/grasscutter/game/player/PlayerBuffManager.java
@@ -8,14 +8,11 @@ import emu.grasscutter.game.props.FightProperty;
 import emu.grasscutter.net.proto.ServerBuffChangeNotifyOuterClass.ServerBuffChangeNotify.ServerBuffChangeType;
 import emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff;
 import emu.grasscutter.server.packet.send.PacketServerBuffChangeNotify;
-import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
+import it.unimi.dsi.fastutil.ints.*;
 import lombok.Getter;
 
+import java.util.*;
+
 public final class PlayerBuffManager extends BasePlayerManager {
     private final List pendingBuffs;
     private final Int2ObjectMap buffs; // Server buffs
diff --git a/src/main/java/emu/grasscutter/game/player/PlayerCodex.java b/src/main/java/emu/grasscutter/game/player/PlayerCodex.java
index bedc5edee..4e59878e6 100644
--- a/src/main/java/emu/grasscutter/game/player/PlayerCodex.java
+++ b/src/main/java/emu/grasscutter/game/player/PlayerCodex.java
@@ -1,16 +1,14 @@
 package emu.grasscutter.game.player;
 
-import dev.morphia.annotations.Entity;
-import dev.morphia.annotations.Transient;
+import dev.morphia.annotations.*;
 import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.excels.codex.CodexAnimalData;
-import emu.grasscutter.game.entity.EntityMonster;
-import emu.grasscutter.game.entity.GameEntity;
+import emu.grasscutter.game.entity.*;
 import emu.grasscutter.game.inventory.GameItem;
 import emu.grasscutter.server.packet.send.PacketCodexDataUpdateNotify;
+import lombok.*;
+
 import java.util.*;
-import lombok.Getter;
-import lombok.val;
 
 @Entity
 public class PlayerCodex {
diff --git a/src/main/java/emu/grasscutter/game/player/PlayerCollectionRecords.java b/src/main/java/emu/grasscutter/game/player/PlayerCollectionRecords.java
index b832084d3..053b2a617 100644
--- a/src/main/java/emu/grasscutter/game/player/PlayerCollectionRecords.java
+++ b/src/main/java/emu/grasscutter/game/player/PlayerCollectionRecords.java
@@ -1,8 +1,8 @@
 package emu.grasscutter.game.player;
 
 import dev.morphia.annotations.Entity;
-import java.util.HashMap;
-import java.util.Map;
+
+import java.util.*;
 
 @Entity(useDiscriminator = false)
 public class PlayerCollectionRecords {
diff --git a/src/main/java/emu/grasscutter/game/player/PlayerProgress.java b/src/main/java/emu/grasscutter/game/player/PlayerProgress.java
index f66b957ef..638d8c5da 100644
--- a/src/main/java/emu/grasscutter/game/player/PlayerProgress.java
+++ b/src/main/java/emu/grasscutter/game/player/PlayerProgress.java
@@ -5,9 +5,10 @@ import emu.grasscutter.Grasscutter;
 import emu.grasscutter.game.quest.*;
 import emu.grasscutter.game.quest.enums.QuestContent;
 import it.unimi.dsi.fastutil.ints.*;
+import lombok.*;
+
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
-import lombok.*;
 
 /** Tracks progress the player made in the world, like obtained items, seen characters and more */
 @Getter
diff --git a/src/main/java/emu/grasscutter/game/player/PlayerProgressManager.java b/src/main/java/emu/grasscutter/game/player/PlayerProgressManager.java
index 788928066..d1f7849b3 100644
--- a/src/main/java/emu/grasscutter/game/player/PlayerProgressManager.java
+++ b/src/main/java/emu/grasscutter/game/player/PlayerProgressManager.java
@@ -1,8 +1,5 @@
 package emu.grasscutter.game.player;
 
-import static emu.grasscutter.config.Configuration.GAME_OPTIONS;
-import static emu.grasscutter.scripts.constants.EventType.EVENT_UNLOCK_TRANS_POINT;
-
 import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.binout.ScenePointEntry;
 import emu.grasscutter.data.excels.OpenStateData;
@@ -12,9 +9,13 @@ import emu.grasscutter.game.quest.enums.*;
 import emu.grasscutter.net.proto.RetcodeOuterClass.Retcode;
 import emu.grasscutter.scripts.data.ScriptArgs;
 import emu.grasscutter.server.packet.send.*;
+
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import static emu.grasscutter.config.Configuration.GAME_OPTIONS;
+import static emu.grasscutter.scripts.constants.EventType.EVENT_UNLOCK_TRANS_POINT;
+
 // @Entity
 public final class PlayerProgressManager extends BasePlayerDataManager {
     /******************************************************************************************************************
diff --git a/src/main/java/emu/grasscutter/game/player/TeamInfo.java b/src/main/java/emu/grasscutter/game/player/TeamInfo.java
index 794f36501..516abe766 100644
--- a/src/main/java/emu/grasscutter/game/player/TeamInfo.java
+++ b/src/main/java/emu/grasscutter/game/player/TeamInfo.java
@@ -1,12 +1,13 @@
 package emu.grasscutter.game.player;
 
-import static emu.grasscutter.config.Configuration.GAME_OPTIONS;
-
 import dev.morphia.annotations.Entity;
 import emu.grasscutter.game.avatar.Avatar;
 import emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam;
+
 import java.util.*;
 
+import static emu.grasscutter.config.Configuration.GAME_OPTIONS;
+
 @Entity
 public final class TeamInfo {
     private String name;
diff --git a/src/main/java/emu/grasscutter/game/player/TeamManager.java b/src/main/java/emu/grasscutter/game/player/TeamManager.java
index 159eaa699..e5d5e0045 100644
--- a/src/main/java/emu/grasscutter/game/player/TeamManager.java
+++ b/src/main/java/emu/grasscutter/game/player/TeamManager.java
@@ -1,42 +1,27 @@
 package emu.grasscutter.game.player;
 
-import dev.morphia.annotations.Entity;
-import dev.morphia.annotations.Transient;
-import emu.grasscutter.GameConstants;
-import emu.grasscutter.Grasscutter;
+import dev.morphia.annotations.*;
+import emu.grasscutter.*;
 import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.excels.avatar.AvatarSkillDepotData;
 import emu.grasscutter.game.avatar.Avatar;
-import emu.grasscutter.game.entity.EntityAvatar;
-import emu.grasscutter.game.entity.EntityBaseGadget;
-import emu.grasscutter.game.entity.EntityTeam;
-import emu.grasscutter.game.props.ElementType;
-import emu.grasscutter.game.props.EnterReason;
-import emu.grasscutter.game.props.FightProperty;
-import emu.grasscutter.game.world.Position;
-import emu.grasscutter.game.world.Scene;
-import emu.grasscutter.game.world.World;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.AbilityControlBlockOuterClass;
-import emu.grasscutter.net.proto.AbilityEmbryoOuterClass;
+import emu.grasscutter.game.entity.*;
+import emu.grasscutter.game.props.*;
+import emu.grasscutter.game.world.*;
+import emu.grasscutter.net.packet.*;
+import emu.grasscutter.net.proto.*;
 import emu.grasscutter.net.proto.EnterTypeOuterClass.EnterType;
 import emu.grasscutter.net.proto.MotionStateOuterClass.MotionState;
 import emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType;
 import emu.grasscutter.net.proto.RetcodeOuterClass.Retcode;
 import emu.grasscutter.net.proto.TrialAvatarGrantRecordOuterClass.TrialAvatarGrantRecord.GrantReason;
-import emu.grasscutter.net.proto.VisionTypeOuterClass;
 import emu.grasscutter.server.event.entity.EntityCreationEvent;
 import emu.grasscutter.server.event.player.*;
 import emu.grasscutter.server.packet.send.*;
 import emu.grasscutter.utils.Utils;
-import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
-import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
-import it.unimi.dsi.fastutil.ints.IntSet;
+import it.unimi.dsi.fastutil.ints.*;
 import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.val;
+import lombok.*;
 
 import java.util.*;
 import java.util.stream.Stream;
diff --git a/src/main/java/emu/grasscutter/game/props/ActionReason.java b/src/main/java/emu/grasscutter/game/props/ActionReason.java
index d9d4d6e75..bb2f213fa 100644
--- a/src/main/java/emu/grasscutter/game/props/ActionReason.java
+++ b/src/main/java/emu/grasscutter/game/props/ActionReason.java
@@ -1,9 +1,8 @@
 package emu.grasscutter.game.props;
 
-import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
-import java.util.HashMap;
-import java.util.Map;
+import it.unimi.dsi.fastutil.ints.*;
+
+import java.util.*;
 import java.util.stream.Stream;
 
 public enum ActionReason {
diff --git a/src/main/java/emu/grasscutter/game/props/ActivityType.java b/src/main/java/emu/grasscutter/game/props/ActivityType.java
index 36ae3d092..96080ba37 100644
--- a/src/main/java/emu/grasscutter/game/props/ActivityType.java
+++ b/src/main/java/emu/grasscutter/game/props/ActivityType.java
@@ -1,12 +1,10 @@
 package emu.grasscutter.game.props;
 
-import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
-import java.util.HashMap;
-import java.util.Map;
+import it.unimi.dsi.fastutil.ints.*;
+import lombok.*;
+
+import java.util.*;
 import java.util.stream.Stream;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
 
 @Getter
 @AllArgsConstructor
diff --git a/src/main/java/emu/grasscutter/game/props/CampTargetType.java b/src/main/java/emu/grasscutter/game/props/CampTargetType.java
index 7940f6528..e1da596a6 100644
--- a/src/main/java/emu/grasscutter/game/props/CampTargetType.java
+++ b/src/main/java/emu/grasscutter/game/props/CampTargetType.java
@@ -1,10 +1,9 @@
 package emu.grasscutter.game.props;
 
 import emu.grasscutter.scripts.constants.IntValueEnum;
-import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
-import java.util.HashMap;
-import java.util.Map;
+import it.unimi.dsi.fastutil.ints.*;
+
+import java.util.*;
 import java.util.stream.Stream;
 
 public enum CampTargetType implements IntValueEnum {
diff --git a/src/main/java/emu/grasscutter/game/props/ClimateType.java b/src/main/java/emu/grasscutter/game/props/ClimateType.java
index 92e8aba07..4160a3e3e 100644
--- a/src/main/java/emu/grasscutter/game/props/ClimateType.java
+++ b/src/main/java/emu/grasscutter/game/props/ClimateType.java
@@ -1,9 +1,8 @@
 package emu.grasscutter.game.props;
 
-import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
-import java.util.HashMap;
-import java.util.Map;
+import it.unimi.dsi.fastutil.ints.*;
+
+import java.util.*;
 import java.util.stream.Stream;
 
 public enum ClimateType {
diff --git a/src/main/java/emu/grasscutter/game/props/ElementType.java b/src/main/java/emu/grasscutter/game/props/ElementType.java
index 805fa5cbe..3be848bec 100644
--- a/src/main/java/emu/grasscutter/game/props/ElementType.java
+++ b/src/main/java/emu/grasscutter/game/props/ElementType.java
@@ -2,13 +2,12 @@ package emu.grasscutter.game.props;
 
 import emu.grasscutter.scripts.constants.IntValueEnum;
 import emu.grasscutter.utils.Utils;
-import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.stream.Stream;
+import it.unimi.dsi.fastutil.ints.*;
 import lombok.Getter;
 
+import java.util.*;
+import java.util.stream.Stream;
+
 public enum ElementType implements IntValueEnum {
     None(
             0,
diff --git a/src/main/java/emu/grasscutter/game/props/EnterReason.java b/src/main/java/emu/grasscutter/game/props/EnterReason.java
index e94f1f5a1..85d5c6014 100644
--- a/src/main/java/emu/grasscutter/game/props/EnterReason.java
+++ b/src/main/java/emu/grasscutter/game/props/EnterReason.java
@@ -1,9 +1,8 @@
 package emu.grasscutter.game.props;
 
-import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
-import java.util.HashMap;
-import java.util.Map;
+import it.unimi.dsi.fastutil.ints.*;
+
+import java.util.*;
 import java.util.stream.Stream;
 
 public enum EnterReason {
diff --git a/src/main/java/emu/grasscutter/game/props/EntityIdType.java b/src/main/java/emu/grasscutter/game/props/EntityIdType.java
index 4c333bad9..cee0a2981 100644
--- a/src/main/java/emu/grasscutter/game/props/EntityIdType.java
+++ b/src/main/java/emu/grasscutter/game/props/EntityIdType.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.game.props;
 
-import java.util.HashMap;
-import java.util.Map;
+import java.util.*;
 
 public enum EntityIdType {
     AVATAR(0x01),
diff --git a/src/main/java/emu/grasscutter/game/props/EntityType.java b/src/main/java/emu/grasscutter/game/props/EntityType.java
index 63e4240cf..9b4071048 100644
--- a/src/main/java/emu/grasscutter/game/props/EntityType.java
+++ b/src/main/java/emu/grasscutter/game/props/EntityType.java
@@ -1,10 +1,9 @@
 package emu.grasscutter.game.props;
 
 import emu.grasscutter.scripts.constants.IntValueEnum;
-import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
-import java.util.HashMap;
-import java.util.Map;
+import it.unimi.dsi.fastutil.ints.*;
+
+import java.util.*;
 import java.util.stream.Stream;
 
 public enum EntityType implements IntValueEnum {
diff --git a/src/main/java/emu/grasscutter/game/props/FetterState.java b/src/main/java/emu/grasscutter/game/props/FetterState.java
index ab3300b2c..1b36b0a34 100644
--- a/src/main/java/emu/grasscutter/game/props/FetterState.java
+++ b/src/main/java/emu/grasscutter/game/props/FetterState.java
@@ -1,9 +1,8 @@
 package emu.grasscutter.game.props;
 
-import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
-import java.util.HashMap;
-import java.util.Map;
+import it.unimi.dsi.fastutil.ints.*;
+
+import java.util.*;
 import java.util.stream.Stream;
 
 public enum FetterState {
diff --git a/src/main/java/emu/grasscutter/game/props/FightProperty.java b/src/main/java/emu/grasscutter/game/props/FightProperty.java
index e6d25242b..50c9ad611 100644
--- a/src/main/java/emu/grasscutter/game/props/FightProperty.java
+++ b/src/main/java/emu/grasscutter/game/props/FightProperty.java
@@ -1,13 +1,13 @@
 package emu.grasscutter.game.props;
 
-import static java.util.Map.entry;
+import it.unimi.dsi.fastutil.ints.*;
+import lombok.Getter;
 
-import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 import java.util.*;
 import java.util.function.Consumer;
 import java.util.stream.Stream;
-import lombok.Getter;
+
+import static java.util.Map.entry;
 
 public enum FightProperty {
     FIGHT_PROP_NONE(0),
diff --git a/src/main/java/emu/grasscutter/game/props/GrowCurve.java b/src/main/java/emu/grasscutter/game/props/GrowCurve.java
index 1fec4158b..5d4977a50 100644
--- a/src/main/java/emu/grasscutter/game/props/GrowCurve.java
+++ b/src/main/java/emu/grasscutter/game/props/GrowCurve.java
@@ -1,9 +1,8 @@
 package emu.grasscutter.game.props;
 
-import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
-import java.util.HashMap;
-import java.util.Map;
+import it.unimi.dsi.fastutil.ints.*;
+
+import java.util.*;
 import java.util.stream.Stream;
 
 public enum GrowCurve {
diff --git a/src/main/java/emu/grasscutter/game/props/ItemUseAction/ItemUseAddAllEnergy.java b/src/main/java/emu/grasscutter/game/props/ItemUseAction/ItemUseAddAllEnergy.java
index 4021e4bcb..8e2d5554c 100644
--- a/src/main/java/emu/grasscutter/game/props/ItemUseAction/ItemUseAddAllEnergy.java
+++ b/src/main/java/emu/grasscutter/game/props/ItemUseAction/ItemUseAddAllEnergy.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.game.props.ItemUseAction;
 
-import emu.grasscutter.game.props.ElementType;
-import emu.grasscutter.game.props.ItemUseOp;
+import emu.grasscutter.game.props.*;
 
 public class ItemUseAddAllEnergy extends ItemUseAddEnergy {
     private float energy = 0f;
diff --git a/src/main/java/emu/grasscutter/game/props/ItemUseAction/ItemUseAddElemEnergy.java b/src/main/java/emu/grasscutter/game/props/ItemUseAction/ItemUseAddElemEnergy.java
index 642b27682..a55084872 100644
--- a/src/main/java/emu/grasscutter/game/props/ItemUseAction/ItemUseAddElemEnergy.java
+++ b/src/main/java/emu/grasscutter/game/props/ItemUseAction/ItemUseAddElemEnergy.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.game.props.ItemUseAction;
 
-import emu.grasscutter.game.props.ElementType;
-import emu.grasscutter.game.props.ItemUseOp;
+import emu.grasscutter.game.props.*;
 
 public class ItemUseAddElemEnergy extends ItemUseAddEnergy {
     private ElementType element = ElementType.None;
diff --git a/src/main/java/emu/grasscutter/game/props/ItemUseAction/ItemUseAddItem.java b/src/main/java/emu/grasscutter/game/props/ItemUseAction/ItemUseAddItem.java
index dd874138c..c1b5207b3 100644
--- a/src/main/java/emu/grasscutter/game/props/ItemUseAction/ItemUseAddItem.java
+++ b/src/main/java/emu/grasscutter/game/props/ItemUseAction/ItemUseAddItem.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.game.props.ItemUseAction;
 
-import emu.grasscutter.game.props.ActionReason;
-import emu.grasscutter.game.props.ItemUseOp;
+import emu.grasscutter.game.props.*;
 
 public class ItemUseAddItem extends ItemUseInt {
     private int count = 0;
diff --git a/src/main/java/emu/grasscutter/game/props/ItemUseAction/ItemUseGainAvatar.java b/src/main/java/emu/grasscutter/game/props/ItemUseAction/ItemUseGainAvatar.java
index 1dae2822d..174f04075 100644
--- a/src/main/java/emu/grasscutter/game/props/ItemUseAction/ItemUseGainAvatar.java
+++ b/src/main/java/emu/grasscutter/game/props/ItemUseAction/ItemUseGainAvatar.java
@@ -3,6 +3,7 @@ package emu.grasscutter.game.props.ItemUseAction;
 import emu.grasscutter.game.avatar.Avatar;
 import emu.grasscutter.game.props.ItemUseOp;
 import emu.grasscutter.game.systems.InventorySystem;
+
 import java.util.Optional;
 
 public class ItemUseGainAvatar extends ItemUseInt {
diff --git a/src/main/java/emu/grasscutter/game/props/ItemUseAction/ItemUseOpenRandomChest.java b/src/main/java/emu/grasscutter/game/props/ItemUseAction/ItemUseOpenRandomChest.java
index 2c4932e58..e3fc63fc6 100644
--- a/src/main/java/emu/grasscutter/game/props/ItemUseAction/ItemUseOpenRandomChest.java
+++ b/src/main/java/emu/grasscutter/game/props/ItemUseAction/ItemUseOpenRandomChest.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.game.props.ItemUseAction;
 
 import emu.grasscutter.game.inventory.GameItem;
-import emu.grasscutter.game.props.ActionReason;
-import emu.grasscutter.game.props.ItemUseOp;
+import emu.grasscutter.game.props.*;
 
 public class ItemUseOpenRandomChest extends ItemUseInt {
     public ItemUseOpenRandomChest(String[] useParam) {
diff --git a/src/main/java/emu/grasscutter/game/props/ItemUseOp.java b/src/main/java/emu/grasscutter/game/props/ItemUseOp.java
index 809ed112c..564d0af7f 100644
--- a/src/main/java/emu/grasscutter/game/props/ItemUseOp.java
+++ b/src/main/java/emu/grasscutter/game/props/ItemUseOp.java
@@ -1,7 +1,7 @@
 package emu.grasscutter.game.props;
 
-import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
+import it.unimi.dsi.fastutil.ints.*;
+
 import java.util.stream.Stream;
 
 public enum ItemUseOp {
diff --git a/src/main/java/emu/grasscutter/game/props/ItemUseTarget.java b/src/main/java/emu/grasscutter/game/props/ItemUseTarget.java
index 9cc992cac..10dd42523 100644
--- a/src/main/java/emu/grasscutter/game/props/ItemUseTarget.java
+++ b/src/main/java/emu/grasscutter/game/props/ItemUseTarget.java
@@ -1,7 +1,7 @@
 package emu.grasscutter.game.props;
 
-import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
+import it.unimi.dsi.fastutil.ints.*;
+
 import java.util.stream.Stream;
 
 public enum ItemUseTarget {
diff --git a/src/main/java/emu/grasscutter/game/props/LifeState.java b/src/main/java/emu/grasscutter/game/props/LifeState.java
index ea6bd7310..9503c31e6 100644
--- a/src/main/java/emu/grasscutter/game/props/LifeState.java
+++ b/src/main/java/emu/grasscutter/game/props/LifeState.java
@@ -1,9 +1,8 @@
 package emu.grasscutter.game.props;
 
-import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
-import java.util.HashMap;
-import java.util.Map;
+import it.unimi.dsi.fastutil.ints.*;
+
+import java.util.*;
 import java.util.stream.Stream;
 
 public enum LifeState {
diff --git a/src/main/java/emu/grasscutter/game/props/MonsterType.java b/src/main/java/emu/grasscutter/game/props/MonsterType.java
index aff6eb19c..fe6cb948f 100644
--- a/src/main/java/emu/grasscutter/game/props/MonsterType.java
+++ b/src/main/java/emu/grasscutter/game/props/MonsterType.java
@@ -1,9 +1,8 @@
 package emu.grasscutter.game.props;
 
-import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
-import java.util.HashMap;
-import java.util.Map;
+import it.unimi.dsi.fastutil.ints.*;
+
+import java.util.*;
 import java.util.stream.Stream;
 
 public enum MonsterType {
diff --git a/src/main/java/emu/grasscutter/game/props/PlayerProperty.java b/src/main/java/emu/grasscutter/game/props/PlayerProperty.java
index 4c5995873..0f41f41c8 100644
--- a/src/main/java/emu/grasscutter/game/props/PlayerProperty.java
+++ b/src/main/java/emu/grasscutter/game/props/PlayerProperty.java
@@ -1,9 +1,10 @@
 package emu.grasscutter.game.props;
 
 import it.unimi.dsi.fastutil.ints.*;
-import java.util.stream.Stream;
 import lombok.Getter;
 
+import java.util.stream.Stream;
+
 public enum PlayerProperty {
     PROP_NONE(0),
     PROP_EXP(1001, 0),
diff --git a/src/main/java/emu/grasscutter/game/props/RefreshType.java b/src/main/java/emu/grasscutter/game/props/RefreshType.java
index 8c506256b..17e1acaae 100644
--- a/src/main/java/emu/grasscutter/game/props/RefreshType.java
+++ b/src/main/java/emu/grasscutter/game/props/RefreshType.java
@@ -1,9 +1,8 @@
 package emu.grasscutter.game.props;
 
-import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
-import java.util.HashMap;
-import java.util.Map;
+import it.unimi.dsi.fastutil.ints.*;
+
+import java.util.*;
 import java.util.stream.Stream;
 
 public enum RefreshType {
diff --git a/src/main/java/emu/grasscutter/game/props/SceneType.java b/src/main/java/emu/grasscutter/game/props/SceneType.java
index 7c01a6a0b..6023e41d7 100644
--- a/src/main/java/emu/grasscutter/game/props/SceneType.java
+++ b/src/main/java/emu/grasscutter/game/props/SceneType.java
@@ -1,9 +1,8 @@
 package emu.grasscutter.game.props;
 
-import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
-import java.util.HashMap;
-import java.util.Map;
+import it.unimi.dsi.fastutil.ints.*;
+
+import java.util.*;
 import java.util.stream.Stream;
 
 public enum SceneType {
diff --git a/src/main/java/emu/grasscutter/game/props/ServerBuffType.java b/src/main/java/emu/grasscutter/game/props/ServerBuffType.java
index cb04e7d6b..6aa9f66c9 100644
--- a/src/main/java/emu/grasscutter/game/props/ServerBuffType.java
+++ b/src/main/java/emu/grasscutter/game/props/ServerBuffType.java
@@ -1,7 +1,7 @@
 package emu.grasscutter.game.props;
 
-import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
+import it.unimi.dsi.fastutil.ints.*;
+
 import java.util.stream.Stream;
 
 public enum ServerBuffType {
diff --git a/src/main/java/emu/grasscutter/game/props/WatcherTriggerType.java b/src/main/java/emu/grasscutter/game/props/WatcherTriggerType.java
index b31556b11..7f60f84fd 100644
--- a/src/main/java/emu/grasscutter/game/props/WatcherTriggerType.java
+++ b/src/main/java/emu/grasscutter/game/props/WatcherTriggerType.java
@@ -1,9 +1,8 @@
 package emu.grasscutter.game.props;
 
-import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
-import java.util.HashMap;
-import java.util.Map;
+import it.unimi.dsi.fastutil.ints.*;
+
+import java.util.*;
 import java.util.stream.Stream;
 
 public enum WatcherTriggerType {
diff --git a/src/main/java/emu/grasscutter/game/props/WeaponType.java b/src/main/java/emu/grasscutter/game/props/WeaponType.java
index 1165c28a2..4a5227cb1 100644
--- a/src/main/java/emu/grasscutter/game/props/WeaponType.java
+++ b/src/main/java/emu/grasscutter/game/props/WeaponType.java
@@ -1,9 +1,8 @@
 package emu.grasscutter.game.props;
 
-import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
-import java.util.HashMap;
-import java.util.Map;
+import it.unimi.dsi.fastutil.ints.*;
+
+import java.util.*;
 import java.util.stream.Stream;
 
 public enum WeaponType {
diff --git a/src/main/java/emu/grasscutter/game/quest/GameMainQuest.java b/src/main/java/emu/grasscutter/game/quest/GameMainQuest.java
index a03cbc6ea..1cd3d95f7 100644
--- a/src/main/java/emu/grasscutter/game/quest/GameMainQuest.java
+++ b/src/main/java/emu/grasscutter/game/quest/GameMainQuest.java
@@ -15,13 +15,13 @@ import emu.grasscutter.game.world.Position;
 import emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest;
 import emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest;
 import emu.grasscutter.server.packet.send.*;
-import emu.grasscutter.utils.ConversionUtils;
-import emu.grasscutter.utils.Utils;
-import java.util.*;
-import java.util.stream.Collectors;
+import emu.grasscutter.utils.*;
 import lombok.*;
 import org.bson.types.ObjectId;
 
+import java.util.*;
+import java.util.stream.Collectors;
+
 @Entity(value = "quests", useDiscriminator = false)
 public class GameMainQuest {
     @Id private ObjectId id;
diff --git a/src/main/java/emu/grasscutter/game/quest/GameQuest.java b/src/main/java/emu/grasscutter/game/quest/GameQuest.java
index c62b3c0ef..2cf59fd2e 100644
--- a/src/main/java/emu/grasscutter/game/quest/GameQuest.java
+++ b/src/main/java/emu/grasscutter/game/quest/GameQuest.java
@@ -16,10 +16,11 @@ import emu.grasscutter.server.event.player.PlayerCompleteQuestEvent;
 import emu.grasscutter.server.packet.send.*;
 import emu.grasscutter.utils.Utils;
 import it.unimi.dsi.fastutil.ints.IntIntImmutablePair;
-import java.util.*;
-import javax.script.Bindings;
 import lombok.*;
 
+import javax.script.Bindings;
+import java.util.*;
+
 @Entity
 public class GameQuest {
     @Transient @Getter @Setter private GameMainQuest mainQuest;
diff --git a/src/main/java/emu/grasscutter/game/quest/ItemGiveRecord.java b/src/main/java/emu/grasscutter/game/quest/ItemGiveRecord.java
index 4e1770030..05146b62e 100644
--- a/src/main/java/emu/grasscutter/game/quest/ItemGiveRecord.java
+++ b/src/main/java/emu/grasscutter/game/quest/ItemGiveRecord.java
@@ -4,9 +4,10 @@ import dev.morphia.annotations.Entity;
 import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.excels.giving.GivingData.GiveMethod;
 import emu.grasscutter.net.proto.GivingRecordOuterClass.GivingRecord;
-import java.util.*;
 import lombok.*;
 
+import java.util.*;
+
 @Data
 @Entity
 @Builder
diff --git a/src/main/java/emu/grasscutter/game/quest/QuestEncryptionKey.java b/src/main/java/emu/grasscutter/game/quest/QuestEncryptionKey.java
index 9d01bbb64..e40c329dd 100644
--- a/src/main/java/emu/grasscutter/game/quest/QuestEncryptionKey.java
+++ b/src/main/java/emu/grasscutter/game/quest/QuestEncryptionKey.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.game.quest;
 
-import lombok.AccessLevel;
-import lombok.Data;
+import lombok.*;
 import lombok.experimental.FieldDefaults;
 
 @Data
diff --git a/src/main/java/emu/grasscutter/game/quest/QuestGroupSuite.java b/src/main/java/emu/grasscutter/game/quest/QuestGroupSuite.java
index 9865f6d1e..80cb053fb 100644
--- a/src/main/java/emu/grasscutter/game/quest/QuestGroupSuite.java
+++ b/src/main/java/emu/grasscutter/game/quest/QuestGroupSuite.java
@@ -1,9 +1,7 @@
 package emu.grasscutter.game.quest;
 
 import dev.morphia.annotations.Entity;
-import lombok.AccessLevel;
-import lombok.Builder;
-import lombok.Data;
+import lombok.*;
 import lombok.experimental.FieldDefaults;
 
 @Entity
diff --git a/src/main/java/emu/grasscutter/game/quest/QuestManager.java b/src/main/java/emu/grasscutter/game/quest/QuestManager.java
index 9817227ba..53acadb24 100644
--- a/src/main/java/emu/grasscutter/game/quest/QuestManager.java
+++ b/src/main/java/emu/grasscutter/game/quest/QuestManager.java
@@ -1,8 +1,5 @@
 package emu.grasscutter.game.quest;
 
-import static emu.grasscutter.GameConstants.DEBUG;
-import static emu.grasscutter.config.Configuration.*;
-
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.binout.*;
@@ -15,12 +12,16 @@ import emu.grasscutter.net.proto.GivingRecordOuterClass.GivingRecord;
 import emu.grasscutter.server.packet.send.*;
 import io.netty.util.concurrent.FastThreadLocalThread;
 import it.unimi.dsi.fastutil.ints.*;
+import lombok.*;
+
+import javax.annotation.Nonnull;
 import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
-import javax.annotation.Nonnull;
-import lombok.*;
+
+import static emu.grasscutter.GameConstants.DEBUG;
+import static emu.grasscutter.config.Configuration.*;
 
 public final class QuestManager extends BasePlayerManager {
     @Getter private final Player player;
diff --git a/src/main/java/emu/grasscutter/game/quest/QuestValueCond.java b/src/main/java/emu/grasscutter/game/quest/QuestValueCond.java
index 482ed8def..a1e1bac82 100644
--- a/src/main/java/emu/grasscutter/game/quest/QuestValueCond.java
+++ b/src/main/java/emu/grasscutter/game/quest/QuestValueCond.java
@@ -1,8 +1,8 @@
 package emu.grasscutter.game.quest;
 
 import emu.grasscutter.game.quest.enums.QuestCond;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
+
+import java.lang.annotation.*;
 
 @Retention(RetentionPolicy.RUNTIME)
 public @interface QuestValueCond {
diff --git a/src/main/java/emu/grasscutter/game/quest/QuestValueContent.java b/src/main/java/emu/grasscutter/game/quest/QuestValueContent.java
index a8e6b850b..c9b3dad56 100644
--- a/src/main/java/emu/grasscutter/game/quest/QuestValueContent.java
+++ b/src/main/java/emu/grasscutter/game/quest/QuestValueContent.java
@@ -1,8 +1,8 @@
 package emu.grasscutter.game.quest;
 
 import emu.grasscutter.game.quest.enums.QuestContent;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
+
+import java.lang.annotation.*;
 
 @Retention(RetentionPolicy.RUNTIME)
 public @interface QuestValueContent {
diff --git a/src/main/java/emu/grasscutter/game/quest/QuestValueExec.java b/src/main/java/emu/grasscutter/game/quest/QuestValueExec.java
index 39ea7c575..9011537e0 100644
--- a/src/main/java/emu/grasscutter/game/quest/QuestValueExec.java
+++ b/src/main/java/emu/grasscutter/game/quest/QuestValueExec.java
@@ -1,8 +1,8 @@
 package emu.grasscutter.game.quest;
 
 import emu.grasscutter.game.quest.enums.QuestExec;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
+
+import java.lang.annotation.*;
 
 @Retention(RetentionPolicy.RUNTIME)
 public @interface QuestValueExec {
diff --git a/src/main/java/emu/grasscutter/game/quest/RewindData.java b/src/main/java/emu/grasscutter/game/quest/RewindData.java
index d4a4e676c..e49b4acce 100644
--- a/src/main/java/emu/grasscutter/game/quest/RewindData.java
+++ b/src/main/java/emu/grasscutter/game/quest/RewindData.java
@@ -1,8 +1,8 @@
 package emu.grasscutter.game.quest;
 
+import lombok.*;
+
 import java.util.List;
-import lombok.Data;
-import lombok.Getter;
 
 @Data
 public class RewindData {
diff --git a/src/main/java/emu/grasscutter/game/quest/TeleportData.java b/src/main/java/emu/grasscutter/game/quest/TeleportData.java
index 83c143f5c..8818ad4f2 100644
--- a/src/main/java/emu/grasscutter/game/quest/TeleportData.java
+++ b/src/main/java/emu/grasscutter/game/quest/TeleportData.java
@@ -1,8 +1,9 @@
 package emu.grasscutter.game.quest;
 
-import java.util.List;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class TeleportData {
     List transmit_points;
diff --git a/src/main/java/emu/grasscutter/game/quest/conditions/BaseCondition.java b/src/main/java/emu/grasscutter/game/quest/conditions/BaseCondition.java
index e53c4cc0e..513c3016e 100644
--- a/src/main/java/emu/grasscutter/game/quest/conditions/BaseCondition.java
+++ b/src/main/java/emu/grasscutter/game/quest/conditions/BaseCondition.java
@@ -1,11 +1,11 @@
 package emu.grasscutter.game.quest.conditions;
 
-import static emu.grasscutter.game.quest.enums.QuestCond.QUEST_COND_UNKNOWN;
-
 import emu.grasscutter.data.excels.quest.QuestData;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.quest.QuestValueCond;
 
+import static emu.grasscutter.game.quest.enums.QuestCond.QUEST_COND_UNKNOWN;
+
 @QuestValueCond(QUEST_COND_UNKNOWN)
 public class BaseCondition {
 
diff --git a/src/main/java/emu/grasscutter/game/quest/conditions/ConditionActivityCond.java b/src/main/java/emu/grasscutter/game/quest/conditions/ConditionActivityCond.java
index 8a62b4fc4..0eac48945 100644
--- a/src/main/java/emu/grasscutter/game/quest/conditions/ConditionActivityCond.java
+++ b/src/main/java/emu/grasscutter/game/quest/conditions/ConditionActivityCond.java
@@ -1,12 +1,12 @@
 package emu.grasscutter.game.quest.conditions;
 
-import static emu.grasscutter.game.quest.enums.QuestCond.QUEST_COND_ACTIVITY_COND;
-
 import emu.grasscutter.data.excels.quest.QuestData;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.quest.QuestValueCond;
 import lombok.val;
 
+import static emu.grasscutter.game.quest.enums.QuestCond.QUEST_COND_ACTIVITY_COND;
+
 @QuestValueCond(QUEST_COND_ACTIVITY_COND)
 public class ConditionActivityCond extends BaseCondition {
 
diff --git a/src/main/java/emu/grasscutter/game/quest/conditions/ConditionActivityEnd.java b/src/main/java/emu/grasscutter/game/quest/conditions/ConditionActivityEnd.java
index 4aa25ec02..8e5a107e0 100644
--- a/src/main/java/emu/grasscutter/game/quest/conditions/ConditionActivityEnd.java
+++ b/src/main/java/emu/grasscutter/game/quest/conditions/ConditionActivityEnd.java
@@ -1,12 +1,12 @@
 package emu.grasscutter.game.quest.conditions;
 
-import static emu.grasscutter.game.quest.enums.QuestCond.QUEST_COND_ACTIVITY_END;
-
 import emu.grasscutter.data.excels.quest.QuestData;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.quest.QuestValueCond;
 import lombok.val;
 
+import static emu.grasscutter.game.quest.enums.QuestCond.QUEST_COND_ACTIVITY_END;
+
 @QuestValueCond(QUEST_COND_ACTIVITY_END)
 public class ConditionActivityEnd extends BaseCondition {
 
diff --git a/src/main/java/emu/grasscutter/game/quest/conditions/ConditionActivityOpen.java b/src/main/java/emu/grasscutter/game/quest/conditions/ConditionActivityOpen.java
index 9ebe7993f..4686f783c 100644
--- a/src/main/java/emu/grasscutter/game/quest/conditions/ConditionActivityOpen.java
+++ b/src/main/java/emu/grasscutter/game/quest/conditions/ConditionActivityOpen.java
@@ -1,12 +1,12 @@
 package emu.grasscutter.game.quest.conditions;
 
-import static emu.grasscutter.game.quest.enums.QuestCond.QUEST_COND_ACTIVITY_OPEN;
-
 import emu.grasscutter.data.excels.quest.QuestData;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.quest.QuestValueCond;
 import lombok.val;
 
+import static emu.grasscutter.game.quest.enums.QuestCond.QUEST_COND_ACTIVITY_OPEN;
+
 @QuestValueCond(QUEST_COND_ACTIVITY_OPEN)
 public class ConditionActivityOpen extends BaseCondition {
 
diff --git a/src/main/java/emu/grasscutter/game/quest/conditions/ConditionCompleteTalk.java b/src/main/java/emu/grasscutter/game/quest/conditions/ConditionCompleteTalk.java
index c9c03ad31..8fcdd8ca1 100644
--- a/src/main/java/emu/grasscutter/game/quest/conditions/ConditionCompleteTalk.java
+++ b/src/main/java/emu/grasscutter/game/quest/conditions/ConditionCompleteTalk.java
@@ -1,12 +1,12 @@
 package emu.grasscutter.game.quest.conditions;
 
-import static emu.grasscutter.game.quest.enums.QuestCond.QUEST_COND_COMPLETE_TALK;
-
 import emu.grasscutter.data.excels.quest.QuestData;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.quest.QuestValueCond;
 import lombok.val;
 
+import static emu.grasscutter.game.quest.enums.QuestCond.QUEST_COND_COMPLETE_TALK;
+
 @QuestValueCond(QUEST_COND_COMPLETE_TALK)
 public class ConditionCompleteTalk extends BaseCondition {
 
diff --git a/src/main/java/emu/grasscutter/game/quest/conditions/ConditionItemNumLessThan.java b/src/main/java/emu/grasscutter/game/quest/conditions/ConditionItemNumLessThan.java
index 8ea52cf76..0ac694d85 100644
--- a/src/main/java/emu/grasscutter/game/quest/conditions/ConditionItemNumLessThan.java
+++ b/src/main/java/emu/grasscutter/game/quest/conditions/ConditionItemNumLessThan.java
@@ -1,12 +1,12 @@
 package emu.grasscutter.game.quest.conditions;
 
-import static emu.grasscutter.game.quest.enums.QuestCond.QUEST_COND_ITEM_NUM_LESS_THAN;
-
 import emu.grasscutter.data.excels.quest.QuestData;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.quest.QuestValueCond;
 import lombok.val;
 
+import static emu.grasscutter.game.quest.enums.QuestCond.QUEST_COND_ITEM_NUM_LESS_THAN;
+
 @QuestValueCond(QUEST_COND_ITEM_NUM_LESS_THAN)
 public class ConditionItemNumLessThan extends BaseCondition {
 
diff --git a/src/main/java/emu/grasscutter/game/quest/conditions/ConditionLuaNotify.java b/src/main/java/emu/grasscutter/game/quest/conditions/ConditionLuaNotify.java
index ffea10f7a..c704c6f5b 100644
--- a/src/main/java/emu/grasscutter/game/quest/conditions/ConditionLuaNotify.java
+++ b/src/main/java/emu/grasscutter/game/quest/conditions/ConditionLuaNotify.java
@@ -1,12 +1,12 @@
 package emu.grasscutter.game.quest.conditions;
 
-import static emu.grasscutter.game.quest.enums.QuestCond.QUEST_COND_LUA_NOTIFY;
-
 import emu.grasscutter.data.excels.quest.QuestData;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.quest.QuestValueCond;
 import lombok.val;
 
+import static emu.grasscutter.game.quest.enums.QuestCond.QUEST_COND_LUA_NOTIFY;
+
 @QuestValueCond(QUEST_COND_LUA_NOTIFY)
 public class ConditionLuaNotify extends BaseCondition {
 
diff --git a/src/main/java/emu/grasscutter/game/quest/conditions/ConditionPackHaveItem.java b/src/main/java/emu/grasscutter/game/quest/conditions/ConditionPackHaveItem.java
index 14bf7c662..667cd7855 100644
--- a/src/main/java/emu/grasscutter/game/quest/conditions/ConditionPackHaveItem.java
+++ b/src/main/java/emu/grasscutter/game/quest/conditions/ConditionPackHaveItem.java
@@ -1,12 +1,12 @@
 package emu.grasscutter.game.quest.conditions;
 
-import static emu.grasscutter.game.quest.enums.QuestCond.QUEST_COND_PACK_HAVE_ITEM;
-
 import emu.grasscutter.data.excels.quest.QuestData;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.quest.QuestValueCond;
 import lombok.val;
 
+import static emu.grasscutter.game.quest.enums.QuestCond.QUEST_COND_PACK_HAVE_ITEM;
+
 @QuestValueCond(QUEST_COND_PACK_HAVE_ITEM)
 public class ConditionPackHaveItem extends BaseCondition {
 
diff --git a/src/main/java/emu/grasscutter/game/quest/conditions/ConditionPlayerLevelEqualGreater.java b/src/main/java/emu/grasscutter/game/quest/conditions/ConditionPlayerLevelEqualGreater.java
index a909f13fe..1df185b84 100644
--- a/src/main/java/emu/grasscutter/game/quest/conditions/ConditionPlayerLevelEqualGreater.java
+++ b/src/main/java/emu/grasscutter/game/quest/conditions/ConditionPlayerLevelEqualGreater.java
@@ -1,12 +1,12 @@
 package emu.grasscutter.game.quest.conditions;
 
-import static emu.grasscutter.game.quest.enums.QuestCond.QUEST_COND_PLAYER_LEVEL_EQUAL_GREATER;
-
 import emu.grasscutter.data.excels.quest.QuestData;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.quest.QuestValueCond;
 import lombok.val;
 
+import static emu.grasscutter.game.quest.enums.QuestCond.QUEST_COND_PLAYER_LEVEL_EQUAL_GREATER;
+
 @QuestValueCond(QUEST_COND_PLAYER_LEVEL_EQUAL_GREATER)
 public class ConditionPlayerLevelEqualGreater extends BaseCondition {
 
diff --git a/src/main/java/emu/grasscutter/game/quest/conditions/ConditionQuestGlobalVarEqual.java b/src/main/java/emu/grasscutter/game/quest/conditions/ConditionQuestGlobalVarEqual.java
index d9808a6a6..52382a3ca 100644
--- a/src/main/java/emu/grasscutter/game/quest/conditions/ConditionQuestGlobalVarEqual.java
+++ b/src/main/java/emu/grasscutter/game/quest/conditions/ConditionQuestGlobalVarEqual.java
@@ -1,13 +1,13 @@
 package emu.grasscutter.game.quest.conditions;
 
-import static emu.grasscutter.game.quest.enums.QuestCond.QUEST_COND_QUEST_GLOBAL_VAR_EQUAL;
-
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.data.excels.quest.QuestData;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.quest.QuestValueCond;
 import lombok.val;
 
+import static emu.grasscutter.game.quest.enums.QuestCond.QUEST_COND_QUEST_GLOBAL_VAR_EQUAL;
+
 @QuestValueCond(QUEST_COND_QUEST_GLOBAL_VAR_EQUAL)
 public class ConditionQuestGlobalVarEqual extends BaseCondition {
 
diff --git a/src/main/java/emu/grasscutter/game/quest/conditions/ConditionQuestGlobalVarGreater.java b/src/main/java/emu/grasscutter/game/quest/conditions/ConditionQuestGlobalVarGreater.java
index 9f846c00a..1d9415da9 100644
--- a/src/main/java/emu/grasscutter/game/quest/conditions/ConditionQuestGlobalVarGreater.java
+++ b/src/main/java/emu/grasscutter/game/quest/conditions/ConditionQuestGlobalVarGreater.java
@@ -1,13 +1,13 @@
 package emu.grasscutter.game.quest.conditions;
 
-import static emu.grasscutter.game.quest.enums.QuestCond.QUEST_COND_QUEST_GLOBAL_VAR_GREATER;
-
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.data.excels.quest.QuestData;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.quest.QuestValueCond;
 import lombok.val;
 
+import static emu.grasscutter.game.quest.enums.QuestCond.QUEST_COND_QUEST_GLOBAL_VAR_GREATER;
+
 @QuestValueCond(QUEST_COND_QUEST_GLOBAL_VAR_GREATER)
 public class ConditionQuestGlobalVarGreater extends BaseCondition {
 
diff --git a/src/main/java/emu/grasscutter/game/quest/conditions/ConditionQuestGlobalVarLess.java b/src/main/java/emu/grasscutter/game/quest/conditions/ConditionQuestGlobalVarLess.java
index f711ad31d..571dab8be 100644
--- a/src/main/java/emu/grasscutter/game/quest/conditions/ConditionQuestGlobalVarLess.java
+++ b/src/main/java/emu/grasscutter/game/quest/conditions/ConditionQuestGlobalVarLess.java
@@ -1,13 +1,13 @@
 package emu.grasscutter.game.quest.conditions;
 
-import static emu.grasscutter.game.quest.enums.QuestCond.QUEST_COND_QUEST_GLOBAL_VAR_LESS;
-
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.data.excels.quest.QuestData;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.quest.QuestValueCond;
 import lombok.val;
 
+import static emu.grasscutter.game.quest.enums.QuestCond.QUEST_COND_QUEST_GLOBAL_VAR_LESS;
+
 @QuestValueCond(QUEST_COND_QUEST_GLOBAL_VAR_LESS)
 public class ConditionQuestGlobalVarLess extends BaseCondition {
 
diff --git a/src/main/java/emu/grasscutter/game/quest/conditions/ConditionQuestVarEqual.java b/src/main/java/emu/grasscutter/game/quest/conditions/ConditionQuestVarEqual.java
index fcccd5343..7f160878f 100644
--- a/src/main/java/emu/grasscutter/game/quest/conditions/ConditionQuestVarEqual.java
+++ b/src/main/java/emu/grasscutter/game/quest/conditions/ConditionQuestVarEqual.java
@@ -1,9 +1,9 @@
 package emu.grasscutter.game.quest.conditions;
 
-import static emu.grasscutter.game.quest.enums.QuestCond.QUEST_COND_QUEST_VAR_EQUAL;
-
 import emu.grasscutter.game.quest.QuestValueCond;
 
+import static emu.grasscutter.game.quest.enums.QuestCond.QUEST_COND_QUEST_VAR_EQUAL;
+
 @QuestValueCond(QUEST_COND_QUEST_VAR_EQUAL)
 public class ConditionQuestVarEqual extends BaseConditionQuestVar {
 
diff --git a/src/main/java/emu/grasscutter/game/quest/conditions/ConditionQuestVarGreater.java b/src/main/java/emu/grasscutter/game/quest/conditions/ConditionQuestVarGreater.java
index 3c6da720c..dcf283866 100644
--- a/src/main/java/emu/grasscutter/game/quest/conditions/ConditionQuestVarGreater.java
+++ b/src/main/java/emu/grasscutter/game/quest/conditions/ConditionQuestVarGreater.java
@@ -1,9 +1,9 @@
 package emu.grasscutter.game.quest.conditions;
 
-import static emu.grasscutter.game.quest.enums.QuestCond.QUEST_COND_QUEST_VAR_GREATER;
-
 import emu.grasscutter.game.quest.QuestValueCond;
 
+import static emu.grasscutter.game.quest.enums.QuestCond.QUEST_COND_QUEST_VAR_GREATER;
+
 @QuestValueCond(QUEST_COND_QUEST_VAR_GREATER)
 public class ConditionQuestVarGreater extends BaseConditionQuestVar {
 
diff --git a/src/main/java/emu/grasscutter/game/quest/conditions/ConditionQuestVarLess.java b/src/main/java/emu/grasscutter/game/quest/conditions/ConditionQuestVarLess.java
index 2f1ba77d1..b56693709 100644
--- a/src/main/java/emu/grasscutter/game/quest/conditions/ConditionQuestVarLess.java
+++ b/src/main/java/emu/grasscutter/game/quest/conditions/ConditionQuestVarLess.java
@@ -1,9 +1,9 @@
 package emu.grasscutter.game.quest.conditions;
 
-import static emu.grasscutter.game.quest.enums.QuestCond.QUEST_COND_QUEST_VAR_LESS;
-
 import emu.grasscutter.game.quest.QuestValueCond;
 
+import static emu.grasscutter.game.quest.enums.QuestCond.QUEST_COND_QUEST_VAR_LESS;
+
 @QuestValueCond(QUEST_COND_QUEST_VAR_LESS)
 public class ConditionQuestVarLess extends BaseConditionQuestVar {
 
diff --git a/src/main/java/emu/grasscutter/game/quest/conditions/ConditionStateEqual.java b/src/main/java/emu/grasscutter/game/quest/conditions/ConditionStateEqual.java
index 76298df0c..f26ae77f7 100644
--- a/src/main/java/emu/grasscutter/game/quest/conditions/ConditionStateEqual.java
+++ b/src/main/java/emu/grasscutter/game/quest/conditions/ConditionStateEqual.java
@@ -1,11 +1,11 @@
 package emu.grasscutter.game.quest.conditions;
 
-import static emu.grasscutter.game.quest.enums.QuestCond.QUEST_COND_STATE_EQUAL;
-
 import emu.grasscutter.data.excels.quest.QuestData;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.quest.QuestValueCond;
 
+import static emu.grasscutter.game.quest.enums.QuestCond.QUEST_COND_STATE_EQUAL;
+
 @QuestValueCond(QUEST_COND_STATE_EQUAL)
 public class ConditionStateEqual extends BaseCondition {
 
diff --git a/src/main/java/emu/grasscutter/game/quest/conditions/ConditionStateNotEqual.java b/src/main/java/emu/grasscutter/game/quest/conditions/ConditionStateNotEqual.java
index 946ef7420..1f46a4c70 100644
--- a/src/main/java/emu/grasscutter/game/quest/conditions/ConditionStateNotEqual.java
+++ b/src/main/java/emu/grasscutter/game/quest/conditions/ConditionStateNotEqual.java
@@ -1,11 +1,11 @@
 package emu.grasscutter.game.quest.conditions;
 
-import static emu.grasscutter.game.quest.enums.QuestCond.QUEST_COND_STATE_NOT_EQUAL;
-
 import emu.grasscutter.data.excels.quest.QuestData;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.quest.QuestValueCond;
 
+import static emu.grasscutter.game.quest.enums.QuestCond.QUEST_COND_STATE_NOT_EQUAL;
+
 @QuestValueCond(QUEST_COND_STATE_NOT_EQUAL)
 public class ConditionStateNotEqual extends BaseCondition {
 
diff --git a/src/main/java/emu/grasscutter/game/quest/content/BaseContent.java b/src/main/java/emu/grasscutter/game/quest/content/BaseContent.java
index 4f244c395..7b5527d93 100644
--- a/src/main/java/emu/grasscutter/game/quest/content/BaseContent.java
+++ b/src/main/java/emu/grasscutter/game/quest/content/BaseContent.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.game.quest.content;
 
 import emu.grasscutter.data.excels.quest.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueContent;
+import emu.grasscutter.game.quest.*;
 import emu.grasscutter.game.quest.enums.QuestContent;
 import emu.grasscutter.game.quest.handlers.QuestBaseHandler;
 
diff --git a/src/main/java/emu/grasscutter/game/quest/content/ContentAddQuestProgress.java b/src/main/java/emu/grasscutter/game/quest/content/ContentAddQuestProgress.java
index 3dc6ff573..474c2c439 100644
--- a/src/main/java/emu/grasscutter/game/quest/content/ContentAddQuestProgress.java
+++ b/src/main/java/emu/grasscutter/game/quest/content/ContentAddQuestProgress.java
@@ -1,12 +1,11 @@
 package emu.grasscutter.game.quest.content;
 
-import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_ADD_QUEST_PROGRESS;
-
 import emu.grasscutter.data.excels.quest.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueContent;
+import emu.grasscutter.game.quest.*;
 import lombok.val;
 
+import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_ADD_QUEST_PROGRESS;
+
 @QuestValueContent(QUEST_CONTENT_ADD_QUEST_PROGRESS)
 public class ContentAddQuestProgress extends BaseContent {
 
diff --git a/src/main/java/emu/grasscutter/game/quest/content/ContentAnyManualTransport.java b/src/main/java/emu/grasscutter/game/quest/content/ContentAnyManualTransport.java
index 595f6d37b..825dd1852 100644
--- a/src/main/java/emu/grasscutter/game/quest/content/ContentAnyManualTransport.java
+++ b/src/main/java/emu/grasscutter/game/quest/content/ContentAnyManualTransport.java
@@ -1,10 +1,9 @@
 package emu.grasscutter.game.quest.content;
 
-import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_ANY_MANUAL_TRANSPORT;
-
 import emu.grasscutter.data.excels.quest.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueContent;
+import emu.grasscutter.game.quest.*;
+
+import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_ANY_MANUAL_TRANSPORT;
 
 @QuestValueContent(QUEST_CONTENT_ANY_MANUAL_TRANSPORT)
 public class ContentAnyManualTransport extends BaseContent {
diff --git a/src/main/java/emu/grasscutter/game/quest/content/ContentClearGroupMonster.java b/src/main/java/emu/grasscutter/game/quest/content/ContentClearGroupMonster.java
index db753ccfb..341d0d094 100644
--- a/src/main/java/emu/grasscutter/game/quest/content/ContentClearGroupMonster.java
+++ b/src/main/java/emu/grasscutter/game/quest/content/ContentClearGroupMonster.java
@@ -1,12 +1,11 @@
 package emu.grasscutter.game.quest.content;
 
-import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_CLEAR_GROUP_MONSTER;
-
 import emu.grasscutter.data.excels.quest.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueContent;
+import emu.grasscutter.game.quest.*;
 import lombok.val;
 
+import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_CLEAR_GROUP_MONSTER;
+
 @QuestValueContent(QUEST_CONTENT_CLEAR_GROUP_MONSTER)
 public class ContentClearGroupMonster extends BaseContent {
 
diff --git a/src/main/java/emu/grasscutter/game/quest/content/ContentCompleteAnyTalk.java b/src/main/java/emu/grasscutter/game/quest/content/ContentCompleteAnyTalk.java
index 6a2b4c23c..f332d9827 100644
--- a/src/main/java/emu/grasscutter/game/quest/content/ContentCompleteAnyTalk.java
+++ b/src/main/java/emu/grasscutter/game/quest/content/ContentCompleteAnyTalk.java
@@ -1,12 +1,13 @@
 package emu.grasscutter.game.quest.content;
 
-import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_COMPLETE_ANY_TALK;
-
 import emu.grasscutter.data.excels.quest.QuestData;
 import emu.grasscutter.game.quest.*;
-import java.util.Arrays;
 import lombok.val;
 
+import java.util.Arrays;
+
+import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_COMPLETE_ANY_TALK;
+
 @QuestValueContent(QUEST_CONTENT_COMPLETE_ANY_TALK)
 public class ContentCompleteAnyTalk extends BaseContent {
 
diff --git a/src/main/java/emu/grasscutter/game/quest/content/ContentCompleteTalk.java b/src/main/java/emu/grasscutter/game/quest/content/ContentCompleteTalk.java
index b93dffc81..1df8d9997 100644
--- a/src/main/java/emu/grasscutter/game/quest/content/ContentCompleteTalk.java
+++ b/src/main/java/emu/grasscutter/game/quest/content/ContentCompleteTalk.java
@@ -1,11 +1,11 @@
 package emu.grasscutter.game.quest.content;
 
-import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_COMPLETE_TALK;
-
 import emu.grasscutter.data.excels.quest.QuestData;
 import emu.grasscutter.game.quest.*;
 import lombok.val;
 
+import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_COMPLETE_TALK;
+
 @QuestValueContent(QUEST_CONTENT_COMPLETE_TALK)
 public class ContentCompleteTalk extends BaseContent {
     @Override
diff --git a/src/main/java/emu/grasscutter/game/quest/content/ContentDestroyGadget.java b/src/main/java/emu/grasscutter/game/quest/content/ContentDestroyGadget.java
index c558d0ec2..bbd4cbab7 100644
--- a/src/main/java/emu/grasscutter/game/quest/content/ContentDestroyGadget.java
+++ b/src/main/java/emu/grasscutter/game/quest/content/ContentDestroyGadget.java
@@ -1,10 +1,9 @@
 package emu.grasscutter.game.quest.content;
 
-import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_DESTROY_GADGET;
-
 import emu.grasscutter.data.excels.quest.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueContent;
+import emu.grasscutter.game.quest.*;
+
+import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_DESTROY_GADGET;
 
 @QuestValueContent(QUEST_CONTENT_DESTROY_GADGET)
 public class ContentDestroyGadget extends BaseContent {
diff --git a/src/main/java/emu/grasscutter/game/quest/content/ContentEnterDungeon.java b/src/main/java/emu/grasscutter/game/quest/content/ContentEnterDungeon.java
index 1b6454b7e..1bd05ba7a 100644
--- a/src/main/java/emu/grasscutter/game/quest/content/ContentEnterDungeon.java
+++ b/src/main/java/emu/grasscutter/game/quest/content/ContentEnterDungeon.java
@@ -1,10 +1,9 @@
 package emu.grasscutter.game.quest.content;
 
-import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_ENTER_DUNGEON;
-
 import emu.grasscutter.data.excels.quest.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueContent;
+import emu.grasscutter.game.quest.*;
+
+import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_ENTER_DUNGEON;
 
 @QuestValueContent(QUEST_CONTENT_ENTER_DUNGEON)
 public class ContentEnterDungeon extends BaseContent {
diff --git a/src/main/java/emu/grasscutter/game/quest/content/ContentEnterMyWorld.java b/src/main/java/emu/grasscutter/game/quest/content/ContentEnterMyWorld.java
index 0377aeed8..9d5da840d 100644
--- a/src/main/java/emu/grasscutter/game/quest/content/ContentEnterMyWorld.java
+++ b/src/main/java/emu/grasscutter/game/quest/content/ContentEnterMyWorld.java
@@ -1,10 +1,9 @@
 package emu.grasscutter.game.quest.content;
 
-import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_ENTER_MY_WORLD;
-
 import emu.grasscutter.data.excels.quest.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueContent;
+import emu.grasscutter.game.quest.*;
+
+import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_ENTER_MY_WORLD;
 
 @QuestValueContent(QUEST_CONTENT_ENTER_MY_WORLD)
 public class ContentEnterMyWorld extends BaseContent {
diff --git a/src/main/java/emu/grasscutter/game/quest/content/ContentEnterMyWorldScene.java b/src/main/java/emu/grasscutter/game/quest/content/ContentEnterMyWorldScene.java
index 5d4139010..44da340e0 100644
--- a/src/main/java/emu/grasscutter/game/quest/content/ContentEnterMyWorldScene.java
+++ b/src/main/java/emu/grasscutter/game/quest/content/ContentEnterMyWorldScene.java
@@ -1,10 +1,9 @@
 package emu.grasscutter.game.quest.content;
 
-import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_ENTER_MY_WORLD_SCENE;
-
 import emu.grasscutter.data.excels.quest.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueContent;
+import emu.grasscutter.game.quest.*;
+
+import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_ENTER_MY_WORLD_SCENE;
 
 @QuestValueContent(QUEST_CONTENT_ENTER_MY_WORLD_SCENE)
 public class ContentEnterMyWorldScene extends BaseContent {
diff --git a/src/main/java/emu/grasscutter/game/quest/content/ContentEnterRoom.java b/src/main/java/emu/grasscutter/game/quest/content/ContentEnterRoom.java
index b020ea7a2..71c98d424 100644
--- a/src/main/java/emu/grasscutter/game/quest/content/ContentEnterRoom.java
+++ b/src/main/java/emu/grasscutter/game/quest/content/ContentEnterRoom.java
@@ -1,10 +1,9 @@
 package emu.grasscutter.game.quest.content;
 
-import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_ENTER_ROOM;
-
 import emu.grasscutter.data.excels.quest.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueContent;
+import emu.grasscutter.game.quest.*;
+
+import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_ENTER_ROOM;
 
 @QuestValueContent(QUEST_CONTENT_ENTER_ROOM)
 public class ContentEnterRoom extends BaseContent {
diff --git a/src/main/java/emu/grasscutter/game/quest/content/ContentEnterVehicle.java b/src/main/java/emu/grasscutter/game/quest/content/ContentEnterVehicle.java
index 10e03e303..c95a3f3fa 100644
--- a/src/main/java/emu/grasscutter/game/quest/content/ContentEnterVehicle.java
+++ b/src/main/java/emu/grasscutter/game/quest/content/ContentEnterVehicle.java
@@ -1,10 +1,9 @@
 package emu.grasscutter.game.quest.content;
 
-import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_ENTER_VEHICLE;
-
 import emu.grasscutter.data.excels.quest.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueContent;
+import emu.grasscutter.game.quest.*;
+
+import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_ENTER_VEHICLE;
 
 @QuestValueContent(QUEST_CONTENT_ENTER_VEHICLE)
 public class ContentEnterVehicle extends BaseContent {
diff --git a/src/main/java/emu/grasscutter/game/quest/content/ContentFailDungeon.java b/src/main/java/emu/grasscutter/game/quest/content/ContentFailDungeon.java
index 6c4be504c..93bac6439 100644
--- a/src/main/java/emu/grasscutter/game/quest/content/ContentFailDungeon.java
+++ b/src/main/java/emu/grasscutter/game/quest/content/ContentFailDungeon.java
@@ -1,10 +1,9 @@
 package emu.grasscutter.game.quest.content;
 
-import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_FAIL_DUNGEON;
-
 import emu.grasscutter.data.excels.quest.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueContent;
+import emu.grasscutter.game.quest.*;
+
+import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_FAIL_DUNGEON;
 
 @QuestValueContent(QUEST_CONTENT_FAIL_DUNGEON)
 public class ContentFailDungeon extends BaseContent {
diff --git a/src/main/java/emu/grasscutter/game/quest/content/ContentFinishDungeon.java b/src/main/java/emu/grasscutter/game/quest/content/ContentFinishDungeon.java
index 1649205c5..163d511c3 100644
--- a/src/main/java/emu/grasscutter/game/quest/content/ContentFinishDungeon.java
+++ b/src/main/java/emu/grasscutter/game/quest/content/ContentFinishDungeon.java
@@ -1,10 +1,9 @@
 package emu.grasscutter.game.quest.content;
 
-import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_FINISH_DUNGEON;
-
 import emu.grasscutter.data.excels.quest.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueContent;
+import emu.grasscutter.game.quest.*;
+
+import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_FINISH_DUNGEON;
 
 @QuestValueContent(QUEST_CONTENT_FINISH_DUNGEON)
 public class ContentFinishDungeon extends BaseContent {
diff --git a/src/main/java/emu/grasscutter/game/quest/content/ContentFinishPlot.java b/src/main/java/emu/grasscutter/game/quest/content/ContentFinishPlot.java
index 0a4139b1e..46a5ccf15 100644
--- a/src/main/java/emu/grasscutter/game/quest/content/ContentFinishPlot.java
+++ b/src/main/java/emu/grasscutter/game/quest/content/ContentFinishPlot.java
@@ -1,10 +1,10 @@
 package emu.grasscutter.game.quest.content;
 
-import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_FINISH_PLOT;
-
 import emu.grasscutter.data.excels.quest.QuestData;
 import emu.grasscutter.game.quest.*;
 
+import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_FINISH_PLOT;
+
 @QuestValueContent(QUEST_CONTENT_FINISH_PLOT)
 public class ContentFinishPlot extends BaseContent {
     @Override
diff --git a/src/main/java/emu/grasscutter/game/quest/content/ContentGameTimeTick.java b/src/main/java/emu/grasscutter/game/quest/content/ContentGameTimeTick.java
index e07e4fd0e..5efd4ab2c 100644
--- a/src/main/java/emu/grasscutter/game/quest/content/ContentGameTimeTick.java
+++ b/src/main/java/emu/grasscutter/game/quest/content/ContentGameTimeTick.java
@@ -1,12 +1,11 @@
 package emu.grasscutter.game.quest.content;
 
-import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_GAME_TIME_TICK;
-
 import emu.grasscutter.data.excels.quest.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueContent;
+import emu.grasscutter.game.quest.*;
 import lombok.val;
 
+import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_GAME_TIME_TICK;
+
 @QuestValueContent(QUEST_CONTENT_GAME_TIME_TICK)
 public class ContentGameTimeTick extends BaseContent {
     @Override
diff --git a/src/main/java/emu/grasscutter/game/quest/content/ContentInteractGadget.java b/src/main/java/emu/grasscutter/game/quest/content/ContentInteractGadget.java
index 4e98cd888..f8781526d 100644
--- a/src/main/java/emu/grasscutter/game/quest/content/ContentInteractGadget.java
+++ b/src/main/java/emu/grasscutter/game/quest/content/ContentInteractGadget.java
@@ -1,10 +1,9 @@
 package emu.grasscutter.game.quest.content;
 
-import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_INTERACT_GADGET;
-
 import emu.grasscutter.data.excels.quest.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueContent;
+import emu.grasscutter.game.quest.*;
+
+import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_INTERACT_GADGET;
 
 @QuestValueContent(QUEST_CONTENT_INTERACT_GADGET)
 public class ContentInteractGadget extends BaseContent {
diff --git a/src/main/java/emu/grasscutter/game/quest/content/ContentItemLessThan.java b/src/main/java/emu/grasscutter/game/quest/content/ContentItemLessThan.java
index 43fb1d89c..62ef0e982 100644
--- a/src/main/java/emu/grasscutter/game/quest/content/ContentItemLessThan.java
+++ b/src/main/java/emu/grasscutter/game/quest/content/ContentItemLessThan.java
@@ -1,12 +1,11 @@
 package emu.grasscutter.game.quest.content;
 
-import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_ITEM_LESS_THAN;
-
 import emu.grasscutter.data.excels.quest.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueContent;
+import emu.grasscutter.game.quest.*;
 import lombok.val;
 
+import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_ITEM_LESS_THAN;
+
 @QuestValueContent(QUEST_CONTENT_ITEM_LESS_THAN)
 public class ContentItemLessThan extends BaseContent {
     @Override
diff --git a/src/main/java/emu/grasscutter/game/quest/content/ContentKillMonster.java b/src/main/java/emu/grasscutter/game/quest/content/ContentKillMonster.java
index db8e2d3ae..8051418bf 100644
--- a/src/main/java/emu/grasscutter/game/quest/content/ContentKillMonster.java
+++ b/src/main/java/emu/grasscutter/game/quest/content/ContentKillMonster.java
@@ -1,10 +1,9 @@
 package emu.grasscutter.game.quest.content;
 
-import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_KILL_MONSTER;
-
 import emu.grasscutter.data.excels.quest.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueContent;
+import emu.grasscutter.game.quest.*;
+
+import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_KILL_MONSTER;
 
 @QuestValueContent(QUEST_CONTENT_KILL_MONSTER)
 public class ContentKillMonster extends BaseContent {
diff --git a/src/main/java/emu/grasscutter/game/quest/content/ContentLeaveScene.java b/src/main/java/emu/grasscutter/game/quest/content/ContentLeaveScene.java
index 45f2d6bf4..0f39ec5b3 100644
--- a/src/main/java/emu/grasscutter/game/quest/content/ContentLeaveScene.java
+++ b/src/main/java/emu/grasscutter/game/quest/content/ContentLeaveScene.java
@@ -1,10 +1,9 @@
 package emu.grasscutter.game.quest.content;
 
-import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_LEAVE_SCENE;
-
 import emu.grasscutter.data.excels.quest.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueContent;
+import emu.grasscutter.game.quest.*;
+
+import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_LEAVE_SCENE;
 
 @QuestValueContent(QUEST_CONTENT_LEAVE_SCENE)
 public class ContentLeaveScene extends BaseContent {
diff --git a/src/main/java/emu/grasscutter/game/quest/content/ContentLuaNotify.java b/src/main/java/emu/grasscutter/game/quest/content/ContentLuaNotify.java
index 3864a6d06..10f6d7209 100644
--- a/src/main/java/emu/grasscutter/game/quest/content/ContentLuaNotify.java
+++ b/src/main/java/emu/grasscutter/game/quest/content/ContentLuaNotify.java
@@ -1,10 +1,9 @@
 package emu.grasscutter.game.quest.content;
 
-import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_LUA_NOTIFY;
-
 import emu.grasscutter.data.excels.quest.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueContent;
+import emu.grasscutter.game.quest.*;
+
+import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_LUA_NOTIFY;
 
 @QuestValueContent(QUEST_CONTENT_LUA_NOTIFY)
 public class ContentLuaNotify extends BaseContent {
diff --git a/src/main/java/emu/grasscutter/game/quest/content/ContentMonsterDie.java b/src/main/java/emu/grasscutter/game/quest/content/ContentMonsterDie.java
index 6e7f73722..da8ec8f7a 100644
--- a/src/main/java/emu/grasscutter/game/quest/content/ContentMonsterDie.java
+++ b/src/main/java/emu/grasscutter/game/quest/content/ContentMonsterDie.java
@@ -1,10 +1,9 @@
 package emu.grasscutter.game.quest.content;
 
-import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_MONSTER_DIE;
-
 import emu.grasscutter.data.excels.quest.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueContent;
+import emu.grasscutter.game.quest.*;
+
+import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_MONSTER_DIE;
 
 @QuestValueContent(QUEST_CONTENT_MONSTER_DIE)
 public class ContentMonsterDie extends BaseContent {
diff --git a/src/main/java/emu/grasscutter/game/quest/content/ContentNotFinishPlot.java b/src/main/java/emu/grasscutter/game/quest/content/ContentNotFinishPlot.java
index ba2fafb58..ac30cf745 100644
--- a/src/main/java/emu/grasscutter/game/quest/content/ContentNotFinishPlot.java
+++ b/src/main/java/emu/grasscutter/game/quest/content/ContentNotFinishPlot.java
@@ -1,10 +1,10 @@
 package emu.grasscutter.game.quest.content;
 
-import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_NOT_FINISH_PLOT;
-
 import emu.grasscutter.data.excels.quest.QuestData;
 import emu.grasscutter.game.quest.*;
 
+import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_NOT_FINISH_PLOT;
+
 @QuestValueContent(QUEST_CONTENT_NOT_FINISH_PLOT)
 public class ContentNotFinishPlot extends BaseContent {
     @Override
diff --git a/src/main/java/emu/grasscutter/game/quest/content/ContentObtainItem.java b/src/main/java/emu/grasscutter/game/quest/content/ContentObtainItem.java
index f2e3bef1d..d9218b654 100644
--- a/src/main/java/emu/grasscutter/game/quest/content/ContentObtainItem.java
+++ b/src/main/java/emu/grasscutter/game/quest/content/ContentObtainItem.java
@@ -1,12 +1,11 @@
 package emu.grasscutter.game.quest.content;
 
-import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_OBTAIN_ITEM;
-
 import emu.grasscutter.data.excels.quest.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueContent;
+import emu.grasscutter.game.quest.*;
 import lombok.val;
 
+import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_OBTAIN_ITEM;
+
 @QuestValueContent(QUEST_CONTENT_OBTAIN_ITEM)
 public class ContentObtainItem extends BaseContent {
     @Override
diff --git a/src/main/java/emu/grasscutter/game/quest/content/ContentPlayerLevelUp.java b/src/main/java/emu/grasscutter/game/quest/content/ContentPlayerLevelUp.java
index 02c08eb3a..93f304cc8 100644
--- a/src/main/java/emu/grasscutter/game/quest/content/ContentPlayerLevelUp.java
+++ b/src/main/java/emu/grasscutter/game/quest/content/ContentPlayerLevelUp.java
@@ -1,10 +1,9 @@
 package emu.grasscutter.game.quest.content;
 
-import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_PLAYER_LEVEL_UP;
-
 import emu.grasscutter.data.excels.quest.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueContent;
+import emu.grasscutter.game.quest.*;
+
+import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_PLAYER_LEVEL_UP;
 
 @QuestValueContent(QUEST_CONTENT_PLAYER_LEVEL_UP)
 public class ContentPlayerLevelUp extends BaseContent {
diff --git a/src/main/java/emu/grasscutter/game/quest/content/ContentQuestStateEqual.java b/src/main/java/emu/grasscutter/game/quest/content/ContentQuestStateEqual.java
index ef20673c9..e3bbf02e0 100644
--- a/src/main/java/emu/grasscutter/game/quest/content/ContentQuestStateEqual.java
+++ b/src/main/java/emu/grasscutter/game/quest/content/ContentQuestStateEqual.java
@@ -1,10 +1,9 @@
 package emu.grasscutter.game.quest.content;
 
-import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_QUEST_STATE_EQUAL;
-
 import emu.grasscutter.data.excels.quest.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueContent;
+import emu.grasscutter.game.quest.*;
+
+import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_QUEST_STATE_EQUAL;
 
 @QuestValueContent(QUEST_CONTENT_QUEST_STATE_EQUAL)
 public class ContentQuestStateEqual extends BaseContent {
diff --git a/src/main/java/emu/grasscutter/game/quest/content/ContentQuestStateNotEqual.java b/src/main/java/emu/grasscutter/game/quest/content/ContentQuestStateNotEqual.java
index 47647b6e3..c2f48cd43 100644
--- a/src/main/java/emu/grasscutter/game/quest/content/ContentQuestStateNotEqual.java
+++ b/src/main/java/emu/grasscutter/game/quest/content/ContentQuestStateNotEqual.java
@@ -1,10 +1,9 @@
 package emu.grasscutter.game.quest.content;
 
-import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_QUEST_STATE_NOT_EQUAL;
-
 import emu.grasscutter.data.excels.quest.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueContent;
+import emu.grasscutter.game.quest.*;
+
+import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_QUEST_STATE_NOT_EQUAL;
 
 @QuestValueContent(QUEST_CONTENT_QUEST_STATE_NOT_EQUAL)
 public class ContentQuestStateNotEqual extends BaseContent {
diff --git a/src/main/java/emu/grasscutter/game/quest/content/ContentQuestVarEqual.java b/src/main/java/emu/grasscutter/game/quest/content/ContentQuestVarEqual.java
index d1afc3c5b..26cae2f73 100644
--- a/src/main/java/emu/grasscutter/game/quest/content/ContentQuestVarEqual.java
+++ b/src/main/java/emu/grasscutter/game/quest/content/ContentQuestVarEqual.java
@@ -1,11 +1,10 @@
 package emu.grasscutter.game.quest.content;
 
-import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_QUEST_VAR_EQUAL;
-
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.data.excels.quest.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueContent;
+import emu.grasscutter.game.quest.*;
+
+import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_QUEST_VAR_EQUAL;
 
 @QuestValueContent(QUEST_CONTENT_QUEST_VAR_EQUAL)
 public class ContentQuestVarEqual extends BaseContent {
diff --git a/src/main/java/emu/grasscutter/game/quest/content/ContentQuestVarGreater.java b/src/main/java/emu/grasscutter/game/quest/content/ContentQuestVarGreater.java
index c6247ad80..9d01c6681 100644
--- a/src/main/java/emu/grasscutter/game/quest/content/ContentQuestVarGreater.java
+++ b/src/main/java/emu/grasscutter/game/quest/content/ContentQuestVarGreater.java
@@ -1,11 +1,10 @@
 package emu.grasscutter.game.quest.content;
 
-import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_QUEST_VAR_GREATER;
-
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.data.excels.quest.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueContent;
+import emu.grasscutter.game.quest.*;
+
+import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_QUEST_VAR_GREATER;
 
 @QuestValueContent(QUEST_CONTENT_QUEST_VAR_GREATER)
 public class ContentQuestVarGreater extends BaseContent {
diff --git a/src/main/java/emu/grasscutter/game/quest/content/ContentQuestVarLess.java b/src/main/java/emu/grasscutter/game/quest/content/ContentQuestVarLess.java
index 6560305ee..379cb752d 100644
--- a/src/main/java/emu/grasscutter/game/quest/content/ContentQuestVarLess.java
+++ b/src/main/java/emu/grasscutter/game/quest/content/ContentQuestVarLess.java
@@ -1,11 +1,10 @@
 package emu.grasscutter.game.quest.content;
 
-import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_QUEST_VAR_LESS;
-
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.data.excels.quest.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueContent;
+import emu.grasscutter.game.quest.*;
+
+import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_QUEST_VAR_LESS;
 
 @QuestValueContent(QUEST_CONTENT_QUEST_VAR_LESS)
 public class ContentQuestVarLess extends BaseContent {
diff --git a/src/main/java/emu/grasscutter/game/quest/content/ContentSkill.java b/src/main/java/emu/grasscutter/game/quest/content/ContentSkill.java
index 8401e37a4..490e1b353 100644
--- a/src/main/java/emu/grasscutter/game/quest/content/ContentSkill.java
+++ b/src/main/java/emu/grasscutter/game/quest/content/ContentSkill.java
@@ -1,10 +1,9 @@
 package emu.grasscutter.game.quest.content;
 
-import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_SKILL;
-
 import emu.grasscutter.data.excels.quest.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueContent;
+import emu.grasscutter.game.quest.*;
+
+import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_SKILL;
 
 @QuestValueContent(QUEST_CONTENT_SKILL)
 public class ContentSkill extends BaseContent {
diff --git a/src/main/java/emu/grasscutter/game/quest/content/ContentTimeVarMoreOrEqual.java b/src/main/java/emu/grasscutter/game/quest/content/ContentTimeVarMoreOrEqual.java
index 7e4cd0220..bae420b18 100644
--- a/src/main/java/emu/grasscutter/game/quest/content/ContentTimeVarMoreOrEqual.java
+++ b/src/main/java/emu/grasscutter/game/quest/content/ContentTimeVarMoreOrEqual.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.game.quest.content;
 
 import emu.grasscutter.data.excels.quest.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueContent;
+import emu.grasscutter.game.quest.*;
 import emu.grasscutter.game.quest.enums.QuestContent;
 import lombok.val;
 
diff --git a/src/main/java/emu/grasscutter/game/quest/content/ContentTimeVarPassDay.java b/src/main/java/emu/grasscutter/game/quest/content/ContentTimeVarPassDay.java
index 06076d20a..fef0677b5 100644
--- a/src/main/java/emu/grasscutter/game/quest/content/ContentTimeVarPassDay.java
+++ b/src/main/java/emu/grasscutter/game/quest/content/ContentTimeVarPassDay.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.game.quest.content;
 
 import emu.grasscutter.data.excels.quest.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueContent;
+import emu.grasscutter.game.quest.*;
 import emu.grasscutter.game.quest.enums.QuestContent;
 import lombok.val;
 
diff --git a/src/main/java/emu/grasscutter/game/quest/content/ContentTriggerFire.java b/src/main/java/emu/grasscutter/game/quest/content/ContentTriggerFire.java
index 2a1256161..513acc97f 100644
--- a/src/main/java/emu/grasscutter/game/quest/content/ContentTriggerFire.java
+++ b/src/main/java/emu/grasscutter/game/quest/content/ContentTriggerFire.java
@@ -1,12 +1,11 @@
 package emu.grasscutter.game.quest.content;
 
-import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_TRIGGER_FIRE;
-
 import emu.grasscutter.data.excels.quest.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueContent;
+import emu.grasscutter.game.quest.*;
 import lombok.val;
 
+import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_TRIGGER_FIRE;
+
 @QuestValueContent(QUEST_CONTENT_TRIGGER_FIRE)
 public class ContentTriggerFire extends BaseContent {
     @Override
diff --git a/src/main/java/emu/grasscutter/game/quest/content/ContentUnlockArea.java b/src/main/java/emu/grasscutter/game/quest/content/ContentUnlockArea.java
index 106ee246c..50df14e6b 100644
--- a/src/main/java/emu/grasscutter/game/quest/content/ContentUnlockArea.java
+++ b/src/main/java/emu/grasscutter/game/quest/content/ContentUnlockArea.java
@@ -1,10 +1,9 @@
 package emu.grasscutter.game.quest.content;
 
-import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_UNLOCK_AREA;
-
 import emu.grasscutter.data.excels.quest.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueContent;
+import emu.grasscutter.game.quest.*;
+
+import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_UNLOCK_AREA;
 
 @QuestValueContent(QUEST_CONTENT_UNLOCK_AREA)
 public class ContentUnlockArea extends BaseContent {
diff --git a/src/main/java/emu/grasscutter/game/quest/content/ContentUnlockTransPoint.java b/src/main/java/emu/grasscutter/game/quest/content/ContentUnlockTransPoint.java
index e498d223d..927e6f08f 100644
--- a/src/main/java/emu/grasscutter/game/quest/content/ContentUnlockTransPoint.java
+++ b/src/main/java/emu/grasscutter/game/quest/content/ContentUnlockTransPoint.java
@@ -1,10 +1,9 @@
 package emu.grasscutter.game.quest.content;
 
-import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_UNLOCK_TRANS_POINT;
-
 import emu.grasscutter.data.excels.quest.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueContent;
+import emu.grasscutter.game.quest.*;
+
+import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_UNLOCK_TRANS_POINT;
 
 @QuestValueContent(QUEST_CONTENT_UNLOCK_TRANS_POINT)
 public class ContentUnlockTransPoint extends BaseContent {
diff --git a/src/main/java/emu/grasscutter/game/quest/content/ContentUseItem.java b/src/main/java/emu/grasscutter/game/quest/content/ContentUseItem.java
index a2b72fc43..dfcc74de4 100644
--- a/src/main/java/emu/grasscutter/game/quest/content/ContentUseItem.java
+++ b/src/main/java/emu/grasscutter/game/quest/content/ContentUseItem.java
@@ -1,10 +1,9 @@
 package emu.grasscutter.game.quest.content;
 
-import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_USE_ITEM;
-
 import emu.grasscutter.data.excels.quest.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueContent;
+import emu.grasscutter.game.quest.*;
+
+import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_USE_ITEM;
 
 @QuestValueContent(QUEST_CONTENT_USE_ITEM)
 public class ContentUseItem extends BaseContent {
diff --git a/src/main/java/emu/grasscutter/game/quest/content/ContentWorktopSelect.java b/src/main/java/emu/grasscutter/game/quest/content/ContentWorktopSelect.java
index ab2db3941..40e08c200 100644
--- a/src/main/java/emu/grasscutter/game/quest/content/ContentWorktopSelect.java
+++ b/src/main/java/emu/grasscutter/game/quest/content/ContentWorktopSelect.java
@@ -1,10 +1,9 @@
 package emu.grasscutter.game.quest.content;
 
-import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_WORKTOP_SELECT;
-
 import emu.grasscutter.data.excels.quest.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueContent;
+import emu.grasscutter.game.quest.*;
+
+import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_WORKTOP_SELECT;
 
 @QuestValueContent(QUEST_CONTENT_WORKTOP_SELECT)
 public class ContentWorktopSelect extends BaseContent {
diff --git a/src/main/java/emu/grasscutter/game/quest/enums/LogicType.java b/src/main/java/emu/grasscutter/game/quest/enums/LogicType.java
index 3a885565a..c00652ac6 100644
--- a/src/main/java/emu/grasscutter/game/quest/enums/LogicType.java
+++ b/src/main/java/emu/grasscutter/game/quest/enums/LogicType.java
@@ -1,11 +1,11 @@
 package emu.grasscutter.game.quest.enums;
 
 import emu.grasscutter.Grasscutter;
-import java.util.Arrays;
-import java.util.List;
-import java.util.function.BooleanSupplier;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.*;
+import java.util.function.BooleanSupplier;
+
 public enum LogicType {
     LOGIC_NONE(0),
     LOGIC_AND(1),
diff --git a/src/main/java/emu/grasscutter/game/quest/enums/QuestCond.java b/src/main/java/emu/grasscutter/game/quest/enums/QuestCond.java
index a7becad20..eb8d2de65 100644
--- a/src/main/java/emu/grasscutter/game/quest/enums/QuestCond.java
+++ b/src/main/java/emu/grasscutter/game/quest/enums/QuestCond.java
@@ -1,9 +1,8 @@
 package emu.grasscutter.game.quest.enums;
 
-import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
-import java.util.HashMap;
-import java.util.Map;
+import it.unimi.dsi.fastutil.ints.*;
+
+import java.util.*;
 import java.util.stream.Stream;
 
 public enum QuestCond implements QuestTrigger {
diff --git a/src/main/java/emu/grasscutter/game/quest/enums/QuestContent.java b/src/main/java/emu/grasscutter/game/quest/enums/QuestContent.java
index ac81fa623..9a7d791e9 100644
--- a/src/main/java/emu/grasscutter/game/quest/enums/QuestContent.java
+++ b/src/main/java/emu/grasscutter/game/quest/enums/QuestContent.java
@@ -1,9 +1,8 @@
 package emu.grasscutter.game.quest.enums;
 
-import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
-import java.util.HashMap;
-import java.util.Map;
+import it.unimi.dsi.fastutil.ints.*;
+
+import java.util.*;
 import java.util.stream.Stream;
 
 public enum QuestContent implements QuestTrigger {
diff --git a/src/main/java/emu/grasscutter/game/quest/enums/QuestExec.java b/src/main/java/emu/grasscutter/game/quest/enums/QuestExec.java
index a04fd9ab3..6d37a7c9b 100644
--- a/src/main/java/emu/grasscutter/game/quest/enums/QuestExec.java
+++ b/src/main/java/emu/grasscutter/game/quest/enums/QuestExec.java
@@ -1,9 +1,8 @@
 package emu.grasscutter.game.quest.enums;
 
-import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
-import java.util.HashMap;
-import java.util.Map;
+import it.unimi.dsi.fastutil.ints.*;
+
+import java.util.*;
 import java.util.stream.Stream;
 
 public enum QuestExec implements QuestTrigger {
diff --git a/src/main/java/emu/grasscutter/game/quest/exec/ExecAddCurAvatarEnergy.java b/src/main/java/emu/grasscutter/game/quest/exec/ExecAddCurAvatarEnergy.java
index 22455302d..38d781ee5 100644
--- a/src/main/java/emu/grasscutter/game/quest/exec/ExecAddCurAvatarEnergy.java
+++ b/src/main/java/emu/grasscutter/game/quest/exec/ExecAddCurAvatarEnergy.java
@@ -2,8 +2,7 @@ package emu.grasscutter.game.quest.exec;
 
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.data.excels.quest.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueExec;
+import emu.grasscutter.game.quest.*;
 import emu.grasscutter.game.quest.enums.QuestExec;
 import emu.grasscutter.game.quest.handlers.QuestExecHandler;
 
diff --git a/src/main/java/emu/grasscutter/game/quest/exec/ExecAddQuestProgress.java b/src/main/java/emu/grasscutter/game/quest/exec/ExecAddQuestProgress.java
index 393d081d9..29e19bbf9 100644
--- a/src/main/java/emu/grasscutter/game/quest/exec/ExecAddQuestProgress.java
+++ b/src/main/java/emu/grasscutter/game/quest/exec/ExecAddQuestProgress.java
@@ -1,10 +1,10 @@
 package emu.grasscutter.game.quest.exec;
 
 import emu.grasscutter.data.excels.quest.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueExec;
+import emu.grasscutter.game.quest.*;
 import emu.grasscutter.game.quest.enums.QuestExec;
 import emu.grasscutter.game.quest.handlers.QuestExecHandler;
+
 import java.util.Arrays;
 
 @QuestValueExec(QuestExec.QUEST_EXEC_ADD_QUEST_PROGRESS)
diff --git a/src/main/java/emu/grasscutter/game/quest/exec/ExecChangeAvatarElemet.java b/src/main/java/emu/grasscutter/game/quest/exec/ExecChangeAvatarElemet.java
index 1472e7c8a..058e9e031 100644
--- a/src/main/java/emu/grasscutter/game/quest/exec/ExecChangeAvatarElemet.java
+++ b/src/main/java/emu/grasscutter/game/quest/exec/ExecChangeAvatarElemet.java
@@ -3,8 +3,7 @@ package emu.grasscutter.game.quest.exec;
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.data.excels.quest.QuestData;
 import emu.grasscutter.game.props.ElementType;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueExec;
+import emu.grasscutter.game.quest.*;
 import emu.grasscutter.game.quest.enums.QuestExec;
 import emu.grasscutter.game.quest.handlers.QuestExecHandler;
 import lombok.val;
diff --git a/src/main/java/emu/grasscutter/game/quest/exec/ExecClearTimeVar.java b/src/main/java/emu/grasscutter/game/quest/exec/ExecClearTimeVar.java
index 281230763..88e490b92 100644
--- a/src/main/java/emu/grasscutter/game/quest/exec/ExecClearTimeVar.java
+++ b/src/main/java/emu/grasscutter/game/quest/exec/ExecClearTimeVar.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.game.quest.exec;
 
 import emu.grasscutter.data.excels.quest.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueExec;
+import emu.grasscutter.game.quest.*;
 import emu.grasscutter.game.quest.enums.QuestExec;
 import emu.grasscutter.game.quest.handlers.QuestExecHandler;
 import lombok.val;
diff --git a/src/main/java/emu/grasscutter/game/quest/exec/ExecDecQuestGlobalVar.java b/src/main/java/emu/grasscutter/game/quest/exec/ExecDecQuestGlobalVar.java
index 0827e91cb..c4e986476 100644
--- a/src/main/java/emu/grasscutter/game/quest/exec/ExecDecQuestGlobalVar.java
+++ b/src/main/java/emu/grasscutter/game/quest/exec/ExecDecQuestGlobalVar.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.game.quest.exec;
 
 import emu.grasscutter.data.excels.quest.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueExec;
+import emu.grasscutter.game.quest.*;
 import emu.grasscutter.game.quest.enums.QuestExec;
 import emu.grasscutter.game.quest.handlers.QuestExecHandler;
 
diff --git a/src/main/java/emu/grasscutter/game/quest/exec/ExecDecQuestVar.java b/src/main/java/emu/grasscutter/game/quest/exec/ExecDecQuestVar.java
index 20406f0eb..f98be9f9c 100644
--- a/src/main/java/emu/grasscutter/game/quest/exec/ExecDecQuestVar.java
+++ b/src/main/java/emu/grasscutter/game/quest/exec/ExecDecQuestVar.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.game.quest.exec;
 
 import emu.grasscutter.data.excels.quest.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueExec;
+import emu.grasscutter.game.quest.*;
 import emu.grasscutter.game.quest.enums.QuestExec;
 import emu.grasscutter.game.quest.handlers.QuestExecHandler;
 
diff --git a/src/main/java/emu/grasscutter/game/quest/exec/ExecDelPackItem.java b/src/main/java/emu/grasscutter/game/quest/exec/ExecDelPackItem.java
index a4604eddb..400a7f5ab 100644
--- a/src/main/java/emu/grasscutter/game/quest/exec/ExecDelPackItem.java
+++ b/src/main/java/emu/grasscutter/game/quest/exec/ExecDelPackItem.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.game.quest.exec;
 
 import emu.grasscutter.data.excels.quest.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueExec;
+import emu.grasscutter.game.quest.*;
 import emu.grasscutter.game.quest.enums.QuestExec;
 import emu.grasscutter.game.quest.handlers.QuestExecHandler;
 
diff --git a/src/main/java/emu/grasscutter/game/quest/exec/ExecDelPackItemBatch.java b/src/main/java/emu/grasscutter/game/quest/exec/ExecDelPackItemBatch.java
index e9dc737eb..151783f25 100644
--- a/src/main/java/emu/grasscutter/game/quest/exec/ExecDelPackItemBatch.java
+++ b/src/main/java/emu/grasscutter/game/quest/exec/ExecDelPackItemBatch.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.game.quest.exec;
 
 import emu.grasscutter.data.excels.quest.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueExec;
+import emu.grasscutter.game.quest.*;
 import emu.grasscutter.game.quest.enums.QuestExec;
 import emu.grasscutter.game.quest.handlers.QuestExecHandler;
 
diff --git a/src/main/java/emu/grasscutter/game/quest/exec/ExecGrantTrialAvatar.java b/src/main/java/emu/grasscutter/game/quest/exec/ExecGrantTrialAvatar.java
index 0c59668d0..c148ff570 100644
--- a/src/main/java/emu/grasscutter/game/quest/exec/ExecGrantTrialAvatar.java
+++ b/src/main/java/emu/grasscutter/game/quest/exec/ExecGrantTrialAvatar.java
@@ -2,8 +2,7 @@ package emu.grasscutter.game.quest.exec;
 
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.data.excels.quest.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueExec;
+import emu.grasscutter.game.quest.*;
 import emu.grasscutter.game.quest.enums.QuestExec;
 import emu.grasscutter.game.quest.handlers.QuestExecHandler;
 
diff --git a/src/main/java/emu/grasscutter/game/quest/exec/ExecIncQuestGlobalVar.java b/src/main/java/emu/grasscutter/game/quest/exec/ExecIncQuestGlobalVar.java
index 2d750f3d8..0d1af5717 100644
--- a/src/main/java/emu/grasscutter/game/quest/exec/ExecIncQuestGlobalVar.java
+++ b/src/main/java/emu/grasscutter/game/quest/exec/ExecIncQuestGlobalVar.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.game.quest.exec;
 
 import emu.grasscutter.data.excels.quest.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueExec;
+import emu.grasscutter.game.quest.*;
 import emu.grasscutter.game.quest.enums.QuestExec;
 import emu.grasscutter.game.quest.handlers.QuestExecHandler;
 
diff --git a/src/main/java/emu/grasscutter/game/quest/exec/ExecIncQuestVar.java b/src/main/java/emu/grasscutter/game/quest/exec/ExecIncQuestVar.java
index 151b25d26..0fbbfeea9 100644
--- a/src/main/java/emu/grasscutter/game/quest/exec/ExecIncQuestVar.java
+++ b/src/main/java/emu/grasscutter/game/quest/exec/ExecIncQuestVar.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.game.quest.exec;
 
 import emu.grasscutter.data.excels.quest.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueExec;
+import emu.grasscutter.game.quest.*;
 import emu.grasscutter.game.quest.enums.QuestExec;
 import emu.grasscutter.game.quest.handlers.QuestExecHandler;
 
diff --git a/src/main/java/emu/grasscutter/game/quest/exec/ExecInitTimeVar.java b/src/main/java/emu/grasscutter/game/quest/exec/ExecInitTimeVar.java
index 0a51d8221..90413df18 100644
--- a/src/main/java/emu/grasscutter/game/quest/exec/ExecInitTimeVar.java
+++ b/src/main/java/emu/grasscutter/game/quest/exec/ExecInitTimeVar.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.game.quest.exec;
 
 import emu.grasscutter.data.excels.quest.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueExec;
+import emu.grasscutter.game.quest.*;
 import emu.grasscutter.game.quest.enums.QuestExec;
 import emu.grasscutter.game.quest.handlers.QuestExecHandler;
 import lombok.val;
diff --git a/src/main/java/emu/grasscutter/game/quest/exec/ExecNotifyGroupLua.java b/src/main/java/emu/grasscutter/game/quest/exec/ExecNotifyGroupLua.java
index cd6934113..8a5342751 100644
--- a/src/main/java/emu/grasscutter/game/quest/exec/ExecNotifyGroupLua.java
+++ b/src/main/java/emu/grasscutter/game/quest/exec/ExecNotifyGroupLua.java
@@ -1,10 +1,8 @@
 package emu.grasscutter.game.quest.exec;
 
 import emu.grasscutter.data.excels.quest.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueExec;
-import emu.grasscutter.game.quest.enums.QuestExec;
-import emu.grasscutter.game.quest.enums.QuestState;
+import emu.grasscutter.game.quest.*;
+import emu.grasscutter.game.quest.enums.*;
 import emu.grasscutter.game.quest.handlers.QuestExecHandler;
 import emu.grasscutter.scripts.constants.EventType;
 import emu.grasscutter.scripts.data.ScriptArgs;
diff --git a/src/main/java/emu/grasscutter/game/quest/exec/ExecRandomQuestVar.java b/src/main/java/emu/grasscutter/game/quest/exec/ExecRandomQuestVar.java
index d61a72772..133961e5e 100644
--- a/src/main/java/emu/grasscutter/game/quest/exec/ExecRandomQuestVar.java
+++ b/src/main/java/emu/grasscutter/game/quest/exec/ExecRandomQuestVar.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.game.quest.exec;
 
 import emu.grasscutter.data.excels.quest.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueExec;
+import emu.grasscutter.game.quest.*;
 import emu.grasscutter.game.quest.enums.QuestExec;
 import emu.grasscutter.game.quest.handlers.QuestExecHandler;
 
diff --git a/src/main/java/emu/grasscutter/game/quest/exec/ExecRefreshGroupMonster.java b/src/main/java/emu/grasscutter/game/quest/exec/ExecRefreshGroupMonster.java
index 491a18b2c..b5d4c4922 100644
--- a/src/main/java/emu/grasscutter/game/quest/exec/ExecRefreshGroupMonster.java
+++ b/src/main/java/emu/grasscutter/game/quest/exec/ExecRefreshGroupMonster.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.game.quest.exec;
 
 import emu.grasscutter.data.excels.quest.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueExec;
+import emu.grasscutter.game.quest.*;
 import emu.grasscutter.game.quest.enums.QuestExec;
 import emu.grasscutter.game.quest.handlers.QuestExecHandler;
 
diff --git a/src/main/java/emu/grasscutter/game/quest/exec/ExecRefreshGroupSuite.java b/src/main/java/emu/grasscutter/game/quest/exec/ExecRefreshGroupSuite.java
index c60c5af8b..b8c392eda 100644
--- a/src/main/java/emu/grasscutter/game/quest/exec/ExecRefreshGroupSuite.java
+++ b/src/main/java/emu/grasscutter/game/quest/exec/ExecRefreshGroupSuite.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.game.quest.exec;
 
 import emu.grasscutter.data.excels.quest.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueExec;
+import emu.grasscutter.game.quest.*;
 import emu.grasscutter.game.quest.enums.QuestExec;
 import emu.grasscutter.game.quest.handlers.QuestExecHandler;
 import lombok.val;
diff --git a/src/main/java/emu/grasscutter/game/quest/exec/ExecRegisterDynamicGroup.java b/src/main/java/emu/grasscutter/game/quest/exec/ExecRegisterDynamicGroup.java
index c2ad9a9b0..c7f860f30 100644
--- a/src/main/java/emu/grasscutter/game/quest/exec/ExecRegisterDynamicGroup.java
+++ b/src/main/java/emu/grasscutter/game/quest/exec/ExecRegisterDynamicGroup.java
@@ -2,9 +2,7 @@ package emu.grasscutter.game.quest.exec;
 
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.data.excels.quest.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestGroupSuite;
-import emu.grasscutter.game.quest.QuestValueExec;
+import emu.grasscutter.game.quest.*;
 import emu.grasscutter.game.quest.enums.QuestExec;
 import emu.grasscutter.game.quest.handlers.QuestExecHandler;
 
diff --git a/src/main/java/emu/grasscutter/game/quest/exec/ExecRemoveTrialAvatar.java b/src/main/java/emu/grasscutter/game/quest/exec/ExecRemoveTrialAvatar.java
index bc85441a7..e3953a0af 100644
--- a/src/main/java/emu/grasscutter/game/quest/exec/ExecRemoveTrialAvatar.java
+++ b/src/main/java/emu/grasscutter/game/quest/exec/ExecRemoveTrialAvatar.java
@@ -2,8 +2,7 @@ package emu.grasscutter.game.quest.exec;
 
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.data.excels.quest.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueExec;
+import emu.grasscutter.game.quest.*;
 import emu.grasscutter.game.quest.enums.QuestExec;
 import emu.grasscutter.game.quest.handlers.QuestExecHandler;
 
diff --git a/src/main/java/emu/grasscutter/game/quest/exec/ExecRollbackParentQuest.java b/src/main/java/emu/grasscutter/game/quest/exec/ExecRollbackParentQuest.java
index 986ada683..4c12af67d 100644
--- a/src/main/java/emu/grasscutter/game/quest/exec/ExecRollbackParentQuest.java
+++ b/src/main/java/emu/grasscutter/game/quest/exec/ExecRollbackParentQuest.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.game.quest.exec;
 
 import emu.grasscutter.data.excels.quest.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueExec;
+import emu.grasscutter.game.quest.*;
 import emu.grasscutter.game.quest.enums.QuestExec;
 import emu.grasscutter.game.quest.handlers.QuestExecHandler;
 import emu.grasscutter.server.packet.send.PacketScenePlayerLocationNotify;
diff --git a/src/main/java/emu/grasscutter/game/quest/exec/ExecRollbackQuest.java b/src/main/java/emu/grasscutter/game/quest/exec/ExecRollbackQuest.java
index 961ef6708..45dcbb99a 100644
--- a/src/main/java/emu/grasscutter/game/quest/exec/ExecRollbackQuest.java
+++ b/src/main/java/emu/grasscutter/game/quest/exec/ExecRollbackQuest.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.game.quest.exec;
 
 import emu.grasscutter.data.excels.quest.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueExec;
+import emu.grasscutter.game.quest.*;
 import emu.grasscutter.game.quest.enums.QuestExec;
 import emu.grasscutter.game.quest.handlers.QuestExecHandler;
 import emu.grasscutter.server.packet.send.PacketScenePlayerLocationNotify;
diff --git a/src/main/java/emu/grasscutter/game/quest/exec/ExecSetFlyable.java b/src/main/java/emu/grasscutter/game/quest/exec/ExecSetFlyable.java
index a745af8c4..f7e01d2e7 100644
--- a/src/main/java/emu/grasscutter/game/quest/exec/ExecSetFlyable.java
+++ b/src/main/java/emu/grasscutter/game/quest/exec/ExecSetFlyable.java
@@ -2,8 +2,7 @@ package emu.grasscutter.game.quest.exec;
 
 import emu.grasscutter.data.excels.quest.QuestData;
 import emu.grasscutter.game.props.PlayerProperty;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueExec;
+import emu.grasscutter.game.quest.*;
 import emu.grasscutter.game.quest.enums.QuestExec;
 import emu.grasscutter.game.quest.handlers.QuestExecHandler;
 
diff --git a/src/main/java/emu/grasscutter/game/quest/exec/ExecSetGameTimeLocked.java b/src/main/java/emu/grasscutter/game/quest/exec/ExecSetGameTimeLocked.java
index e687f9bf9..65d4d0232 100644
--- a/src/main/java/emu/grasscutter/game/quest/exec/ExecSetGameTimeLocked.java
+++ b/src/main/java/emu/grasscutter/game/quest/exec/ExecSetGameTimeLocked.java
@@ -1,10 +1,10 @@
 package emu.grasscutter.game.quest.exec;
 
 import emu.grasscutter.data.excels.quest.QuestData.QuestExecParam;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueExec;
+import emu.grasscutter.game.quest.*;
 import emu.grasscutter.game.quest.enums.QuestExec;
 import emu.grasscutter.game.quest.handlers.QuestExecHandler;
+
 import java.util.Objects;
 
 @QuestValueExec(QuestExec.QUEST_EXEC_SET_IS_GAME_TIME_LOCKED)
diff --git a/src/main/java/emu/grasscutter/game/quest/exec/ExecSetOpenState.java b/src/main/java/emu/grasscutter/game/quest/exec/ExecSetOpenState.java
index 283d595eb..a8bd72a3f 100644
--- a/src/main/java/emu/grasscutter/game/quest/exec/ExecSetOpenState.java
+++ b/src/main/java/emu/grasscutter/game/quest/exec/ExecSetOpenState.java
@@ -1,10 +1,10 @@
 package emu.grasscutter.game.quest.exec;
 
 import emu.grasscutter.data.excels.quest.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueExec;
+import emu.grasscutter.game.quest.*;
 import emu.grasscutter.game.quest.enums.QuestExec;
 import emu.grasscutter.game.quest.handlers.QuestExecHandler;
+
 import java.util.Arrays;
 
 @QuestValueExec(QuestExec.QUEST_EXEC_SET_OPEN_STATE)
diff --git a/src/main/java/emu/grasscutter/game/quest/exec/ExecSetQuestGlobalVar.java b/src/main/java/emu/grasscutter/game/quest/exec/ExecSetQuestGlobalVar.java
index 8446e0702..fe1630ff9 100644
--- a/src/main/java/emu/grasscutter/game/quest/exec/ExecSetQuestGlobalVar.java
+++ b/src/main/java/emu/grasscutter/game/quest/exec/ExecSetQuestGlobalVar.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.game.quest.exec;
 
 import emu.grasscutter.data.excels.quest.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueExec;
+import emu.grasscutter.game.quest.*;
 import emu.grasscutter.game.quest.enums.QuestExec;
 import emu.grasscutter.game.quest.handlers.QuestExecHandler;
 
diff --git a/src/main/java/emu/grasscutter/game/quest/exec/ExecSetQuestVar.java b/src/main/java/emu/grasscutter/game/quest/exec/ExecSetQuestVar.java
index 4f22690c0..c8b9f16fa 100644
--- a/src/main/java/emu/grasscutter/game/quest/exec/ExecSetQuestVar.java
+++ b/src/main/java/emu/grasscutter/game/quest/exec/ExecSetQuestVar.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.game.quest.exec;
 
 import emu.grasscutter.data.excels.quest.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueExec;
+import emu.grasscutter.game.quest.*;
 import emu.grasscutter.game.quest.enums.QuestExec;
 import emu.grasscutter.game.quest.handlers.QuestExecHandler;
 
diff --git a/src/main/java/emu/grasscutter/game/quest/exec/ExecUnlockArea.java b/src/main/java/emu/grasscutter/game/quest/exec/ExecUnlockArea.java
index ccb3d7c4e..1c851e87f 100644
--- a/src/main/java/emu/grasscutter/game/quest/exec/ExecUnlockArea.java
+++ b/src/main/java/emu/grasscutter/game/quest/exec/ExecUnlockArea.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.game.quest.exec;
 
 import emu.grasscutter.data.excels.quest.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueExec;
+import emu.grasscutter.game.quest.*;
 import emu.grasscutter.game.quest.enums.QuestExec;
 import emu.grasscutter.game.quest.handlers.QuestExecHandler;
 
diff --git a/src/main/java/emu/grasscutter/game/quest/exec/ExecUnlockPoint.java b/src/main/java/emu/grasscutter/game/quest/exec/ExecUnlockPoint.java
index e88a3cb5a..93b2d9969 100644
--- a/src/main/java/emu/grasscutter/game/quest/exec/ExecUnlockPoint.java
+++ b/src/main/java/emu/grasscutter/game/quest/exec/ExecUnlockPoint.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.game.quest.exec;
 
 import emu.grasscutter.data.excels.quest.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueExec;
+import emu.grasscutter.game.quest.*;
 import emu.grasscutter.game.quest.enums.QuestExec;
 import emu.grasscutter.game.quest.handlers.QuestExecHandler;
 
diff --git a/src/main/java/emu/grasscutter/game/quest/exec/ExecUnregisterDynamicGroup.java b/src/main/java/emu/grasscutter/game/quest/exec/ExecUnregisterDynamicGroup.java
index 822e5c810..d73de4334 100644
--- a/src/main/java/emu/grasscutter/game/quest/exec/ExecUnregisterDynamicGroup.java
+++ b/src/main/java/emu/grasscutter/game/quest/exec/ExecUnregisterDynamicGroup.java
@@ -2,8 +2,7 @@ package emu.grasscutter.game.quest.exec;
 
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.data.excels.quest.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueExec;
+import emu.grasscutter.game.quest.*;
 import emu.grasscutter.game.quest.enums.QuestExec;
 import emu.grasscutter.game.quest.handlers.QuestExecHandler;
 import lombok.val;
diff --git a/src/main/java/emu/grasscutter/game/shop/ShopInfo.java b/src/main/java/emu/grasscutter/game/shop/ShopInfo.java
index b547707ef..248983f85 100644
--- a/src/main/java/emu/grasscutter/game/shop/ShopInfo.java
+++ b/src/main/java/emu/grasscutter/game/shop/ShopInfo.java
@@ -2,10 +2,9 @@ package emu.grasscutter.game.shop;
 
 import emu.grasscutter.data.common.ItemParamData;
 import emu.grasscutter.data.excels.ShopGoodsData;
-import java.util.ArrayList;
-import java.util.List;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.*;
+
+import java.util.*;
 
 public class ShopInfo {
     @Getter @Setter private int goodsId = 0;
diff --git a/src/main/java/emu/grasscutter/game/shop/ShopSystem.java b/src/main/java/emu/grasscutter/game/shop/ShopSystem.java
index 1689fab77..b05cde2e4 100644
--- a/src/main/java/emu/grasscutter/game/shop/ShopSystem.java
+++ b/src/main/java/emu/grasscutter/game/shop/ShopSystem.java
@@ -1,20 +1,16 @@
 package emu.grasscutter.game.shop;
 
-import static emu.grasscutter.config.Configuration.GAME_OPTIONS;
-
 import emu.grasscutter.Grasscutter;
-import emu.grasscutter.data.DataLoader;
-import emu.grasscutter.data.GameData;
+import emu.grasscutter.data.*;
 import emu.grasscutter.data.common.ItemParamData;
 import emu.grasscutter.data.excels.ShopGoodsData;
-import emu.grasscutter.server.game.BaseGameSystem;
-import emu.grasscutter.server.game.GameServer;
+import emu.grasscutter.server.game.*;
 import emu.grasscutter.utils.Utils;
-import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
+import it.unimi.dsi.fastutil.ints.*;
+
+import java.util.*;
+
+import static emu.grasscutter.config.Configuration.GAME_OPTIONS;
 
 public class ShopSystem extends BaseGameSystem {
     private static final int REFRESH_HOUR = 4; // In GMT+8 server
diff --git a/src/main/java/emu/grasscutter/game/shop/ShopTable.java b/src/main/java/emu/grasscutter/game/shop/ShopTable.java
index 7396cd028..a2990d7ff 100644
--- a/src/main/java/emu/grasscutter/game/shop/ShopTable.java
+++ b/src/main/java/emu/grasscutter/game/shop/ShopTable.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.game.shop;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
 
 public class ShopTable {
     private int shopId;
diff --git a/src/main/java/emu/grasscutter/game/systems/AnnouncementSystem.java b/src/main/java/emu/grasscutter/game/systems/AnnouncementSystem.java
index d75f60a83..7504d8260 100644
--- a/src/main/java/emu/grasscutter/game/systems/AnnouncementSystem.java
+++ b/src/main/java/emu/grasscutter/game/systems/AnnouncementSystem.java
@@ -5,17 +5,14 @@ import emu.grasscutter.data.DataLoader;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.world.World;
 import emu.grasscutter.net.proto.AnnounceDataOuterClass;
-import emu.grasscutter.server.game.BaseGameSystem;
-import emu.grasscutter.server.game.GameServer;
-import emu.grasscutter.server.packet.send.PacketServerAnnounceNotify;
-import emu.grasscutter.server.packet.send.PacketServerAnnounceRevokeNotify;
+import emu.grasscutter.server.game.*;
+import emu.grasscutter.server.packet.send.*;
 import emu.grasscutter.utils.Utils;
-import java.util.*;
-import lombok.AccessLevel;
-import lombok.Data;
-import lombok.Getter;
+import lombok.*;
 import lombok.experimental.FieldDefaults;
 
+import java.util.*;
+
 @Getter
 public class AnnouncementSystem extends BaseGameSystem {
     private final Map announceConfigItemMap;
diff --git a/src/main/java/emu/grasscutter/game/systems/InventorySystem.java b/src/main/java/emu/grasscutter/game/systems/InventorySystem.java
index 3072eebab..04f990d82 100644
--- a/src/main/java/emu/grasscutter/game/systems/InventorySystem.java
+++ b/src/main/java/emu/grasscutter/game/systems/InventorySystem.java
@@ -18,9 +18,10 @@ import emu.grasscutter.server.game.*;
 import emu.grasscutter.server.packet.send.*;
 import emu.grasscutter.utils.Utils;
 import it.unimi.dsi.fastutil.ints.*;
+import lombok.val;
+
 import java.util.*;
 import java.util.stream.Stream;
-import lombok.val;
 
 public class InventorySystem extends BaseGameSystem {
     private static final Int2IntMap weaponRefundMaterials = new Int2IntArrayMap();
diff --git a/src/main/java/emu/grasscutter/game/systems/MultiplayerSystem.java b/src/main/java/emu/grasscutter/game/systems/MultiplayerSystem.java
index beef7c51d..677040d28 100644
--- a/src/main/java/emu/grasscutter/game/systems/MultiplayerSystem.java
+++ b/src/main/java/emu/grasscutter/game/systems/MultiplayerSystem.java
@@ -7,11 +7,8 @@ import emu.grasscutter.game.props.EnterReason;
 import emu.grasscutter.game.world.World;
 import emu.grasscutter.net.proto.EnterTypeOuterClass.EnterType;
 import emu.grasscutter.net.proto.PlayerApplyEnterMpResultNotifyOuterClass;
-import emu.grasscutter.server.game.BaseGameSystem;
-import emu.grasscutter.server.game.GameServer;
-import emu.grasscutter.server.packet.send.PacketPlayerApplyEnterMpNotify;
-import emu.grasscutter.server.packet.send.PacketPlayerApplyEnterMpResultNotify;
-import emu.grasscutter.server.packet.send.PacketPlayerEnterSceneNotify;
+import emu.grasscutter.server.game.*;
+import emu.grasscutter.server.packet.send.*;
 
 public class MultiplayerSystem extends BaseGameSystem {
 
diff --git a/src/main/java/emu/grasscutter/game/talk/TalkExec.java b/src/main/java/emu/grasscutter/game/talk/TalkExec.java
index 75323e2bc..7f4583a4d 100644
--- a/src/main/java/emu/grasscutter/game/talk/TalkExec.java
+++ b/src/main/java/emu/grasscutter/game/talk/TalkExec.java
@@ -1,12 +1,10 @@
 package emu.grasscutter.game.talk;
 
-import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
-import java.util.HashMap;
-import java.util.Map;
+import it.unimi.dsi.fastutil.ints.*;
+import lombok.*;
+
+import java.util.*;
 import java.util.stream.Stream;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
 
 @AllArgsConstructor
 public enum TalkExec {
diff --git a/src/main/java/emu/grasscutter/game/talk/TalkManager.java b/src/main/java/emu/grasscutter/game/talk/TalkManager.java
index 175e03ef3..c4433439b 100644
--- a/src/main/java/emu/grasscutter/game/talk/TalkManager.java
+++ b/src/main/java/emu/grasscutter/game/talk/TalkManager.java
@@ -1,14 +1,14 @@
 package emu.grasscutter.game.talk;
 
-import static emu.grasscutter.game.quest.enums.QuestCond.QUEST_COND_COMPLETE_TALK;
-import static emu.grasscutter.game.quest.enums.QuestContent.*;
-
 import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.binout.MainQuestData.TalkData;
 import emu.grasscutter.game.player.*;
 import emu.grasscutter.server.event.player.PlayerNpcTalkEvent;
 import lombok.NonNull;
 
+import static emu.grasscutter.game.quest.enums.QuestCond.QUEST_COND_COMPLETE_TALK;
+import static emu.grasscutter.game.quest.enums.QuestContent.*;
+
 public final class TalkManager extends BasePlayerManager {
     public TalkManager(@NonNull Player player) {
         super(player);
diff --git a/src/main/java/emu/grasscutter/game/talk/TalkValueExec.java b/src/main/java/emu/grasscutter/game/talk/TalkValueExec.java
index 227ff9841..9cfb62f8a 100644
--- a/src/main/java/emu/grasscutter/game/talk/TalkValueExec.java
+++ b/src/main/java/emu/grasscutter/game/talk/TalkValueExec.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.game.talk;
 
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.*;
 
 @Retention(RetentionPolicy.RUNTIME)
 public @interface TalkValueExec {
diff --git a/src/main/java/emu/grasscutter/game/talk/exec/ExecDecQuestGlobalVar.java b/src/main/java/emu/grasscutter/game/talk/exec/ExecDecQuestGlobalVar.java
index c889c4400..a246a47bd 100644
--- a/src/main/java/emu/grasscutter/game/talk/exec/ExecDecQuestGlobalVar.java
+++ b/src/main/java/emu/grasscutter/game/talk/exec/ExecDecQuestGlobalVar.java
@@ -3,9 +3,7 @@ package emu.grasscutter.game.talk.exec;
 import emu.grasscutter.data.excels.TalkConfigData;
 import emu.grasscutter.data.excels.TalkConfigData.TalkExecParam;
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.game.talk.TalkExec;
-import emu.grasscutter.game.talk.TalkExecHandler;
-import emu.grasscutter.game.talk.TalkValueExec;
+import emu.grasscutter.game.talk.*;
 
 @TalkValueExec(TalkExec.TALK_EXEC_DEC_QUEST_GLOBAL_VAR)
 public final class ExecDecQuestGlobalVar extends TalkExecHandler {
diff --git a/src/main/java/emu/grasscutter/game/talk/exec/ExecDecQuestVar.java b/src/main/java/emu/grasscutter/game/talk/exec/ExecDecQuestVar.java
index e617bedd3..4e965e016 100644
--- a/src/main/java/emu/grasscutter/game/talk/exec/ExecDecQuestVar.java
+++ b/src/main/java/emu/grasscutter/game/talk/exec/ExecDecQuestVar.java
@@ -4,9 +4,7 @@ import emu.grasscutter.data.excels.TalkConfigData;
 import emu.grasscutter.data.excels.TalkConfigData.TalkExecParam;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.quest.GameMainQuest;
-import emu.grasscutter.game.talk.TalkExec;
-import emu.grasscutter.game.talk.TalkExecHandler;
-import emu.grasscutter.game.talk.TalkValueExec;
+import emu.grasscutter.game.talk.*;
 
 @TalkValueExec(TalkExec.TALK_EXEC_DEC_QUEST_VAR)
 public final class ExecDecQuestVar extends TalkExecHandler {
diff --git a/src/main/java/emu/grasscutter/game/talk/exec/ExecIncQuestGlobalVar.java b/src/main/java/emu/grasscutter/game/talk/exec/ExecIncQuestGlobalVar.java
index b8454ead4..052ef9b4b 100644
--- a/src/main/java/emu/grasscutter/game/talk/exec/ExecIncQuestGlobalVar.java
+++ b/src/main/java/emu/grasscutter/game/talk/exec/ExecIncQuestGlobalVar.java
@@ -3,9 +3,7 @@ package emu.grasscutter.game.talk.exec;
 import emu.grasscutter.data.excels.TalkConfigData;
 import emu.grasscutter.data.excels.TalkConfigData.TalkExecParam;
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.game.talk.TalkExec;
-import emu.grasscutter.game.talk.TalkExecHandler;
-import emu.grasscutter.game.talk.TalkValueExec;
+import emu.grasscutter.game.talk.*;
 
 @TalkValueExec(TalkExec.TALK_EXEC_INC_QUEST_GLOBAL_VAR)
 public final class ExecIncQuestGlobalVar extends TalkExecHandler {
diff --git a/src/main/java/emu/grasscutter/game/talk/exec/ExecIncQuestVar.java b/src/main/java/emu/grasscutter/game/talk/exec/ExecIncQuestVar.java
index 00bdffa96..353ed3d2e 100644
--- a/src/main/java/emu/grasscutter/game/talk/exec/ExecIncQuestVar.java
+++ b/src/main/java/emu/grasscutter/game/talk/exec/ExecIncQuestVar.java
@@ -4,9 +4,7 @@ import emu.grasscutter.data.excels.TalkConfigData;
 import emu.grasscutter.data.excels.TalkConfigData.TalkExecParam;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.quest.GameMainQuest;
-import emu.grasscutter.game.talk.TalkExec;
-import emu.grasscutter.game.talk.TalkExecHandler;
-import emu.grasscutter.game.talk.TalkValueExec;
+import emu.grasscutter.game.talk.*;
 
 @TalkValueExec(TalkExec.TALK_EXEC_INC_QUEST_VAR)
 public final class ExecIncQuestVar extends TalkExecHandler {
diff --git a/src/main/java/emu/grasscutter/game/talk/exec/ExecSetGameTime.java b/src/main/java/emu/grasscutter/game/talk/exec/ExecSetGameTime.java
index a051a2caf..9748c3993 100644
--- a/src/main/java/emu/grasscutter/game/talk/exec/ExecSetGameTime.java
+++ b/src/main/java/emu/grasscutter/game/talk/exec/ExecSetGameTime.java
@@ -3,9 +3,7 @@ package emu.grasscutter.game.talk.exec;
 import emu.grasscutter.data.excels.TalkConfigData;
 import emu.grasscutter.data.excels.TalkConfigData.TalkExecParam;
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.game.talk.TalkExec;
-import emu.grasscutter.game.talk.TalkExecHandler;
-import emu.grasscutter.game.talk.TalkValueExec;
+import emu.grasscutter.game.talk.*;
 
 @TalkValueExec(TalkExec.TALK_EXEC_SET_GAME_TIME)
 public final class ExecSetGameTime extends TalkExecHandler {
diff --git a/src/main/java/emu/grasscutter/game/talk/exec/ExecSetQuestGlobalVar.java b/src/main/java/emu/grasscutter/game/talk/exec/ExecSetQuestGlobalVar.java
index bfff982e4..8f8aced5c 100644
--- a/src/main/java/emu/grasscutter/game/talk/exec/ExecSetQuestGlobalVar.java
+++ b/src/main/java/emu/grasscutter/game/talk/exec/ExecSetQuestGlobalVar.java
@@ -3,9 +3,7 @@ package emu.grasscutter.game.talk.exec;
 import emu.grasscutter.data.excels.TalkConfigData;
 import emu.grasscutter.data.excels.TalkConfigData.TalkExecParam;
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.game.talk.TalkExec;
-import emu.grasscutter.game.talk.TalkExecHandler;
-import emu.grasscutter.game.talk.TalkValueExec;
+import emu.grasscutter.game.talk.*;
 
 @TalkValueExec(TalkExec.TALK_EXEC_SET_QUEST_GLOBAL_VAR)
 public final class ExecSetQuestGlobalVar extends TalkExecHandler {
diff --git a/src/main/java/emu/grasscutter/game/talk/exec/ExecSetQuestVar.java b/src/main/java/emu/grasscutter/game/talk/exec/ExecSetQuestVar.java
index 8e97ac099..4b757543e 100644
--- a/src/main/java/emu/grasscutter/game/talk/exec/ExecSetQuestVar.java
+++ b/src/main/java/emu/grasscutter/game/talk/exec/ExecSetQuestVar.java
@@ -3,9 +3,7 @@ package emu.grasscutter.game.talk.exec;
 import emu.grasscutter.data.excels.TalkConfigData;
 import emu.grasscutter.data.excels.TalkConfigData.TalkExecParam;
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.game.talk.TalkExec;
-import emu.grasscutter.game.talk.TalkExecHandler;
-import emu.grasscutter.game.talk.TalkValueExec;
+import emu.grasscutter.game.talk.*;
 
 @TalkValueExec(TalkExec.TALK_EXEC_SET_QUEST_VAR)
 public final class ExecSetQuestVar extends TalkExecHandler {
diff --git a/src/main/java/emu/grasscutter/game/talk/exec/ExecTransSceneDummyPoint.java b/src/main/java/emu/grasscutter/game/talk/exec/ExecTransSceneDummyPoint.java
index 6eca515ae..f700928a4 100644
--- a/src/main/java/emu/grasscutter/game/talk/exec/ExecTransSceneDummyPoint.java
+++ b/src/main/java/emu/grasscutter/game/talk/exec/ExecTransSceneDummyPoint.java
@@ -4,9 +4,7 @@ import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.excels.TalkConfigData;
 import emu.grasscutter.data.excels.TalkConfigData.TalkExecParam;
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.game.talk.TalkExec;
-import emu.grasscutter.game.talk.TalkExecHandler;
-import emu.grasscutter.game.talk.TalkValueExec;
+import emu.grasscutter.game.talk.*;
 import emu.grasscutter.game.world.Position;
 
 @TalkValueExec(TalkExec.TALK_EXEC_TRANS_SCENE_DUMMY_POINT)
diff --git a/src/main/java/emu/grasscutter/game/tower/TowerData.java b/src/main/java/emu/grasscutter/game/tower/TowerData.java
index 8941ca5d2..43e37b3ae 100644
--- a/src/main/java/emu/grasscutter/game/tower/TowerData.java
+++ b/src/main/java/emu/grasscutter/game/tower/TowerData.java
@@ -1,7 +1,7 @@
 package emu.grasscutter.game.tower;
 
-import dev.morphia.annotations.Entity;
-import dev.morphia.annotations.Transient;
+import dev.morphia.annotations.*;
+
 import java.util.Map;
 
 @Entity
diff --git a/src/main/java/emu/grasscutter/game/tower/TowerLevelRecord.java b/src/main/java/emu/grasscutter/game/tower/TowerLevelRecord.java
index 2b0650788..ea6739866 100644
--- a/src/main/java/emu/grasscutter/game/tower/TowerLevelRecord.java
+++ b/src/main/java/emu/grasscutter/game/tower/TowerLevelRecord.java
@@ -1,8 +1,8 @@
 package emu.grasscutter.game.tower;
 
 import dev.morphia.annotations.Entity;
-import java.util.HashMap;
-import java.util.Map;
+
+import java.util.*;
 
 @Entity
 public class TowerLevelRecord {
diff --git a/src/main/java/emu/grasscutter/game/tower/TowerManager.java b/src/main/java/emu/grasscutter/game/tower/TowerManager.java
index 76b202af3..5f2d32e56 100644
--- a/src/main/java/emu/grasscutter/game/tower/TowerManager.java
+++ b/src/main/java/emu/grasscutter/game/tower/TowerManager.java
@@ -2,14 +2,11 @@ package emu.grasscutter.game.tower;
 
 import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.excels.tower.TowerLevelData;
-import emu.grasscutter.game.dungeons.DungeonSettleListener;
-import emu.grasscutter.game.dungeons.TowerDungeonSettleListener;
-import emu.grasscutter.game.player.BasePlayerManager;
-import emu.grasscutter.game.player.Player;
+import emu.grasscutter.game.dungeons.*;
+import emu.grasscutter.game.player.*;
 import emu.grasscutter.server.packet.send.*;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+
+import java.util.*;
 
 public class TowerManager extends BasePlayerManager {
     private static final List towerDungeonSettleListener =
diff --git a/src/main/java/emu/grasscutter/game/tower/TowerSystem.java b/src/main/java/emu/grasscutter/game/tower/TowerSystem.java
index 21acba656..7a39cc239 100644
--- a/src/main/java/emu/grasscutter/game/tower/TowerSystem.java
+++ b/src/main/java/emu/grasscutter/game/tower/TowerSystem.java
@@ -1,13 +1,11 @@
 package emu.grasscutter.game.tower;
 
 import emu.grasscutter.Grasscutter;
-import emu.grasscutter.data.DataLoader;
-import emu.grasscutter.data.GameData;
+import emu.grasscutter.data.*;
 import emu.grasscutter.data.excels.tower.TowerScheduleData;
-import emu.grasscutter.server.game.BaseGameSystem;
-import emu.grasscutter.server.game.GameServer;
-import java.util.ArrayList;
-import java.util.List;
+import emu.grasscutter.server.game.*;
+
+import java.util.*;
 
 public class TowerSystem extends BaseGameSystem {
 
diff --git a/src/main/java/emu/grasscutter/game/world/ChestReward.java b/src/main/java/emu/grasscutter/game/world/ChestReward.java
index f0d41795a..24f2afbb0 100644
--- a/src/main/java/emu/grasscutter/game/world/ChestReward.java
+++ b/src/main/java/emu/grasscutter/game/world/ChestReward.java
@@ -1,11 +1,11 @@
 package emu.grasscutter.game.world;
 
 import emu.grasscutter.game.inventory.ItemDef;
-import java.util.List;
-import lombok.AccessLevel;
-import lombok.Data;
+import lombok.*;
 import lombok.experimental.FieldDefaults;
 
+import java.util.List;
+
 @Data
 @FieldDefaults(level = AccessLevel.PRIVATE)
 public class ChestReward {
diff --git a/src/main/java/emu/grasscutter/game/world/GridPosition.java b/src/main/java/emu/grasscutter/game/world/GridPosition.java
index a6ba36891..de6e0cde1 100644
--- a/src/main/java/emu/grasscutter/game/world/GridPosition.java
+++ b/src/main/java/emu/grasscutter/game/world/GridPosition.java
@@ -2,12 +2,10 @@ package emu.grasscutter.game.world;
 
 import com.github.davidmoten.rtreemulti.geometry.Point;
 import dev.morphia.annotations.Entity;
-import java.io.IOException;
-import java.io.Serializable;
+import lombok.*;
+
+import java.io.*;
 import java.util.List;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.SneakyThrows;
 
 @Entity
 public final class GridPosition implements Serializable {
diff --git a/src/main/java/emu/grasscutter/game/world/GroupReplacementData.java b/src/main/java/emu/grasscutter/game/world/GroupReplacementData.java
index 13fd157de..b3c56054a 100644
--- a/src/main/java/emu/grasscutter/game/world/GroupReplacementData.java
+++ b/src/main/java/emu/grasscutter/game/world/GroupReplacementData.java
@@ -1,8 +1,9 @@
 package emu.grasscutter.game.world;
 
-import java.util.List;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class GroupReplacementData {
     int id;
diff --git a/src/main/java/emu/grasscutter/game/world/Location.java b/src/main/java/emu/grasscutter/game/world/Location.java
index 32779f170..e6f5ca4fb 100644
--- a/src/main/java/emu/grasscutter/game/world/Location.java
+++ b/src/main/java/emu/grasscutter/game/world/Location.java
@@ -1,9 +1,7 @@
 package emu.grasscutter.game.world;
 
-import dev.morphia.annotations.Entity;
-import dev.morphia.annotations.Transient;
-import lombok.Getter;
-import lombok.Setter;
+import dev.morphia.annotations.*;
+import lombok.*;
 
 @Entity
 public class Location extends Position {
diff --git a/src/main/java/emu/grasscutter/game/world/Position.java b/src/main/java/emu/grasscutter/game/world/Position.java
index c712cfd74..a41f73401 100644
--- a/src/main/java/emu/grasscutter/game/world/Position.java
+++ b/src/main/java/emu/grasscutter/game/world/Position.java
@@ -5,11 +5,11 @@ import com.google.gson.annotations.SerializedName;
 import dev.morphia.annotations.Entity;
 import emu.grasscutter.net.proto.VectorOuterClass.Vector;
 import emu.grasscutter.utils.Utils;
+import lombok.*;
+import lombok.experimental.Accessors;
+
 import java.io.Serializable;
 import java.util.List;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.experimental.Accessors;
 
 @Entity
 @Accessors(chain = true)
diff --git a/src/main/java/emu/grasscutter/game/world/Scene.java b/src/main/java/emu/grasscutter/game/world/Scene.java
index 9521ef212..9d1cf9635 100644
--- a/src/main/java/emu/grasscutter/game/world/Scene.java
+++ b/src/main/java/emu/grasscutter/game/world/Scene.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.game.world;
 
 import emu.grasscutter.Grasscutter;
-import emu.grasscutter.data.GameData;
-import emu.grasscutter.data.GameDepot;
+import emu.grasscutter.data.*;
 import emu.grasscutter.data.binout.SceneNpcBornEntry;
 import emu.grasscutter.data.binout.routes.Route;
 import emu.grasscutter.data.excels.ItemData;
@@ -12,47 +11,36 @@ import emu.grasscutter.data.excels.scene.SceneData;
 import emu.grasscutter.data.excels.world.WorldLevelData;
 import emu.grasscutter.data.server.Grid;
 import emu.grasscutter.game.avatar.Avatar;
-import emu.grasscutter.game.dungeons.DungeonManager;
-import emu.grasscutter.game.dungeons.DungeonSettleListener;
+import emu.grasscutter.game.dungeons.*;
 import emu.grasscutter.game.dungeons.challenge.WorldChallenge;
 import emu.grasscutter.game.dungeons.enums.DungeonPassConditionType;
 import emu.grasscutter.game.entity.*;
 import emu.grasscutter.game.entity.gadget.GadgetWorktop;
 import emu.grasscutter.game.inventory.GameItem;
 import emu.grasscutter.game.managers.blossom.BlossomManager;
-import emu.grasscutter.game.player.Player;
-import emu.grasscutter.game.player.TeamInfo;
+import emu.grasscutter.game.player.*;
 import emu.grasscutter.game.props.*;
 import emu.grasscutter.game.quest.QuestGroupSuite;
 import emu.grasscutter.game.world.data.TeleportProperties;
 import emu.grasscutter.net.packet.BasePacket;
 import emu.grasscutter.net.proto.AttackResultOuterClass.AttackResult;
-import emu.grasscutter.net.proto.EnterTypeOuterClass;
-import emu.grasscutter.net.proto.SelectWorktopOptionReqOuterClass;
+import emu.grasscutter.net.proto.*;
 import emu.grasscutter.net.proto.VisionTypeOuterClass.VisionType;
-import emu.grasscutter.scripts.SceneIndexManager;
-import emu.grasscutter.scripts.SceneScriptManager;
+import emu.grasscutter.scripts.*;
 import emu.grasscutter.scripts.constants.EventType;
-import emu.grasscutter.scripts.data.SceneBlock;
-import emu.grasscutter.scripts.data.SceneGroup;
-import emu.grasscutter.scripts.data.ScriptArgs;
+import emu.grasscutter.scripts.data.*;
 import emu.grasscutter.server.event.entity.EntityCreationEvent;
 import emu.grasscutter.server.event.player.PlayerTeleportEvent;
 import emu.grasscutter.server.packet.send.*;
 import emu.grasscutter.server.scheduler.ServerTaskScheduler;
 import emu.grasscutter.utils.objects.KahnsSort;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.val;
+import lombok.*;
 
 import javax.annotation.Nullable;
 import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.*;
 import java.util.stream.Collectors;
-import javax.annotation.Nullable;
-import lombok.*;
 
 public final class Scene {
     @Getter private final World world;
diff --git a/src/main/java/emu/grasscutter/game/world/SceneGroupInstance.java b/src/main/java/emu/grasscutter/game/world/SceneGroupInstance.java
index 9254f75b0..9c79f3f7a 100644
--- a/src/main/java/emu/grasscutter/game/world/SceneGroupInstance.java
+++ b/src/main/java/emu/grasscutter/game/world/SceneGroupInstance.java
@@ -1,20 +1,15 @@
 package emu.grasscutter.game.world;
 
-import dev.morphia.annotations.Entity;
-import dev.morphia.annotations.Id;
-import dev.morphia.annotations.Indexed;
+import dev.morphia.annotations.*;
 import emu.grasscutter.database.DatabaseHelper;
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.scripts.data.SceneGadget;
-import emu.grasscutter.scripts.data.SceneGroup;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import lombok.Getter;
-import lombok.Setter;
+import emu.grasscutter.scripts.data.*;
+import lombok.*;
 import org.bson.types.ObjectId;
 
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+
 @Entity(value = "group_instances", useDiscriminator = false)
 public final class SceneGroupInstance {
     @Id private ObjectId id;
diff --git a/src/main/java/emu/grasscutter/game/world/SpawnDataEntry.java b/src/main/java/emu/grasscutter/game/world/SpawnDataEntry.java
index a35a00e2c..3a9e47ac8 100644
--- a/src/main/java/emu/grasscutter/game/world/SpawnDataEntry.java
+++ b/src/main/java/emu/grasscutter/game/world/SpawnDataEntry.java
@@ -1,10 +1,9 @@
 package emu.grasscutter.game.world;
 
 import emu.grasscutter.data.GameDepot;
-import java.util.List;
-import java.util.Objects;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.*;
+
+import java.util.*;
 
 public class SpawnDataEntry {
     @Getter @Setter private transient SpawnGroupEntry group;
diff --git a/src/main/java/emu/grasscutter/game/world/World.java b/src/main/java/emu/grasscutter/game/world/World.java
index 8336556a6..c9bd9f0da 100644
--- a/src/main/java/emu/grasscutter/game/world/World.java
+++ b/src/main/java/emu/grasscutter/game/world/World.java
@@ -2,19 +2,14 @@ package emu.grasscutter.game.world;
 
 import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.excels.dungeon.DungeonData;
-import emu.grasscutter.game.entity.EntityTeam;
-import emu.grasscutter.game.entity.EntityWorld;
+import emu.grasscutter.game.entity.*;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.player.Player.SceneLoadState;
-import emu.grasscutter.game.props.EnterReason;
-import emu.grasscutter.game.props.EntityIdType;
-import emu.grasscutter.game.props.PlayerProperty;
-import emu.grasscutter.game.props.SceneType;
+import emu.grasscutter.game.props.*;
 import emu.grasscutter.game.quest.enums.QuestContent;
 import emu.grasscutter.game.world.data.TeleportProperties;
 import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo.SystemHint;
-import emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo.SystemHintType;
+import emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo.*;
 import emu.grasscutter.net.proto.EnterTypeOuterClass.EnterType;
 import emu.grasscutter.scripts.data.SceneConfig;
 import emu.grasscutter.server.event.player.PlayerTeleportEvent;
@@ -22,17 +17,11 @@ import emu.grasscutter.server.event.player.PlayerTeleportEvent.TeleportType;
 import emu.grasscutter.server.game.GameServer;
 import emu.grasscutter.server.packet.send.*;
 import emu.grasscutter.utils.ConversionUtils;
-import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import it.unimi.dsi.fastutil.ints.Int2ObjectMaps;
-import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
-import lombok.Getter;
-import lombok.val;
+import it.unimi.dsi.fastutil.ints.*;
+import lombok.*;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
+import java.util.*;
 
 import static emu.grasscutter.server.event.player.PlayerTeleportEvent.TeleportType.SCRIPT;
 
diff --git a/src/main/java/emu/grasscutter/game/world/WorldDataSystem.java b/src/main/java/emu/grasscutter/game/world/WorldDataSystem.java
index 39bc93717..43d7797ed 100644
--- a/src/main/java/emu/grasscutter/game/world/WorldDataSystem.java
+++ b/src/main/java/emu/grasscutter/game/world/WorldDataSystem.java
@@ -9,9 +9,10 @@ import emu.grasscutter.game.player.Player;
 import emu.grasscutter.net.proto.InvestigationMonsterOuterClass;
 import emu.grasscutter.scripts.data.*;
 import emu.grasscutter.server.game.*;
+import org.luaj.vm2.LuaError;
+
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
-import org.luaj.vm2.LuaError;
 
 public class WorldDataSystem extends BaseGameSystem {
     private final Map chestInteractHandlerMap; // chestType-Handler
diff --git a/src/main/java/emu/grasscutter/game/world/data/TeleportProperties.java b/src/main/java/emu/grasscutter/game/world/data/TeleportProperties.java
index 93c91c2d3..d78f985d5 100644
--- a/src/main/java/emu/grasscutter/game/world/data/TeleportProperties.java
+++ b/src/main/java/emu/grasscutter/game/world/data/TeleportProperties.java
@@ -4,8 +4,7 @@ import emu.grasscutter.game.props.EnterReason;
 import emu.grasscutter.game.world.Position;
 import emu.grasscutter.net.proto.EnterTypeOuterClass;
 import emu.grasscutter.server.event.player.PlayerTeleportEvent;
-import lombok.Builder;
-import lombok.Data;
+import lombok.*;
 
 @Data
 @Builder
diff --git a/src/main/java/emu/grasscutter/net/packet/BasePacket.java b/src/main/java/emu/grasscutter/net/packet/BasePacket.java
index 4e264a4f6..b99b9f52e 100644
--- a/src/main/java/emu/grasscutter/net/packet/BasePacket.java
+++ b/src/main/java/emu/grasscutter/net/packet/BasePacket.java
@@ -3,8 +3,8 @@ package emu.grasscutter.net.packet;
 import com.google.protobuf.GeneratedMessageV3;
 import emu.grasscutter.net.proto.PacketHeadOuterClass.PacketHead;
 import emu.grasscutter.utils.Crypto;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
+
+import java.io.*;
 
 public class BasePacket {
     private static final int const1 = 17767; // 0x4567
diff --git a/src/main/java/emu/grasscutter/net/packet/Opcodes.java b/src/main/java/emu/grasscutter/net/packet/Opcodes.java
index 10c8f07e9..2d9bc038d 100644
--- a/src/main/java/emu/grasscutter/net/packet/Opcodes.java
+++ b/src/main/java/emu/grasscutter/net/packet/Opcodes.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.net.packet;
 
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.*;
 
 @Retention(RetentionPolicy.RUNTIME)
 public @interface Opcodes {
diff --git a/src/main/java/emu/grasscutter/net/packet/PacketOpcodesUtils.java b/src/main/java/emu/grasscutter/net/packet/PacketOpcodesUtils.java
index 59f036224..25300c122 100644
--- a/src/main/java/emu/grasscutter/net/packet/PacketOpcodesUtils.java
+++ b/src/main/java/emu/grasscutter/net/packet/PacketOpcodesUtils.java
@@ -1,14 +1,11 @@
 package emu.grasscutter.net.packet;
 
-import emu.grasscutter.GameConstants;
-import emu.grasscutter.Grasscutter;
+import emu.grasscutter.*;
 import emu.grasscutter.utils.JsonUtils;
-import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.util.Set;
-import java.util.TreeMap;
+import it.unimi.dsi.fastutil.ints.*;
+
+import java.io.*;
+import java.util.*;
 import java.util.stream.Collectors;
 
 public class PacketOpcodesUtils {
diff --git a/src/main/java/emu/grasscutter/net/packet/PacketWriter.java b/src/main/java/emu/grasscutter/net/packet/PacketWriter.java
index 75fb3d432..364a29369 100644
--- a/src/main/java/emu/grasscutter/net/packet/PacketWriter.java
+++ b/src/main/java/emu/grasscutter/net/packet/PacketWriter.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.net.packet;
 
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
+import java.io.*;
 
 public class PacketWriter {
     // Little endian
diff --git a/src/main/java/emu/grasscutter/plugin/Plugin.java b/src/main/java/emu/grasscutter/plugin/Plugin.java
index 03f14a824..6355a168a 100644
--- a/src/main/java/emu/grasscutter/plugin/Plugin.java
+++ b/src/main/java/emu/grasscutter/plugin/Plugin.java
@@ -5,11 +5,12 @@ import emu.grasscutter.Grasscutter;
 import emu.grasscutter.plugin.api.ServerHelper;
 import emu.grasscutter.server.game.GameServer;
 import emu.grasscutter.utils.FileUtils;
-import java.io.*;
-import java.net.URLClassLoader;
 import lombok.EqualsAndHashCode;
 import org.slf4j.*;
 
+import java.io.*;
+import java.net.URLClassLoader;
+
 /** The base class for all plugins to extend. */
 @EqualsAndHashCode
 public abstract class Plugin {
diff --git a/src/main/java/emu/grasscutter/plugin/PluginManager.java b/src/main/java/emu/grasscutter/plugin/PluginManager.java
index 886875d60..dc7d2e9e8 100644
--- a/src/main/java/emu/grasscutter/plugin/PluginManager.java
+++ b/src/main/java/emu/grasscutter/plugin/PluginManager.java
@@ -1,6 +1,6 @@
 package emu.grasscutter.plugin;
 
-import emu.grasscutter.*;
+import emu.grasscutter.Grasscutter;
 import emu.grasscutter.server.event.*;
 import emu.grasscutter.utils.*;
 import lombok.*;
diff --git a/src/main/java/emu/grasscutter/plugin/api/PlayerHook.java b/src/main/java/emu/grasscutter/plugin/api/PlayerHook.java
index 4e13ebac4..64c7b56f9 100644
--- a/src/main/java/emu/grasscutter/plugin/api/PlayerHook.java
+++ b/src/main/java/emu/grasscutter/plugin/api/PlayerHook.java
@@ -3,14 +3,11 @@ package emu.grasscutter.plugin.api;
 import emu.grasscutter.game.avatar.Avatar;
 import emu.grasscutter.game.entity.EntityAvatar;
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.game.props.EnterReason;
-import emu.grasscutter.game.props.FightProperty;
+import emu.grasscutter.game.props.*;
 import emu.grasscutter.game.world.Position;
 import emu.grasscutter.net.packet.BasePacket;
 import emu.grasscutter.net.proto.EnterTypeOuterClass.EnterType;
-import emu.grasscutter.server.packet.send.PacketAvatarFightPropUpdateNotify;
-import emu.grasscutter.server.packet.send.PacketAvatarLifeStateChangeNotify;
-import emu.grasscutter.server.packet.send.PacketPlayerEnterSceneNotify;
+import emu.grasscutter.server.packet.send.*;
 
 /** Hooks into the {@link Player} class, adding convenient ways to do certain things. */
 public interface PlayerHook {
diff --git a/src/main/java/emu/grasscutter/plugin/api/ServerHelper.java b/src/main/java/emu/grasscutter/plugin/api/ServerHelper.java
index 3980f4e6d..5b665ec36 100644
--- a/src/main/java/emu/grasscutter/plugin/api/ServerHelper.java
+++ b/src/main/java/emu/grasscutter/plugin/api/ServerHelper.java
@@ -2,17 +2,13 @@ package emu.grasscutter.plugin.api;
 
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.auth.AuthenticationSystem;
-import emu.grasscutter.command.Command;
-import emu.grasscutter.command.CommandHandler;
-import emu.grasscutter.command.CommandMap;
-import emu.grasscutter.command.PermissionHandler;
+import emu.grasscutter.command.*;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.server.game.GameServer;
-import emu.grasscutter.server.http.HttpServer;
-import emu.grasscutter.server.http.Router;
+import emu.grasscutter.server.http.*;
 import emu.grasscutter.server.scheduler.ServerTaskScheduler;
-import java.util.ArrayList;
-import java.util.List;
+
+import java.util.*;
 import java.util.stream.Stream;
 
 /** Hooks into the {@link GameServer} class, adding convenient ways to do certain things. */
diff --git a/src/main/java/emu/grasscutter/scripts/EntityControllerScriptManager.java b/src/main/java/emu/grasscutter/scripts/EntityControllerScriptManager.java
index 1e4a84e92..05dbf1b50 100644
--- a/src/main/java/emu/grasscutter/scripts/EntityControllerScriptManager.java
+++ b/src/main/java/emu/grasscutter/scripts/EntityControllerScriptManager.java
@@ -1,14 +1,15 @@
 package emu.grasscutter.scripts;
 
-import static emu.grasscutter.utils.FileUtils.getScriptPath;
-
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.scripts.data.controller.EntityController;
+import lombok.val;
+
 import java.io.IOException;
 import java.nio.file.Files;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
-import lombok.val;
+
+import static emu.grasscutter.utils.FileUtils.getScriptPath;
 
 public class EntityControllerScriptManager {
     private static final Map gadgetController = new ConcurrentHashMap<>();
diff --git a/src/main/java/emu/grasscutter/scripts/SceneIndexManager.java b/src/main/java/emu/grasscutter/scripts/SceneIndexManager.java
index b5533cc7e..eca62895f 100644
--- a/src/main/java/emu/grasscutter/scripts/SceneIndexManager.java
+++ b/src/main/java/emu/grasscutter/scripts/SceneIndexManager.java
@@ -1,12 +1,9 @@
 package emu.grasscutter.scripts;
 
-import com.github.davidmoten.rtreemulti.Entry;
-import com.github.davidmoten.rtreemulti.RTree;
-import com.github.davidmoten.rtreemulti.geometry.Geometry;
-import com.github.davidmoten.rtreemulti.geometry.Rectangle;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
+import com.github.davidmoten.rtreemulti.*;
+import com.github.davidmoten.rtreemulti.geometry.*;
+
+import java.util.*;
 import java.util.function.Function;
 
 public class SceneIndexManager {
diff --git a/src/main/java/emu/grasscutter/scripts/SceneScriptManager.java b/src/main/java/emu/grasscutter/scripts/SceneScriptManager.java
index 4c461e1e0..576a75936 100644
--- a/src/main/java/emu/grasscutter/scripts/SceneScriptManager.java
+++ b/src/main/java/emu/grasscutter/scripts/SceneScriptManager.java
@@ -1,7 +1,5 @@
 package emu.grasscutter.scripts;
 
-import static emu.grasscutter.scripts.constants.EventType.EVENT_TIMER_EVENT;
-
 import com.github.davidmoten.rtreemulti.RTree;
 import com.github.davidmoten.rtreemulti.geometry.Geometry;
 import emu.grasscutter.Grasscutter;
@@ -21,17 +19,20 @@ import emu.grasscutter.server.packet.send.PacketGroupSuiteNotify;
 import emu.grasscutter.utils.*;
 import io.netty.util.concurrent.FastThreadLocalThread;
 import it.unimi.dsi.fastutil.ints.*;
+import kotlin.Pair;
+import lombok.val;
+import org.luaj.vm2.*;
+import org.luaj.vm2.lib.jse.CoerceJavaToLua;
+
+import javax.annotation.*;
 import java.io.*;
 import java.nio.file.Files;
 import java.util.*;
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
-import javax.annotation.*;
-import kotlin.Pair;
-import lombok.val;
-import org.luaj.vm2.*;
-import org.luaj.vm2.lib.jse.CoerceJavaToLua;
+
+import static emu.grasscutter.scripts.constants.EventType.EVENT_TIMER_EVENT;
 
 public class SceneScriptManager {
     private final Scene scene;
diff --git a/src/main/java/emu/grasscutter/scripts/SceneTimeAxis.java b/src/main/java/emu/grasscutter/scripts/SceneTimeAxis.java
index d43691b48..6b9e22be3 100644
--- a/src/main/java/emu/grasscutter/scripts/SceneTimeAxis.java
+++ b/src/main/java/emu/grasscutter/scripts/SceneTimeAxis.java
@@ -2,9 +2,10 @@ package emu.grasscutter.scripts;
 
 import emu.grasscutter.scripts.constants.EventType;
 import emu.grasscutter.scripts.data.ScriptArgs;
-import java.util.*;
 import lombok.*;
 
+import java.util.*;
+
 @Getter
 @RequiredArgsConstructor
 public final class SceneTimeAxis {
diff --git a/src/main/java/emu/grasscutter/scripts/ScriptLoader.java b/src/main/java/emu/grasscutter/scripts/ScriptLoader.java
index e58cdfeff..67cdb8fa6 100644
--- a/src/main/java/emu/grasscutter/scripts/ScriptLoader.java
+++ b/src/main/java/emu/grasscutter/scripts/ScriptLoader.java
@@ -11,14 +11,14 @@ import emu.grasscutter.scripts.serializer.*;
 import emu.grasscutter.utils.FileUtils;
 import lombok.Getter;
 import org.luaj.vm2.*;
-import org.luaj.vm2.lib.*;
+import org.luaj.vm2.lib.OneArgFunction;
 import org.luaj.vm2.lib.jse.CoerceJavaToLua;
 import org.luaj.vm2.script.*;
 
 import javax.script.*;
 import java.io.IOException;
 import java.lang.ref.SoftReference;
-import java.nio.file.*;
+import java.nio.file.Files;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicReference;
diff --git a/src/main/java/emu/grasscutter/scripts/ScriptUtils.java b/src/main/java/emu/grasscutter/scripts/ScriptUtils.java
index 96c36a636..4e183820d 100644
--- a/src/main/java/emu/grasscutter/scripts/ScriptUtils.java
+++ b/src/main/java/emu/grasscutter/scripts/ScriptUtils.java
@@ -2,9 +2,9 @@ package emu.grasscutter.scripts;
 
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.game.world.Position;
+import org.luaj.vm2.*;
+
 import java.util.HashMap;
-import org.luaj.vm2.LuaTable;
-import org.luaj.vm2.LuaValue;
 
 public interface ScriptUtils {
     static HashMap toMap(LuaTable table) {
diff --git a/src/main/java/emu/grasscutter/scripts/data/Explore.java b/src/main/java/emu/grasscutter/scripts/data/Explore.java
index bfa4022e8..fb819e979 100644
--- a/src/main/java/emu/grasscutter/scripts/data/Explore.java
+++ b/src/main/java/emu/grasscutter/scripts/data/Explore.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.scripts.data;
 
-import lombok.Setter;
-import lombok.ToString;
+import lombok.*;
 
 @ToString
 @Setter
diff --git a/src/main/java/emu/grasscutter/scripts/data/SceneBlock.java b/src/main/java/emu/grasscutter/scripts/data/SceneBlock.java
index c135ef020..dc71c4e3a 100644
--- a/src/main/java/emu/grasscutter/scripts/data/SceneBlock.java
+++ b/src/main/java/emu/grasscutter/scripts/data/SceneBlock.java
@@ -5,10 +5,11 @@ import com.github.davidmoten.rtreemulti.geometry.*;
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.game.world.Position;
 import emu.grasscutter.scripts.*;
+import lombok.*;
+
+import javax.script.*;
 import java.util.Map;
 import java.util.stream.Collectors;
-import javax.script.*;
-import lombok.*;
 
 @ToString
 @Setter
diff --git a/src/main/java/emu/grasscutter/scripts/data/SceneBossChest.java b/src/main/java/emu/grasscutter/scripts/data/SceneBossChest.java
index f0009eb05..cdbef0d72 100644
--- a/src/main/java/emu/grasscutter/scripts/data/SceneBossChest.java
+++ b/src/main/java/emu/grasscutter/scripts/data/SceneBossChest.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.scripts.data;
 
-import lombok.Setter;
-import lombok.ToString;
+import lombok.*;
 
 @Setter
 @ToString
diff --git a/src/main/java/emu/grasscutter/scripts/data/SceneBusiness.java b/src/main/java/emu/grasscutter/scripts/data/SceneBusiness.java
index 2609f9b5d..76773aa08 100644
--- a/src/main/java/emu/grasscutter/scripts/data/SceneBusiness.java
+++ b/src/main/java/emu/grasscutter/scripts/data/SceneBusiness.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.scripts.data;
 
-import lombok.Setter;
-import lombok.ToString;
+import lombok.*;
 
 @ToString
 @Setter
diff --git a/src/main/java/emu/grasscutter/scripts/data/SceneConfig.java b/src/main/java/emu/grasscutter/scripts/data/SceneConfig.java
index 74b6c1164..0eec2dd72 100644
--- a/src/main/java/emu/grasscutter/scripts/data/SceneConfig.java
+++ b/src/main/java/emu/grasscutter/scripts/data/SceneConfig.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.scripts.data;
 
 import emu.grasscutter.game.world.Position;
-import lombok.Setter;
-import lombok.ToString;
+import lombok.*;
 
 @ToString
 @Setter
diff --git a/src/main/java/emu/grasscutter/scripts/data/SceneGadget.java b/src/main/java/emu/grasscutter/scripts/data/SceneGadget.java
index a9ffa1548..253a67e7d 100644
--- a/src/main/java/emu/grasscutter/scripts/data/SceneGadget.java
+++ b/src/main/java/emu/grasscutter/scripts/data/SceneGadget.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.scripts.data;
 
-import lombok.Setter;
-import lombok.ToString;
+import lombok.*;
 
 @ToString
 @Setter
diff --git a/src/main/java/emu/grasscutter/scripts/data/SceneGarbage.java b/src/main/java/emu/grasscutter/scripts/data/SceneGarbage.java
index 2bb99f59d..2229f5d10 100644
--- a/src/main/java/emu/grasscutter/scripts/data/SceneGarbage.java
+++ b/src/main/java/emu/grasscutter/scripts/data/SceneGarbage.java
@@ -1,8 +1,8 @@
 package emu.grasscutter.scripts.data;
 
+import lombok.*;
+
 import java.util.List;
-import lombok.Setter;
-import lombok.ToString;
 
 @ToString
 @Setter
diff --git a/src/main/java/emu/grasscutter/scripts/data/SceneInitConfig.java b/src/main/java/emu/grasscutter/scripts/data/SceneInitConfig.java
index 95f6216dd..c52e33db9 100644
--- a/src/main/java/emu/grasscutter/scripts/data/SceneInitConfig.java
+++ b/src/main/java/emu/grasscutter/scripts/data/SceneInitConfig.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.scripts.data;
 
-import lombok.Setter;
-import lombok.ToString;
+import lombok.*;
 
 @ToString
 @Setter
diff --git a/src/main/java/emu/grasscutter/scripts/data/SceneMeta.java b/src/main/java/emu/grasscutter/scripts/data/SceneMeta.java
index 93038eec2..4377053a2 100644
--- a/src/main/java/emu/grasscutter/scripts/data/SceneMeta.java
+++ b/src/main/java/emu/grasscutter/scripts/data/SceneMeta.java
@@ -4,10 +4,11 @@ import com.github.davidmoten.rtreemulti.RTree;
 import com.github.davidmoten.rtreemulti.geometry.Geometry;
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.scripts.*;
+import lombok.*;
+
+import javax.script.*;
 import java.util.*;
 import java.util.stream.Collectors;
-import javax.script.*;
-import lombok.*;
 
 @ToString
 @Setter
diff --git a/src/main/java/emu/grasscutter/scripts/data/SceneMonster.java b/src/main/java/emu/grasscutter/scripts/data/SceneMonster.java
index c5493d6e0..c44a1898d 100644
--- a/src/main/java/emu/grasscutter/scripts/data/SceneMonster.java
+++ b/src/main/java/emu/grasscutter/scripts/data/SceneMonster.java
@@ -1,8 +1,8 @@
 package emu.grasscutter.scripts.data;
 
+import lombok.*;
+
 import java.util.List;
-import lombok.Setter;
-import lombok.ToString;
 
 @ToString
 @Setter
diff --git a/src/main/java/emu/grasscutter/scripts/data/SceneNPC.java b/src/main/java/emu/grasscutter/scripts/data/SceneNPC.java
index 1dfb44211..d97c72e96 100644
--- a/src/main/java/emu/grasscutter/scripts/data/SceneNPC.java
+++ b/src/main/java/emu/grasscutter/scripts/data/SceneNPC.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.scripts.data;
 
-import lombok.Setter;
-import lombok.ToString;
+import lombok.*;
 
 @ToString
 @Setter
diff --git a/src/main/java/emu/grasscutter/scripts/data/SceneObject.java b/src/main/java/emu/grasscutter/scripts/data/SceneObject.java
index e81adf2c4..d15b16192 100644
--- a/src/main/java/emu/grasscutter/scripts/data/SceneObject.java
+++ b/src/main/java/emu/grasscutter/scripts/data/SceneObject.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.scripts.data;
 
 import emu.grasscutter.game.world.Position;
-import lombok.Setter;
-import lombok.ToString;
+import lombok.*;
 
 @ToString
 @Setter
diff --git a/src/main/java/emu/grasscutter/scripts/data/SceneRegion.java b/src/main/java/emu/grasscutter/scripts/data/SceneRegion.java
index 697c81f0a..8fe842a33 100644
--- a/src/main/java/emu/grasscutter/scripts/data/SceneRegion.java
+++ b/src/main/java/emu/grasscutter/scripts/data/SceneRegion.java
@@ -2,9 +2,9 @@ package emu.grasscutter.scripts.data;
 
 import emu.grasscutter.game.world.Position;
 import emu.grasscutter.scripts.constants.ScriptRegionShape;
+import lombok.*;
+
 import java.util.List;
-import lombok.EqualsAndHashCode;
-import lombok.Setter;
 
 @Setter
 @EqualsAndHashCode
diff --git a/src/main/java/emu/grasscutter/scripts/data/SceneReplaceable.java b/src/main/java/emu/grasscutter/scripts/data/SceneReplaceable.java
index 127760279..7c8e85b09 100644
--- a/src/main/java/emu/grasscutter/scripts/data/SceneReplaceable.java
+++ b/src/main/java/emu/grasscutter/scripts/data/SceneReplaceable.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.scripts.data;
 
-import lombok.Setter;
-import lombok.ToString;
+import lombok.*;
 
 @ToString
 @Setter
diff --git a/src/main/java/emu/grasscutter/scripts/data/SceneSuite.java b/src/main/java/emu/grasscutter/scripts/data/SceneSuite.java
index 98a23d70c..0a4775d61 100644
--- a/src/main/java/emu/grasscutter/scripts/data/SceneSuite.java
+++ b/src/main/java/emu/grasscutter/scripts/data/SceneSuite.java
@@ -1,9 +1,8 @@
 package emu.grasscutter.scripts.data;
 
-import java.util.ArrayList;
-import java.util.List;
-import lombok.Setter;
-import lombok.ToString;
+import lombok.*;
+
+import java.util.*;
 
 @ToString
 @Setter
diff --git a/src/main/java/emu/grasscutter/scripts/data/SceneVar.java b/src/main/java/emu/grasscutter/scripts/data/SceneVar.java
index 5e9fb4d4c..2ad5529d1 100644
--- a/src/main/java/emu/grasscutter/scripts/data/SceneVar.java
+++ b/src/main/java/emu/grasscutter/scripts/data/SceneVar.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.scripts.data;
 
-import lombok.Setter;
-import lombok.ToString;
+import lombok.*;
 
 @ToString
 @Setter
diff --git a/src/main/java/emu/grasscutter/scripts/data/controller/EntityController.java b/src/main/java/emu/grasscutter/scripts/data/controller/EntityController.java
index 82b7c2a65..2473ec76f 100644
--- a/src/main/java/emu/grasscutter/scripts/data/controller/EntityController.java
+++ b/src/main/java/emu/grasscutter/scripts/data/controller/EntityController.java
@@ -4,10 +4,11 @@ import emu.grasscutter.*;
 import emu.grasscutter.game.entity.GameEntity;
 import emu.grasscutter.game.props.ElementType;
 import emu.grasscutter.scripts.*;
-import java.util.Set;
-import javax.script.*;
 import org.luaj.vm2.*;
 
+import javax.script.*;
+import java.util.Set;
+
 public class EntityController {
     private static final Set SERVER_CALLED = Set.of("OnBeHurt", "OnDie", "OnTimer");
 
diff --git a/src/main/java/emu/grasscutter/scripts/serializer/LuaSerializer.java b/src/main/java/emu/grasscutter/scripts/serializer/LuaSerializer.java
index f81006e83..dcd4f1282 100644
--- a/src/main/java/emu/grasscutter/scripts/serializer/LuaSerializer.java
+++ b/src/main/java/emu/grasscutter/scripts/serializer/LuaSerializer.java
@@ -1,21 +1,16 @@
 package emu.grasscutter.scripts.serializer;
 
-import com.esotericsoftware.reflectasm.ConstructorAccess;
-import com.esotericsoftware.reflectasm.MethodAccess;
+import com.esotericsoftware.reflectasm.*;
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.scripts.ScriptUtils;
-import java.lang.reflect.Field;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Data;
+import lombok.*;
 import lombok.experimental.FieldDefaults;
 import org.jetbrains.annotations.Nullable;
-import org.luaj.vm2.LuaTable;
-import org.luaj.vm2.LuaValue;
+import org.luaj.vm2.*;
+
+import java.lang.reflect.*;
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
 
 public class LuaSerializer implements Serializer {
 
diff --git a/src/main/java/emu/grasscutter/scripts/serializer/LuaTableJacksonSerializer.java b/src/main/java/emu/grasscutter/scripts/serializer/LuaTableJacksonSerializer.java
index 3d5010ecf..a1f8c6b78 100644
--- a/src/main/java/emu/grasscutter/scripts/serializer/LuaTableJacksonSerializer.java
+++ b/src/main/java/emu/grasscutter/scripts/serializer/LuaTableJacksonSerializer.java
@@ -1,19 +1,16 @@
 package emu.grasscutter.scripts.serializer;
 
-import com.fasterxml.jackson.annotation.JsonSetter;
-import com.fasterxml.jackson.annotation.Nulls;
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.annotation.*;
+import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.json.JsonMapper;
 import com.fasterxml.jackson.databind.module.SimpleModule;
-import com.fasterxml.jackson.databind.type.CollectionType;
-import com.fasterxml.jackson.databind.type.MapType;
+import com.fasterxml.jackson.databind.type.*;
 import emu.grasscutter.Grasscutter;
+import org.luaj.vm2.*;
+
 import java.io.IOException;
 import java.util.*;
-import org.luaj.vm2.LuaTable;
-import org.luaj.vm2.LuaValue;
 
 public class LuaTableJacksonSerializer extends JsonSerializer implements Serializer {
 
diff --git a/src/main/java/emu/grasscutter/scripts/serializer/Serializer.java b/src/main/java/emu/grasscutter/scripts/serializer/Serializer.java
index 8251b53f8..563ffa770 100644
--- a/src/main/java/emu/grasscutter/scripts/serializer/Serializer.java
+++ b/src/main/java/emu/grasscutter/scripts/serializer/Serializer.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.scripts.serializer;
 
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 public interface Serializer {
 
diff --git a/src/main/java/emu/grasscutter/scripts/service/ScriptMonsterSpawnService.java b/src/main/java/emu/grasscutter/scripts/service/ScriptMonsterSpawnService.java
index 9ffd2c663..d948167d8 100644
--- a/src/main/java/emu/grasscutter/scripts/service/ScriptMonsterSpawnService.java
+++ b/src/main/java/emu/grasscutter/scripts/service/ScriptMonsterSpawnService.java
@@ -3,8 +3,8 @@ package emu.grasscutter.scripts.service;
 import emu.grasscutter.game.entity.EntityMonster;
 import emu.grasscutter.scripts.SceneScriptManager;
 import emu.grasscutter.scripts.listener.ScriptMonsterListener;
-import java.util.ArrayList;
-import java.util.List;
+
+import java.util.*;
 
 public class ScriptMonsterSpawnService {
 
diff --git a/src/main/java/emu/grasscutter/scripts/service/ScriptMonsterTideService.java b/src/main/java/emu/grasscutter/scripts/service/ScriptMonsterTideService.java
index b7261089d..e12c447b0 100644
--- a/src/main/java/emu/grasscutter/scripts/service/ScriptMonsterTideService.java
+++ b/src/main/java/emu/grasscutter/scripts/service/ScriptMonsterTideService.java
@@ -3,10 +3,9 @@ package emu.grasscutter.scripts.service;
 import emu.grasscutter.game.entity.EntityMonster;
 import emu.grasscutter.scripts.SceneScriptManager;
 import emu.grasscutter.scripts.constants.EventType;
-import emu.grasscutter.scripts.data.SceneGroup;
-import emu.grasscutter.scripts.data.SceneMonster;
-import emu.grasscutter.scripts.data.ScriptArgs;
+import emu.grasscutter.scripts.data.*;
 import emu.grasscutter.scripts.listener.ScriptMonsterListener;
+
 import java.util.List;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.atomic.AtomicInteger;
diff --git a/src/main/java/emu/grasscutter/server/dispatch/DispatchClient.java b/src/main/java/emu/grasscutter/server/dispatch/DispatchClient.java
index 4fbcc5f2c..72f47718d 100644
--- a/src/main/java/emu/grasscutter/server/dispatch/DispatchClient.java
+++ b/src/main/java/emu/grasscutter/server/dispatch/DispatchClient.java
@@ -1,34 +1,27 @@
 package emu.grasscutter.server.dispatch;
 
-import static emu.grasscutter.config.Configuration.DISPATCH_INFO;
-
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
+import com.google.gson.*;
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.database.DatabaseHelper;
 import emu.grasscutter.server.event.dispatch.ServerMessageEvent;
 import emu.grasscutter.server.game.GameServer;
 import emu.grasscutter.server.http.handlers.GachaHandler;
-import emu.grasscutter.utils.Crypto;
-import emu.grasscutter.utils.DispatchUtils;
-import emu.grasscutter.utils.JsonUtils;
+import emu.grasscutter.utils.*;
 import emu.grasscutter.utils.objects.HandbookBody;
-import java.net.ConnectException;
-import java.net.URI;
-import java.nio.ByteBuffer;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.BiConsumer;
-import java.util.function.Consumer;
 import lombok.Getter;
 import org.java_websocket.WebSocket;
 import org.java_websocket.client.WebSocketClient;
 import org.java_websocket.handshake.ServerHandshake;
 import org.slf4j.Logger;
 
+import java.net.*;
+import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
+import java.util.*;
+import java.util.function.*;
+
+import static emu.grasscutter.config.Configuration.DISPATCH_INFO;
+
 public final class DispatchClient extends WebSocketClient implements IDispatcher {
     @Getter private final Logger logger = Grasscutter.getLogger();
     @Getter private final Map> handlers = new HashMap<>();
diff --git a/src/main/java/emu/grasscutter/server/dispatch/DispatchServer.java b/src/main/java/emu/grasscutter/server/dispatch/DispatchServer.java
index 8b552792f..f6182775a 100644
--- a/src/main/java/emu/grasscutter/server/dispatch/DispatchServer.java
+++ b/src/main/java/emu/grasscutter/server/dispatch/DispatchServer.java
@@ -1,27 +1,24 @@
 package emu.grasscutter.server.dispatch;
 
-import static emu.grasscutter.config.Configuration.DISPATCH_INFO;
-
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
+import com.google.gson.*;
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.database.DatabaseHelper;
 import emu.grasscutter.server.event.dispatch.ServerMessageEvent;
 import emu.grasscutter.utils.Crypto;
-import java.net.InetSocketAddress;
-import java.nio.ByteBuffer;
-import java.nio.charset.StandardCharsets;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.BiConsumer;
-import java.util.function.Consumer;
 import lombok.Getter;
 import org.java_websocket.WebSocket;
 import org.java_websocket.handshake.ClientHandshake;
 import org.java_websocket.server.WebSocketServer;
 import org.slf4j.Logger;
 
+import java.net.InetSocketAddress;
+import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
+import java.util.*;
+import java.util.function.*;
+
+import static emu.grasscutter.config.Configuration.DISPATCH_INFO;
+
 /* Internal communications server. */
 public final class DispatchServer extends WebSocketServer implements IDispatcher {
     @Getter private final Logger logger = Grasscutter.getLogger();
diff --git a/src/main/java/emu/grasscutter/server/dispatch/IDispatcher.java b/src/main/java/emu/grasscutter/server/dispatch/IDispatcher.java
index 562f2f62e..21724f719 100644
--- a/src/main/java/emu/grasscutter/server/dispatch/IDispatcher.java
+++ b/src/main/java/emu/grasscutter/server/dispatch/IDispatcher.java
@@ -1,27 +1,19 @@
 package emu.grasscutter.server.dispatch;
 
-import static emu.grasscutter.config.Configuration.DISPATCH_INFO;
-
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
+import com.google.gson.*;
 import emu.grasscutter.utils.Crypto;
 import emu.grasscutter.utils.JsonAdapters.ByteArrayAdapter;
 import emu.grasscutter.utils.objects.JObject;
-import java.nio.charset.StandardCharsets;
-import java.util.Base64;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.TimeUnit;
-import java.util.function.BiConsumer;
-import java.util.function.Consumer;
-import java.util.function.Function;
 import org.java_websocket.WebSocket;
 import org.slf4j.Logger;
 
+import java.nio.charset.StandardCharsets;
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.function.*;
+
+import static emu.grasscutter.config.Configuration.DISPATCH_INFO;
+
 public interface IDispatcher {
     Gson JSON =
             new GsonBuilder()
diff --git a/src/main/java/emu/grasscutter/server/event/dispatch/ServerMessageEvent.java b/src/main/java/emu/grasscutter/server/event/dispatch/ServerMessageEvent.java
index e02abbfec..bb55ee966 100644
--- a/src/main/java/emu/grasscutter/server/event/dispatch/ServerMessageEvent.java
+++ b/src/main/java/emu/grasscutter/server/event/dispatch/ServerMessageEvent.java
@@ -1,14 +1,13 @@
 package emu.grasscutter.server.event.dispatch;
 
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
+import com.google.gson.*;
 import emu.grasscutter.server.dispatch.IDispatcher;
 import emu.grasscutter.server.event.Event;
-import java.util.Base64;
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
+import lombok.*;
 import org.java_websocket.WebSocket;
 
+import java.util.Base64;
+
 @Getter
 @RequiredArgsConstructor
 public final class ServerMessageEvent extends Event {
diff --git a/src/main/java/emu/grasscutter/server/event/entity/EntityCreationEvent.java b/src/main/java/emu/grasscutter/server/event/entity/EntityCreationEvent.java
index fd0766323..9e7318005 100644
--- a/src/main/java/emu/grasscutter/server/event/entity/EntityCreationEvent.java
+++ b/src/main/java/emu/grasscutter/server/event/entity/EntityCreationEvent.java
@@ -2,10 +2,9 @@ package emu.grasscutter.server.event.entity;
 
 import emu.grasscutter.game.entity.GameEntity;
 import emu.grasscutter.server.event.Event;
+import lombok.*;
+
 import javax.annotation.Nullable;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.Setter;
 
 /** Invoked when an entity is created. */
 @AllArgsConstructor
diff --git a/src/main/java/emu/grasscutter/server/event/entity/EntityDamageEvent.java b/src/main/java/emu/grasscutter/server/event/entity/EntityDamageEvent.java
index 932d17bc1..bbe8ceabf 100644
--- a/src/main/java/emu/grasscutter/server/event/entity/EntityDamageEvent.java
+++ b/src/main/java/emu/grasscutter/server/event/entity/EntityDamageEvent.java
@@ -4,9 +4,9 @@ import emu.grasscutter.game.entity.GameEntity;
 import emu.grasscutter.game.props.ElementType;
 import emu.grasscutter.server.event.Cancellable;
 import emu.grasscutter.server.event.types.EntityEvent;
+import lombok.*;
+
 import javax.annotation.Nullable;
-import lombok.Getter;
-import lombok.Setter;
 
 public final class EntityDamageEvent extends EntityEvent implements Cancellable {
     @Getter @Setter private float damage;
diff --git a/src/main/java/emu/grasscutter/server/event/entity/EntityDeathEvent.java b/src/main/java/emu/grasscutter/server/event/entity/EntityDeathEvent.java
index 2f6c3c1df..c7812c21f 100644
--- a/src/main/java/emu/grasscutter/server/event/entity/EntityDeathEvent.java
+++ b/src/main/java/emu/grasscutter/server/event/entity/EntityDeathEvent.java
@@ -3,9 +3,10 @@ package emu.grasscutter.server.event.entity;
 import emu.grasscutter.game.entity.GameEntity;
 import emu.grasscutter.game.world.Location;
 import emu.grasscutter.server.event.types.EntityEvent;
-import javax.annotation.Nullable;
 import lombok.Getter;
 
+import javax.annotation.Nullable;
+
 public final class EntityDeathEvent extends EntityEvent {
     @Getter private final Location deathLocation;
     @Getter @Nullable private final GameEntity killer;
diff --git a/src/main/java/emu/grasscutter/server/event/game/ExecuteCommandEvent.java b/src/main/java/emu/grasscutter/server/event/game/ExecuteCommandEvent.java
index 6b880f3cf..bfc3b8245 100644
--- a/src/main/java/emu/grasscutter/server/event/game/ExecuteCommandEvent.java
+++ b/src/main/java/emu/grasscutter/server/event/game/ExecuteCommandEvent.java
@@ -2,9 +2,10 @@ package emu.grasscutter.server.event.game;
 
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.server.event.*;
-import javax.annotation.Nullable;
 import lombok.*;
 
+import javax.annotation.Nullable;
+
 @Getter
 @AllArgsConstructor
 public final class ExecuteCommandEvent extends Event implements Cancellable {
diff --git a/src/main/java/emu/grasscutter/server/event/game/ReceiveCommandFeedbackEvent.java b/src/main/java/emu/grasscutter/server/event/game/ReceiveCommandFeedbackEvent.java
index b0c14e2f0..a9b61c31b 100644
--- a/src/main/java/emu/grasscutter/server/event/game/ReceiveCommandFeedbackEvent.java
+++ b/src/main/java/emu/grasscutter/server/event/game/ReceiveCommandFeedbackEvent.java
@@ -3,6 +3,7 @@ package emu.grasscutter.server.event.game;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.server.event.Cancellable;
 import emu.grasscutter.server.event.types.ServerEvent;
+
 import javax.annotation.Nullable;
 
 public final class ReceiveCommandFeedbackEvent extends ServerEvent implements Cancellable {
diff --git a/src/main/java/emu/grasscutter/server/event/game/ServerTickEvent.java b/src/main/java/emu/grasscutter/server/event/game/ServerTickEvent.java
index 2c60d9fb6..1762997de 100644
--- a/src/main/java/emu/grasscutter/server/event/game/ServerTickEvent.java
+++ b/src/main/java/emu/grasscutter/server/event/game/ServerTickEvent.java
@@ -1,6 +1,7 @@
 package emu.grasscutter.server.event.game;
 
 import emu.grasscutter.server.event.types.ServerEvent;
+
 import java.time.Instant;
 
 public final class ServerTickEvent extends ServerEvent {
diff --git a/src/main/java/emu/grasscutter/server/event/internal/ServerStartEvent.java b/src/main/java/emu/grasscutter/server/event/internal/ServerStartEvent.java
index a5e60d7e4..31294d96c 100644
--- a/src/main/java/emu/grasscutter/server/event/internal/ServerStartEvent.java
+++ b/src/main/java/emu/grasscutter/server/event/internal/ServerStartEvent.java
@@ -1,6 +1,7 @@
 package emu.grasscutter.server.event.internal;
 
 import emu.grasscutter.server.event.types.ServerEvent;
+
 import java.time.OffsetDateTime;
 
 public final class ServerStartEvent extends ServerEvent {
diff --git a/src/main/java/emu/grasscutter/server/event/internal/ServerStopEvent.java b/src/main/java/emu/grasscutter/server/event/internal/ServerStopEvent.java
index 2fc6bc6a4..c4e7ca8cf 100644
--- a/src/main/java/emu/grasscutter/server/event/internal/ServerStopEvent.java
+++ b/src/main/java/emu/grasscutter/server/event/internal/ServerStopEvent.java
@@ -1,6 +1,7 @@
 package emu.grasscutter.server.event.internal;
 
 import emu.grasscutter.server.event.types.ServerEvent;
+
 import java.time.OffsetDateTime;
 
 public final class ServerStopEvent extends ServerEvent {
diff --git a/src/main/java/emu/grasscutter/server/event/player/PlayerChatEvent.java b/src/main/java/emu/grasscutter/server/event/player/PlayerChatEvent.java
index e5d03cab3..3d4857803 100644
--- a/src/main/java/emu/grasscutter/server/event/player/PlayerChatEvent.java
+++ b/src/main/java/emu/grasscutter/server/event/player/PlayerChatEvent.java
@@ -3,9 +3,9 @@ package emu.grasscutter.server.event.player;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.server.event.Cancellable;
 import emu.grasscutter.server.event.types.PlayerEvent;
+import lombok.*;
+
 import javax.annotation.Nullable;
-import lombok.Getter;
-import lombok.Setter;
 
 @Getter
 @Setter
diff --git a/src/main/java/emu/grasscutter/server/event/player/PlayerFinishBattlePassMission.java b/src/main/java/emu/grasscutter/server/event/player/PlayerFinishBattlePassMission.java
index e17dabb9f..ff1b3438d 100644
--- a/src/main/java/emu/grasscutter/server/event/player/PlayerFinishBattlePassMission.java
+++ b/src/main/java/emu/grasscutter/server/event/player/PlayerFinishBattlePassMission.java
@@ -1,6 +1,6 @@
 package emu.grasscutter.server.event.player;
 
-import emu.grasscutter.game.battlepass.*;
+import emu.grasscutter.game.battlepass.BattlePassMission;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.server.event.types.PlayerEvent;
 import lombok.Getter;
diff --git a/src/main/java/emu/grasscutter/server/event/player/PlayerFinishDungeonEvent.java b/src/main/java/emu/grasscutter/server/event/player/PlayerFinishDungeonEvent.java
index fc1063635..afcb75daf 100644
--- a/src/main/java/emu/grasscutter/server/event/player/PlayerFinishDungeonEvent.java
+++ b/src/main/java/emu/grasscutter/server/event/player/PlayerFinishDungeonEvent.java
@@ -4,9 +4,10 @@ import emu.grasscutter.game.dungeons.DungeonManager;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.world.Scene;
 import emu.grasscutter.server.event.Event;
-import java.util.List;
 import lombok.*;
 
+import java.util.List;
+
 @Getter
 @RequiredArgsConstructor
 public final class PlayerFinishDungeonEvent extends Event {
diff --git a/src/main/java/emu/grasscutter/server/event/player/PlayerNpcTalkEvent.java b/src/main/java/emu/grasscutter/server/event/player/PlayerNpcTalkEvent.java
index 18d667df5..efa130df3 100644
--- a/src/main/java/emu/grasscutter/server/event/player/PlayerNpcTalkEvent.java
+++ b/src/main/java/emu/grasscutter/server/event/player/PlayerNpcTalkEvent.java
@@ -4,9 +4,10 @@ import emu.grasscutter.data.excels.TalkConfigData;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.server.event.Cancellable;
 import emu.grasscutter.server.event.types.PlayerEvent;
-import javax.annotation.Nullable;
 import lombok.Getter;
 
+import javax.annotation.Nullable;
+
 @Getter
 public final class PlayerNpcTalkEvent extends PlayerEvent implements Cancellable {
     private final TalkConfigData talk;
diff --git a/src/main/java/emu/grasscutter/server/event/player/PlayerUseFoodEvent.java b/src/main/java/emu/grasscutter/server/event/player/PlayerUseFoodEvent.java
index dfe3022d6..d5482e93f 100644
--- a/src/main/java/emu/grasscutter/server/event/player/PlayerUseFoodEvent.java
+++ b/src/main/java/emu/grasscutter/server/event/player/PlayerUseFoodEvent.java
@@ -5,8 +5,7 @@ import emu.grasscutter.game.entity.EntityAvatar;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.server.event.Cancellable;
 import emu.grasscutter.server.event.types.PlayerEvent;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.*;
 
 /** This event is invoked when the player uses food on an avatar. */
 public final class PlayerUseFoodEvent extends PlayerEvent implements Cancellable {
diff --git a/src/main/java/emu/grasscutter/server/event/player/PlayerWishEvent.java b/src/main/java/emu/grasscutter/server/event/player/PlayerWishEvent.java
index 02d518b92..60871c3ea 100644
--- a/src/main/java/emu/grasscutter/server/event/player/PlayerWishEvent.java
+++ b/src/main/java/emu/grasscutter/server/event/player/PlayerWishEvent.java
@@ -6,9 +6,10 @@ import emu.grasscutter.game.player.Player;
 import emu.grasscutter.net.proto.GachaItemOuterClass.GachaItem;
 import emu.grasscutter.server.event.Cancellable;
 import emu.grasscutter.server.event.types.PlayerEvent;
-import java.util.List;
 import lombok.*;
 
+import java.util.List;
+
 @Getter
 public final class PlayerWishEvent extends PlayerEvent implements Cancellable {
     @Setter private GachaBanner banner;
diff --git a/src/main/java/emu/grasscutter/server/game/GameServer.java b/src/main/java/emu/grasscutter/server/game/GameServer.java
index 061700586..2f1aeb584 100644
--- a/src/main/java/emu/grasscutter/server/game/GameServer.java
+++ b/src/main/java/emu/grasscutter/server/game/GameServer.java
@@ -1,66 +1,47 @@
 package emu.grasscutter.server.game;
 
-import emu.grasscutter.GameConstants;
-import emu.grasscutter.Grasscutter;
+import emu.grasscutter.*;
 import emu.grasscutter.Grasscutter.ServerRunMode;
 import emu.grasscutter.database.DatabaseHelper;
 import emu.grasscutter.game.Account;
 import emu.grasscutter.game.battlepass.BattlePassSystem;
-import emu.grasscutter.game.chat.ChatSystem;
-import emu.grasscutter.game.chat.ChatSystemHandler;
+import emu.grasscutter.game.chat.*;
 import emu.grasscutter.game.combine.CombineManger;
-import emu.grasscutter.game.drop.DropSystem;
-import emu.grasscutter.game.drop.DropSystemLegacy;
+import emu.grasscutter.game.drop.*;
 import emu.grasscutter.game.dungeons.DungeonSystem;
 import emu.grasscutter.game.expedition.ExpeditionSystem;
 import emu.grasscutter.game.gacha.GachaSystem;
-import emu.grasscutter.game.home.HomeWorld;
-import emu.grasscutter.game.home.HomeWorldMPSystem;
-import emu.grasscutter.game.managers.cooking.CookingCompoundManager;
-import emu.grasscutter.game.managers.cooking.CookingManager;
+import emu.grasscutter.game.home.*;
+import emu.grasscutter.game.managers.cooking.*;
 import emu.grasscutter.game.managers.energy.EnergyManager;
 import emu.grasscutter.game.managers.stamina.StaminaManager;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.quest.QuestSystem;
 import emu.grasscutter.game.shop.ShopSystem;
-import emu.grasscutter.game.systems.AnnouncementSystem;
-import emu.grasscutter.game.systems.InventorySystem;
-import emu.grasscutter.game.systems.MultiplayerSystem;
+import emu.grasscutter.game.systems.*;
 import emu.grasscutter.game.talk.TalkSystem;
 import emu.grasscutter.game.tower.TowerSystem;
-import emu.grasscutter.game.world.World;
-import emu.grasscutter.game.world.WorldDataSystem;
+import emu.grasscutter.game.world.*;
 import emu.grasscutter.net.packet.PacketHandler;
 import emu.grasscutter.net.proto.SocialDetailOuterClass.SocialDetail;
 import emu.grasscutter.server.dispatch.DispatchClient;
 import emu.grasscutter.server.event.game.ServerTickEvent;
-import emu.grasscutter.server.event.internal.ServerStartEvent;
-import emu.grasscutter.server.event.internal.ServerStopEvent;
+import emu.grasscutter.server.event.internal.*;
 import emu.grasscutter.server.event.types.ServerEvent;
 import emu.grasscutter.server.scheduler.ServerTaskScheduler;
 import emu.grasscutter.task.TaskMap;
 import emu.grasscutter.utils.Utils;
-import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import it.unimi.dsi.fastutil.ints.Int2ObjectMaps;
-import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
-import kcp.highway.ChannelConfig;
-import kcp.highway.KcpServer;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.SneakyThrows;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import it.unimi.dsi.fastutil.ints.*;
+import kcp.highway.*;
+import lombok.*;
+import org.jetbrains.annotations.*;
 
-import java.net.InetSocketAddress;
-import java.net.URI;
-import java.time.Instant;
-import java.time.OffsetDateTime;
+import java.net.*;
+import java.time.*;
 import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.*;
 
-import static emu.grasscutter.config.Configuration.DISPATCH_INFO;
-import static emu.grasscutter.config.Configuration.GAME_INFO;
+import static emu.grasscutter.config.Configuration.*;
 import static emu.grasscutter.utils.lang.Language.translate;
 
 @Getter
diff --git a/src/main/java/emu/grasscutter/server/game/GameSession.java b/src/main/java/emu/grasscutter/server/game/GameSession.java
index 0cff31cd1..700483ad6 100644
--- a/src/main/java/emu/grasscutter/server/game/GameSession.java
+++ b/src/main/java/emu/grasscutter/server/game/GameSession.java
@@ -1,8 +1,5 @@
 package emu.grasscutter.server.game;
 
-import static emu.grasscutter.config.Configuration.*;
-import static emu.grasscutter.utils.lang.Language.translate;
-
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.Grasscutter.ServerDebugMode;
 import emu.grasscutter.game.Account;
@@ -11,10 +8,14 @@ import emu.grasscutter.net.packet.*;
 import emu.grasscutter.server.event.game.SendPacketEvent;
 import emu.grasscutter.utils.*;
 import io.netty.buffer.*;
+import lombok.*;
+
 import java.io.File;
 import java.net.InetSocketAddress;
 import java.nio.file.Path;
-import lombok.*;
+
+import static emu.grasscutter.config.Configuration.*;
+import static emu.grasscutter.utils.lang.Language.translate;
 
 public class GameSession implements GameSessionManager.KcpChannel {
     private final GameServer server;
diff --git a/src/main/java/emu/grasscutter/server/game/GameSessionManager.java b/src/main/java/emu/grasscutter/server/game/GameSessionManager.java
index 5c6ef7770..d529f7579 100644
--- a/src/main/java/emu/grasscutter/server/game/GameSessionManager.java
+++ b/src/main/java/emu/grasscutter/server/game/GameSessionManager.java
@@ -4,11 +4,12 @@ import emu.grasscutter.Grasscutter;
 import emu.grasscutter.utils.Utils;
 import io.netty.buffer.*;
 import io.netty.channel.DefaultEventLoop;
-import java.net.InetSocketAddress;
-import java.util.concurrent.ConcurrentHashMap;
 import kcp.highway.*;
 import lombok.Getter;
 
+import java.net.InetSocketAddress;
+import java.util.concurrent.ConcurrentHashMap;
+
 public class GameSessionManager {
     @Getter private static final DefaultEventLoop logicThread = new DefaultEventLoop();
     private static final ConcurrentHashMap sessions = new ConcurrentHashMap<>();
diff --git a/src/main/java/emu/grasscutter/server/http/HttpServer.java b/src/main/java/emu/grasscutter/server/http/HttpServer.java
index e2cf01d68..ef765d985 100644
--- a/src/main/java/emu/grasscutter/server/http/HttpServer.java
+++ b/src/main/java/emu/grasscutter/server/http/HttpServer.java
@@ -10,8 +10,7 @@ import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.util.ssl.SslContextFactory;
 
-import java.io.File;
-import java.io.UnsupportedEncodingException;
+import java.io.*;
 import java.util.Arrays;
 
 import static emu.grasscutter.config.Configuration.*;
@@ -153,12 +152,10 @@ public final class HttpServer {
 
     /**
      * Starts listening on the HTTP server.
-     *
-     * @throws UnsupportedEncodingException
      */
     public void start() throws UnsupportedEncodingException {
         // Attempt to start the HTTP server.
-        if (HTTP_INFO.bindAddress.equals("")) {
+        if (HTTP_INFO.bindAddress.isEmpty()) {
             this.javalin.start(HTTP_INFO.bindPort);
         } else {
             this.javalin.start(HTTP_INFO.bindAddress, HTTP_INFO.bindPort);
diff --git a/src/main/java/emu/grasscutter/server/http/dispatch/AuthenticationHandler.java b/src/main/java/emu/grasscutter/server/http/dispatch/AuthenticationHandler.java
index 718ca08b2..d72f984b5 100644
--- a/src/main/java/emu/grasscutter/server/http/dispatch/AuthenticationHandler.java
+++ b/src/main/java/emu/grasscutter/server/http/dispatch/AuthenticationHandler.java
@@ -1,7 +1,5 @@
 package emu.grasscutter.server.http.dispatch;
 
-import static emu.grasscutter.utils.lang.Language.translate;
-
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.auth.AuthenticationSystem;
 import emu.grasscutter.auth.OAuthAuthenticator.ClientType;
@@ -12,6 +10,8 @@ import emu.grasscutter.utils.*;
 import io.javalin.Javalin;
 import io.javalin.http.Context;
 
+import static emu.grasscutter.utils.lang.Language.translate;
+
 /** Handles requests related to authentication. */
 public final class AuthenticationHandler implements Router {
     /**
diff --git a/src/main/java/emu/grasscutter/server/http/dispatch/RegionHandler.java b/src/main/java/emu/grasscutter/server/http/dispatch/RegionHandler.java
index d6b3f6c4f..a8f4bf677 100644
--- a/src/main/java/emu/grasscutter/server/http/dispatch/RegionHandler.java
+++ b/src/main/java/emu/grasscutter/server/http/dispatch/RegionHandler.java
@@ -1,7 +1,5 @@
 package emu.grasscutter.server.http.dispatch;
 
-import static emu.grasscutter.config.Configuration.*;
-
 import com.google.gson.*;
 import com.google.protobuf.ByteString;
 import emu.grasscutter.*;
@@ -18,11 +16,14 @@ import emu.grasscutter.server.http.objects.QueryCurRegionRspJson;
 import emu.grasscutter.utils.*;
 import io.javalin.Javalin;
 import io.javalin.http.Context;
+import org.slf4j.Logger;
+
 import java.time.Instant;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.regex.Pattern;
-import org.slf4j.Logger;
+
+import static emu.grasscutter.config.Configuration.*;
 
 /** Handles requests related to region queries. */
 public final class RegionHandler implements Router {
diff --git a/src/main/java/emu/grasscutter/server/http/documentation/GachaMappingRequestHandler.java b/src/main/java/emu/grasscutter/server/http/documentation/GachaMappingRequestHandler.java
index ceea72955..fb51a6d94 100644
--- a/src/main/java/emu/grasscutter/server/http/documentation/GachaMappingRequestHandler.java
+++ b/src/main/java/emu/grasscutter/server/http/documentation/GachaMappingRequestHandler.java
@@ -1,13 +1,13 @@
 package emu.grasscutter.server.http.documentation;
 
-import static emu.grasscutter.config.Configuration.DOCUMENT_LANGUAGE;
-
 import emu.grasscutter.tools.Tools;
 import emu.grasscutter.utils.lang.Language;
-import io.javalin.http.ContentType;
-import io.javalin.http.Context;
+import io.javalin.http.*;
+
 import java.util.List;
 
+import static emu.grasscutter.config.Configuration.DOCUMENT_LANGUAGE;
+
 final class GachaMappingRequestHandler implements DocumentationHandler {
     private final List gachaJsons;
 
diff --git a/src/main/java/emu/grasscutter/server/http/documentation/HandbookHandler.java b/src/main/java/emu/grasscutter/server/http/documentation/HandbookHandler.java
index e4de100e0..04a622f95 100644
--- a/src/main/java/emu/grasscutter/server/http/documentation/HandbookHandler.java
+++ b/src/main/java/emu/grasscutter/server/http/documentation/HandbookHandler.java
@@ -1,7 +1,5 @@
 package emu.grasscutter.server.http.documentation;
 
-import static emu.grasscutter.config.Configuration.HANDBOOK;
-
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.auth.AuthenticationSystem.AuthenticationRequest;
 import emu.grasscutter.server.http.Router;
@@ -10,9 +8,12 @@ import emu.grasscutter.utils.objects.*;
 import emu.grasscutter.utils.objects.HandbookBody.Action;
 import io.javalin.Javalin;
 import io.javalin.http.*;
+
 import java.util.*;
 import java.util.concurrent.*;
 
+import static emu.grasscutter.config.Configuration.HANDBOOK;
+
 /** Handles requests for the new GM Handbook. */
 public final class HandbookHandler implements Router {
     private String handbook;
diff --git a/src/main/java/emu/grasscutter/server/http/documentation/RootRequestHandler.java b/src/main/java/emu/grasscutter/server/http/documentation/RootRequestHandler.java
index b71863086..de3d653e9 100644
--- a/src/main/java/emu/grasscutter/server/http/documentation/RootRequestHandler.java
+++ b/src/main/java/emu/grasscutter/server/http/documentation/RootRequestHandler.java
@@ -1,14 +1,14 @@
 package emu.grasscutter.server.http.documentation;
 
-import static emu.grasscutter.utils.lang.Language.translate;
-
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.utils.FileUtils;
-import io.javalin.http.ContentType;
-import io.javalin.http.Context;
+import io.javalin.http.*;
+
 import java.io.IOException;
 import java.nio.file.Files;
 
+import static emu.grasscutter.utils.lang.Language.translate;
+
 final class RootRequestHandler implements DocumentationHandler {
 
     private final String template;
diff --git a/src/main/java/emu/grasscutter/server/http/handlers/AnnouncementsHandler.java b/src/main/java/emu/grasscutter/server/http/handlers/AnnouncementsHandler.java
index f57bade8b..91e3abd21 100644
--- a/src/main/java/emu/grasscutter/server/http/handlers/AnnouncementsHandler.java
+++ b/src/main/java/emu/grasscutter/server/http/handlers/AnnouncementsHandler.java
@@ -1,19 +1,17 @@
 package emu.grasscutter.server.http.handlers;
 
-import static emu.grasscutter.config.Configuration.*;
-
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.data.DataLoader;
 import emu.grasscutter.server.http.Router;
 import emu.grasscutter.server.http.objects.HttpJsonResponse;
 import emu.grasscutter.utils.FileUtils;
 import io.javalin.Javalin;
-import io.javalin.http.ContentType;
-import io.javalin.http.Context;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Objects;
-import java.util.StringJoiner;
+import io.javalin.http.*;
+
+import java.io.*;
+import java.util.*;
+
+import static emu.grasscutter.config.Configuration.*;
 
 /** Handles requests related to the announcements page. */
 public final class AnnouncementsHandler implements Router {
diff --git a/src/main/java/emu/grasscutter/server/http/handlers/GachaHandler.java b/src/main/java/emu/grasscutter/server/http/handlers/GachaHandler.java
index 512cc4f1e..00ea482ff 100644
--- a/src/main/java/emu/grasscutter/server/http/handlers/GachaHandler.java
+++ b/src/main/java/emu/grasscutter/server/http/handlers/GachaHandler.java
@@ -1,7 +1,5 @@
 package emu.grasscutter.server.http.handlers;
 
-import static emu.grasscutter.utils.lang.Language.translate;
-
 import com.google.gson.JsonObject;
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.database.DatabaseHelper;
@@ -10,11 +8,14 @@ import emu.grasscutter.server.http.Router;
 import emu.grasscutter.utils.*;
 import io.javalin.Javalin;
 import io.javalin.http.*;
+import lombok.Getter;
+
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.*;
 import java.util.*;
-import lombok.Getter;
+
+import static emu.grasscutter.utils.lang.Language.translate;
 
 /** Handles all gacha-related HTTP requests. */
 public final class GachaHandler implements Router {
diff --git a/src/main/java/emu/grasscutter/server/http/handlers/GenericHandler.java b/src/main/java/emu/grasscutter/server/http/handlers/GenericHandler.java
index d29480142..847f134df 100644
--- a/src/main/java/emu/grasscutter/server/http/handlers/GenericHandler.java
+++ b/src/main/java/emu/grasscutter/server/http/handlers/GenericHandler.java
@@ -1,15 +1,13 @@
 package emu.grasscutter.server.http.handlers;
 
-import static emu.grasscutter.config.Configuration.ACCOUNT;
-
-import emu.grasscutter.GameConstants;
-import emu.grasscutter.Grasscutter;
+import emu.grasscutter.*;
 import emu.grasscutter.server.http.Router;
-import emu.grasscutter.server.http.objects.HttpJsonResponse;
-import emu.grasscutter.server.http.objects.WebStaticVersionResponse;
+import emu.grasscutter.server.http.objects.*;
 import io.javalin.Javalin;
 import io.javalin.http.Context;
 
+import static emu.grasscutter.config.Configuration.ACCOUNT;
+
 /** Handles all generic, hard-coded responses. */
 public final class GenericHandler implements Router {
     private static void serverStatus(Context ctx) {
diff --git a/src/main/java/emu/grasscutter/server/http/objects/HttpJsonResponse.java b/src/main/java/emu/grasscutter/server/http/objects/HttpJsonResponse.java
index aade47d68..17c2c477e 100644
--- a/src/main/java/emu/grasscutter/server/http/objects/HttpJsonResponse.java
+++ b/src/main/java/emu/grasscutter/server/http/objects/HttpJsonResponse.java
@@ -1,17 +1,16 @@
 package emu.grasscutter.server.http.objects;
 
-import static emu.grasscutter.config.Configuration.DISPATCH_INFO;
-import static emu.grasscutter.utils.lang.Language.translate;
-
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.Grasscutter.ServerDebugMode;
 import emu.grasscutter.utils.Utils;
-import io.javalin.http.Context;
-import io.javalin.http.Handler;
-import java.util.Arrays;
-import java.util.Objects;
+import io.javalin.http.*;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.*;
+
+import static emu.grasscutter.config.Configuration.DISPATCH_INFO;
+import static emu.grasscutter.utils.lang.Language.translate;
+
 public final class HttpJsonResponse implements Handler {
     private final String response;
     private final String[]
diff --git a/src/main/java/emu/grasscutter/server/http/objects/WebStaticVersionResponse.java b/src/main/java/emu/grasscutter/server/http/objects/WebStaticVersionResponse.java
index 9195affdd..d42d9e3f4 100644
--- a/src/main/java/emu/grasscutter/server/http/objects/WebStaticVersionResponse.java
+++ b/src/main/java/emu/grasscutter/server/http/objects/WebStaticVersionResponse.java
@@ -1,14 +1,12 @@
 package emu.grasscutter.server.http.objects;
 
-import static emu.grasscutter.config.Configuration.DISPATCH_INFO;
-
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.utils.FileUtils;
-import io.javalin.http.ContentType;
-import io.javalin.http.Context;
-import io.javalin.http.Handler;
-import java.io.IOException;
-import java.io.InputStream;
+import io.javalin.http.*;
+
+import java.io.*;
+
+import static emu.grasscutter.config.Configuration.DISPATCH_INFO;
 
 public class WebStaticVersionResponse implements Handler {
 
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/Handler.java b/src/main/java/emu/grasscutter/server/packet/recv/Handler.java
index a269e01cd..01e99e9ff 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/Handler.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/Handler.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.server.game.GameSession;
 
 @Opcodes(PacketOpcodes.NONE)
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerAbilityInvocationsNotify.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerAbilityInvocationsNotify.java
index 29581d41b..a9276fe0c 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerAbilityInvocationsNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerAbilityInvocationsNotify.java
@@ -1,9 +1,7 @@
 package emu.grasscutter.server.packet.recv;
 
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.AbilityInvocationsNotifyOuterClass.AbilityInvocationsNotify;
 import emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry;
 import emu.grasscutter.server.game.GameSession;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerActivityTakeWatcherRewardReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerActivityTakeWatcherRewardReq.java
index ddc9ebded..de1d0e800 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerActivityTakeWatcherRewardReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerActivityTakeWatcherRewardReq.java
@@ -1,11 +1,10 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.ActivityTakeWatcherRewardReqOuterClass;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketActivityTakeWatcherRewardRsp;
+
 import java.util.Optional;
 
 @Opcodes(PacketOpcodes.ActivityTakeWatcherRewardReq)
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerAddBackupAvatarTeamReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerAddBackupAvatarTeamReq.java
index ca481971c..e9bfa79f2 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerAddBackupAvatarTeamReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerAddBackupAvatarTeamReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.server.game.GameSession;
 
 @Opcodes(PacketOpcodes.AddBackupAvatarTeamReq)
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerAddQuestContentProgressReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerAddQuestContentProgressReq.java
index 5609f01f7..c8e100d0b 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerAddQuestContentProgressReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerAddQuestContentProgressReq.java
@@ -1,9 +1,7 @@
 package emu.grasscutter.server.packet.recv;
 
 import emu.grasscutter.game.quest.enums.QuestContent;
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.AddQuestContentProgressReqOuterClass.AddQuestContentProgressReq;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketAddQuestContentProgressRsp;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerAskAddFriendReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerAskAddFriendReq.java
index 8a5989c88..862f03dd9 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerAskAddFriendReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerAskAddFriendReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.AskAddFriendReqOuterClass.AskAddFriendReq;
 import emu.grasscutter.server.game.GameSession;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerAvatarChangeCostumeReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerAvatarChangeCostumeReq.java
index d0f3d00ac..b5179fcd9 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerAvatarChangeCostumeReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerAvatarChangeCostumeReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.AvatarChangeCostumeReqOuterClass.AvatarChangeCostumeReq;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketAvatarChangeCostumeRsp;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerAvatarChangeElementTypeReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerAvatarChangeElementTypeReq.java
index 155e6ff5d..a9ebf7862 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerAvatarChangeElementTypeReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerAvatarChangeElementTypeReq.java
@@ -1,9 +1,7 @@
 package emu.grasscutter.server.packet.recv;
 
 import emu.grasscutter.data.GameData;
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.AvatarChangeElementTypeReqOuterClass.AvatarChangeElementTypeReq;
 import emu.grasscutter.net.proto.RetcodeOuterClass.Retcode;
 import emu.grasscutter.server.game.GameSession;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerAvatarDieAnimationEndReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerAvatarDieAnimationEndReq.java
index bfa4f0538..6ed4fdc4a 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerAvatarDieAnimationEndReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerAvatarDieAnimationEndReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.AvatarDieAnimationEndReqOuterClass.AvatarDieAnimationEndReq;
 import emu.grasscutter.server.game.GameSession;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerAvatarExpeditionAllDataReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerAvatarExpeditionAllDataReq.java
index 1b3ce6789..ebc47e611 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerAvatarExpeditionAllDataReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerAvatarExpeditionAllDataReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketAvatarExpeditionAllDataRsp;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerAvatarExpeditionCallBackReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerAvatarExpeditionCallBackReq.java
index 6bd72acdc..b22f67f60 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerAvatarExpeditionCallBackReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerAvatarExpeditionCallBackReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.AvatarExpeditionCallBackReqOuterClass.AvatarExpeditionCallBackReq;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketAvatarExpeditionCallBackRsp;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerAvatarExpeditionGetRewardReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerAvatarExpeditionGetRewardReq.java
index 521cbd251..3220a8372 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerAvatarExpeditionGetRewardReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerAvatarExpeditionGetRewardReq.java
@@ -1,18 +1,14 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.game.expedition.ExpeditionInfo;
-import emu.grasscutter.game.expedition.ExpeditionRewardDataList;
+import emu.grasscutter.game.expedition.*;
 import emu.grasscutter.game.inventory.GameItem;
 import emu.grasscutter.game.props.ActionReason;
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.AvatarExpeditionGetRewardReqOuterClass.AvatarExpeditionGetRewardReq;
 import emu.grasscutter.server.game.GameSession;
-import emu.grasscutter.server.packet.send.PacketAvatarExpeditionGetRewardRsp;
-import emu.grasscutter.server.packet.send.PacketItemAddHintNotify;
-import java.util.ArrayList;
-import java.util.List;
+import emu.grasscutter.server.packet.send.*;
+
+import java.util.*;
 
 @Opcodes(PacketOpcodes.AvatarExpeditionGetRewardReq)
 public class HandlerAvatarExpeditionGetRewardReq extends PacketHandler {
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerAvatarExpeditionStartReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerAvatarExpeditionStartReq.java
index 03c34c3eb..e0479eb6e 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerAvatarExpeditionStartReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerAvatarExpeditionStartReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.AvatarExpeditionStartReqOuterClass.AvatarExpeditionStartReq;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketAvatarExpeditionStartRsp;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerAvatarFetterLevelRewardReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerAvatarFetterLevelRewardReq.java
index 8243f8b26..6e682281d 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerAvatarFetterLevelRewardReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerAvatarFetterLevelRewardReq.java
@@ -5,15 +5,10 @@ import emu.grasscutter.data.excels.RewardData;
 import emu.grasscutter.game.avatar.Avatar;
 import emu.grasscutter.game.inventory.GameItem;
 import emu.grasscutter.game.props.ActionReason;
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.AvatarFetterLevelRewardReqOuterClass.AvatarFetterLevelRewardReq;
 import emu.grasscutter.server.game.GameSession;
-import emu.grasscutter.server.packet.send.PacketAvatarDataNotify;
-import emu.grasscutter.server.packet.send.PacketAvatarFetterDataNotify;
-import emu.grasscutter.server.packet.send.PacketAvatarFetterLevelRewardRsp;
-import emu.grasscutter.server.packet.send.PacketUnlockNameCardNotify;
+import emu.grasscutter.server.packet.send.*;
 
 @Opcodes(PacketOpcodes.AvatarFetterLevelRewardReq)
 public class HandlerAvatarFetterLevelRewardReq extends PacketHandler {
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerAvatarPromoteReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerAvatarPromoteReq.java
index 6d0f38c2c..cf9b97356 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerAvatarPromoteReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerAvatarPromoteReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.AvatarPromoteReqOuterClass.AvatarPromoteReq;
 import emu.grasscutter.server.game.GameSession;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerAvatarSkillUpgradeReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerAvatarSkillUpgradeReq.java
index 9cc09e771..d2929a21f 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerAvatarSkillUpgradeReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerAvatarSkillUpgradeReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.AvatarSkillUpgradeReqOuterClass.AvatarSkillUpgradeReq;
 import emu.grasscutter.server.game.GameSession;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerAvatarUpgradeReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerAvatarUpgradeReq.java
index f8fa2596e..ee088664e 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerAvatarUpgradeReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerAvatarUpgradeReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.AvatarUpgradeReqOuterClass.AvatarUpgradeReq;
 import emu.grasscutter.server.game.GameSession;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerAvatarWearFlycloakReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerAvatarWearFlycloakReq.java
index 794dd06d8..8bba79ddc 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerAvatarWearFlycloakReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerAvatarWearFlycloakReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.AvatarWearFlycloakReqOuterClass.AvatarWearFlycloakReq;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketAvatarWearFlycloakRsp;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerBackMyWorldReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerBackMyWorldReq.java
index 7c1d38060..1fc38d05b 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerBackMyWorldReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerBackMyWorldReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.RetcodeOuterClass;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketBackMyWorldRsp;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerBuyBattlePassLevelReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerBuyBattlePassLevelReq.java
index c57315a9b..22dc5ea74 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerBuyBattlePassLevelReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerBuyBattlePassLevelReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.BuyBattlePassLevelReqOuterClass.BuyBattlePassLevelReq;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketBuyBattlePassLevelRsp;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerBuyGoodsReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerBuyGoodsReq.java
index ed056d037..128476a11 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerBuyGoodsReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerBuyGoodsReq.java
@@ -3,19 +3,14 @@ package emu.grasscutter.server.packet.recv;
 import emu.grasscutter.data.common.ItemParamData;
 import emu.grasscutter.game.inventory.GameItem;
 import emu.grasscutter.game.props.ActionReason;
-import emu.grasscutter.game.shop.ShopInfo;
-import emu.grasscutter.game.shop.ShopLimit;
-import emu.grasscutter.game.shop.ShopSystem;
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.game.shop.*;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.BuyGoodsReqOuterClass;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketBuyGoodsRsp;
 import emu.grasscutter.utils.Utils;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
+
+import java.util.*;
 import java.util.stream.Stream;
 
 @Opcodes(PacketOpcodes.BuyGoodsReq)
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerBuyResinReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerBuyResinReq.java
index 13ada5de7..7bca0db9c 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerBuyResinReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerBuyResinReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketBuyResinRsp;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerCalcWeaponUpgradeReturnItemsReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerCalcWeaponUpgradeReturnItemsReq.java
index 8bccf2341..774fae2fd 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerCalcWeaponUpgradeReturnItemsReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerCalcWeaponUpgradeReturnItemsReq.java
@@ -1,12 +1,11 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.CalcWeaponUpgradeReturnItemsReqOuterClass.CalcWeaponUpgradeReturnItemsReq;
 import emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketCalcWeaponUpgradeReturnItemsRsp;
+
 import java.util.List;
 
 @Opcodes(PacketOpcodes.CalcWeaponUpgradeReturnItemsReq)
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerChangeAvatarReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerChangeAvatarReq.java
index ff32a17b0..4d8c84552 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerChangeAvatarReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerChangeAvatarReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.ChangeAvatarReqOuterClass.ChangeAvatarReq;
 import emu.grasscutter.server.game.GameSession;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerChangeGameTimeReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerChangeGameTimeReq.java
index d5f5b59a8..901aa4777 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerChangeGameTimeReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerChangeGameTimeReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.ChangeGameTimeReqOuterClass.ChangeGameTimeReq;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketChangeGameTimeRsp;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerChangeMailStarNotify.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerChangeMailStarNotify.java
index 51264d738..4fd1c242c 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerChangeMailStarNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerChangeMailStarNotify.java
@@ -1,14 +1,12 @@
 package emu.grasscutter.server.packet.recv;
 
 import emu.grasscutter.game.mail.Mail;
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.ChangeMailStarNotifyOuterClass;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketMailChangeNotify;
-import java.util.ArrayList;
-import java.util.List;
+
+import java.util.*;
 
 @Opcodes(PacketOpcodes.ChangeMailStarNotify)
 public class HandlerChangeMailStarNotify extends PacketHandler {
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerChangeMpTeamAvatarReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerChangeMpTeamAvatarReq.java
index d5d18c1b1..7dd4a234a 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerChangeMpTeamAvatarReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerChangeMpTeamAvatarReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.ChangeMpTeamAvatarReqOuterClass.ChangeMpTeamAvatarReq;
 import emu.grasscutter.server.game.GameSession;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerChangeTeamNameReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerChangeTeamNameReq.java
index 186a55f60..af814e8a3 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerChangeTeamNameReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerChangeTeamNameReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.ChangeTeamNameReqOuterClass.ChangeTeamNameReq;
 import emu.grasscutter.server.game.GameSession;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerCheckUgcStateReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerCheckUgcStateReq.java
index 2f742c2ca..8d6c3943c 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerCheckUgcStateReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerCheckUgcStateReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.CheckUgcStateReqOuterClass.CheckUgcStateReq;
 import emu.grasscutter.net.proto.RetcodeOuterClass.Retcode;
 import emu.grasscutter.server.game.GameSession;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerCheckUgcUpdateReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerCheckUgcUpdateReq.java
index c9492b1b1..11be5d5e1 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerCheckUgcUpdateReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerCheckUgcUpdateReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.CheckUgcUpdateReqOuterClass.CheckUgcUpdateReq;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketCheckUgcUpdateRsp;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerChooseCurAvatarTeamReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerChooseCurAvatarTeamReq.java
index 2370f81ab..6cd0bf318 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerChooseCurAvatarTeamReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerChooseCurAvatarTeamReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.ChooseCurAvatarTeamReqOuterClass.ChooseCurAvatarTeamReq;
 import emu.grasscutter.server.game.GameSession;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerClientAbilitiesInitFinishCombineNotify.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerClientAbilitiesInitFinishCombineNotify.java
index 1922799e0..626f8f097 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerClientAbilitiesInitFinishCombineNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerClientAbilitiesInitFinishCombineNotify.java
@@ -1,9 +1,7 @@
 package emu.grasscutter.server.packet.recv;
 
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry;
 import emu.grasscutter.net.proto.ClientAbilitiesInitFinishCombineNotifyOuterClass.ClientAbilitiesInitFinishCombineNotify;
 import emu.grasscutter.net.proto.EntityAbilityInvokeEntryOuterClass.EntityAbilityInvokeEntry;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerClientAbilityChangeNotify.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerClientAbilityChangeNotify.java
index 0dc9185b3..7ef5b1588 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerClientAbilityChangeNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerClientAbilityChangeNotify.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.ClientAbilityChangeNotifyOuterClass.ClientAbilityChangeNotify;
 import emu.grasscutter.server.game.GameSession;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerClientAbilityInitFinishNotify.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerClientAbilityInitFinishNotify.java
index fa534ac23..a9cb1ccdb 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerClientAbilityInitFinishNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerClientAbilityInitFinishNotify.java
@@ -1,9 +1,7 @@
 package emu.grasscutter.server.packet.recv;
 
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry;
 import emu.grasscutter.net.proto.ClientAbilityInitFinishNotifyOuterClass.ClientAbilityInitFinishNotify;
 import emu.grasscutter.server.game.GameSession;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerClientLockGameTimeNotify.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerClientLockGameTimeNotify.java
index c01f68f90..d006e37a6 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerClientLockGameTimeNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerClientLockGameTimeNotify.java
@@ -1,9 +1,7 @@
 package emu.grasscutter.server.packet.recv;
 
 import emu.grasscutter.Grasscutter;
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.ClientLockGameTimeNotifyOuterClass.ClientLockGameTimeNotify;
 import emu.grasscutter.server.game.GameSession;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerCombatInvocationsNotify.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerCombatInvocationsNotify.java
index 6450f5833..4f4df8ee8 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerCombatInvocationsNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerCombatInvocationsNotify.java
@@ -5,9 +5,7 @@ import emu.grasscutter.game.entity.GameEntity;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.props.FightProperty;
 import emu.grasscutter.game.world.Position;
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.AttackResultOuterClass.AttackResult;
 import emu.grasscutter.net.proto.CombatInvocationsNotifyOuterClass.CombatInvocationsNotify;
 import emu.grasscutter.net.proto.CombatInvokeEntryOuterClass.CombatInvokeEntry;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerCombineReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerCombineReq.java
index fa8bd96d3..bf32943a5 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerCombineReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerCombineReq.java
@@ -1,13 +1,11 @@
 package emu.grasscutter.server.packet.recv;
 
 import emu.grasscutter.data.common.ItemParamData;
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.CombineReqOuterClass;
-import emu.grasscutter.net.proto.ItemParamOuterClass;
+import emu.grasscutter.net.packet.*;
+import emu.grasscutter.net.proto.*;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketCombineRsp;
+
 import java.util.List;
 import java.util.stream.Collectors;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerCreateVehicleReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerCreateVehicleReq.java
index 8f3808734..0fecabfe8 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerCreateVehicleReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerCreateVehicleReq.java
@@ -1,9 +1,7 @@
 package emu.grasscutter.server.packet.recv;
 
 import emu.grasscutter.game.world.Position;
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.CreateVehicleReqOuterClass;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketCreateVehicleRsp;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerDealAddFriendReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerDealAddFriendReq.java
index 393f85d06..42f732b33 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerDealAddFriendReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerDealAddFriendReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.DealAddFriendReqOuterClass.DealAddFriendReq;
 import emu.grasscutter.server.game.GameSession;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerDelBackupAvatarTeamReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerDelBackupAvatarTeamReq.java
index 63362a1a2..590a4c2fd 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerDelBackupAvatarTeamReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerDelBackupAvatarTeamReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.DelBackupAvatarTeamReqOuterClass.DelBackupAvatarTeamReq;
 import emu.grasscutter.server.game.GameSession;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerDelMailReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerDelMailReq.java
index 8843a9f93..6598930cf 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerDelMailReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerDelMailReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.DelMailReqOuterClass;
 import emu.grasscutter.server.game.GameSession;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerDeleteFriendReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerDeleteFriendReq.java
index 4b539ab34..247318860 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerDeleteFriendReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerDeleteFriendReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.DeleteFriendReqOuterClass.DeleteFriendReq;
 import emu.grasscutter.server.game.GameSession;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerDestroyMaterialReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerDestroyMaterialReq.java
index de89c5861..0f723d5bc 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerDestroyMaterialReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerDestroyMaterialReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.DestroyMaterialReqOuterClass.DestroyMaterialReq;
 import emu.grasscutter.server.game.GameSession;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerDoGachaReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerDoGachaReq.java
index d41599ddf..c2958158e 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerDoGachaReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerDoGachaReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.DoGachaReqOuterClass.DoGachaReq;
 import emu.grasscutter.server.game.GameSession;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerDungeonEntryInfoReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerDungeonEntryInfoReq.java
index 601e31a51..6138c5d3c 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerDungeonEntryInfoReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerDungeonEntryInfoReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.DungeonEntryInfoReqOuterClass.DungeonEntryInfoReq;
 import emu.grasscutter.server.game.GameSession;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerDungeonPlayerDieReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerDungeonPlayerDieReq.java
index 270a37a96..e2ba9e803 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerDungeonPlayerDieReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerDungeonPlayerDieReq.java
@@ -1,9 +1,7 @@
 package emu.grasscutter.server.packet.recv;
 
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.DungeonPlayerDieReqOuterClass.DungeonPlayerDieReq;
 import emu.grasscutter.net.proto.RetcodeOuterClass.Retcode;
 import emu.grasscutter.server.game.GameSession;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerDungeonSlipRevivePointActivateReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerDungeonSlipRevivePointActivateReq.java
index 158335f12..dac18eef5 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerDungeonSlipRevivePointActivateReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerDungeonSlipRevivePointActivateReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.DungeonSlipRevivePointActivateReqOuterClass.DungeonSlipRevivePointActivateReq;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketDungeonSlipRevivePointActivateRsp;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerDungeonWayPointActivateReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerDungeonWayPointActivateReq.java
index 2ae492825..4f59bbc29 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerDungeonWayPointActivateReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerDungeonWayPointActivateReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.DungeonWayPointActivateReqOuterClass.DungeonWayPointActivateReq;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketDungeonWayPointActivateRsp;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerEnterSceneDoneReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerEnterSceneDoneReq.java
index 4e6d5ba33..304b6001a 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerEnterSceneDoneReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerEnterSceneDoneReq.java
@@ -2,9 +2,7 @@ package emu.grasscutter.server.packet.recv;
 
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.game.player.Player.SceneLoadState;
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.*;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerEnterSceneReadyReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerEnterSceneReadyReq.java
index 412263846..cd7f3fc28 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerEnterSceneReadyReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerEnterSceneReadyReq.java
@@ -1,11 +1,8 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.server.game.GameSession;
-import emu.grasscutter.server.packet.send.PacketEnterScenePeerNotify;
-import emu.grasscutter.server.packet.send.PacketEnterSceneReadyRsp;
+import emu.grasscutter.server.packet.send.*;
 
 @Opcodes(PacketOpcodes.EnterSceneReadyReq)
 public class HandlerEnterSceneReadyReq extends PacketHandler {
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerEnterTransPointRegionNotify.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerEnterTransPointRegionNotify.java
index 5d60c3b99..b4b72c6a8 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerEnterTransPointRegionNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerEnterTransPointRegionNotify.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.server.game.GameSession;
 
 @Opcodes(PacketOpcodes.EnterTransPointRegionNotify)
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerEnterTrialAvatarActivityDungeonReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerEnterTrialAvatarActivityDungeonReq.java
index 17c085742..06c4d335f 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerEnterTrialAvatarActivityDungeonReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerEnterTrialAvatarActivityDungeonReq.java
@@ -2,9 +2,7 @@ package emu.grasscutter.server.packet.recv;
 
 import emu.grasscutter.game.activity.trialavatar.TrialAvatarActivityHandler;
 import emu.grasscutter.game.props.ActivityType;
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.EnterTrialAvatarActivityDungeonReqOuterClass.EnterTrialAvatarActivityDungeonReq;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketEnterTrialAvatarActivityDungeonRsp;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerEnterWorldAreaReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerEnterWorldAreaReq.java
index 9169463b8..16d7c62af 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerEnterWorldAreaReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerEnterWorldAreaReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.EnterWorldAreaReqOuterClass.EnterWorldAreaReq;
 import emu.grasscutter.net.proto.PacketHeadOuterClass.PacketHead;
 import emu.grasscutter.server.game.GameSession;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerEntityAiSyncNotify.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerEntityAiSyncNotify.java
index ac61309b9..0ba77660d 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerEntityAiSyncNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerEntityAiSyncNotify.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.EntityAiSyncNotifyOuterClass.EntityAiSyncNotify;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketEntityAiSyncNotify;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerEvtAiSyncCombatThreatInfoNotify.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerEvtAiSyncCombatThreatInfoNotify.java
index b59ddc0d3..6985e3a7b 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerEvtAiSyncCombatThreatInfoNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerEvtAiSyncCombatThreatInfoNotify.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.server.game.GameSession;
 
 @Opcodes(PacketOpcodes.EvtAiSyncCombatThreatInfoNotify)
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerEvtAiSyncSkillCdNotify.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerEvtAiSyncSkillCdNotify.java
index 09b6649b4..4e9e8dead 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerEvtAiSyncSkillCdNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerEvtAiSyncSkillCdNotify.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.server.game.GameSession;
 
 @Opcodes(PacketOpcodes.EvtAiSyncSkillCdNotify)
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerEvtAvatarEnterFocusNotify.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerEvtAvatarEnterFocusNotify.java
index 8429e03d3..c92146fa6 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerEvtAvatarEnterFocusNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerEvtAvatarEnterFocusNotify.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.EvtAvatarEnterFocusNotifyOuterClass;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketEvtAvatarEnterFocusNotify;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerEvtAvatarExitFocusNotify.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerEvtAvatarExitFocusNotify.java
index d5d6102be..8f7cf48a8 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerEvtAvatarExitFocusNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerEvtAvatarExitFocusNotify.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.EvtAvatarExitFocusNotifyOuterClass;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketEvtAvatarExitFocusNotify;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerEvtAvatarLockChairReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerEvtAvatarLockChairReq.java
index b6decd7f3..2fe2861fd 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerEvtAvatarLockChairReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerEvtAvatarLockChairReq.java
@@ -1,9 +1,7 @@
 package emu.grasscutter.server.packet.recv;
 
 import emu.grasscutter.game.entity.EntityAvatar;
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.EvtAvatarLockChairReqOuterClass.EvtAvatarLockChairReq;
 import emu.grasscutter.net.proto.PacketHeadOuterClass.PacketHead;
 import emu.grasscutter.server.game.GameSession;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerEvtAvatarSitDownNotify.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerEvtAvatarSitDownNotify.java
index 27aed700b..617ac760e 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerEvtAvatarSitDownNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerEvtAvatarSitDownNotify.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.EvtAvatarSitDownNotifyOuterClass.EvtAvatarSitDownNotify;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketEvtAvatarSitDownNotify;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerEvtAvatarStandUpNotify.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerEvtAvatarStandUpNotify.java
index 9ad133f0b..e53ec7546 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerEvtAvatarStandUpNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerEvtAvatarStandUpNotify.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.EvtAvatarStandUpNotifyOuterClass.EvtAvatarStandUpNotify;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketEvtAvatarStandUpNotify;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerEvtAvatarUpdateFocusNotify.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerEvtAvatarUpdateFocusNotify.java
index 0bc55b5ed..ffc3db7b6 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerEvtAvatarUpdateFocusNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerEvtAvatarUpdateFocusNotify.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.EvtAvatarUpdateFocusNotifyOuterClass;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketEvtAvatarUpdateFocusNotify;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerEvtBulletDeactiveNotify.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerEvtBulletDeactiveNotify.java
index 119f5bf04..c13768235 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerEvtBulletDeactiveNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerEvtBulletDeactiveNotify.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.EvtBulletDeactiveNotifyOuterClass;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketEvtBulletDeactiveNotify;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerEvtBulletHitNotify.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerEvtBulletHitNotify.java
index 98ae79dfc..e950a0971 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerEvtBulletHitNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerEvtBulletHitNotify.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.EvtBulletHitNotifyOuterClass;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketEvtBulletHitNotify;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerEvtBulletMoveNotify.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerEvtBulletMoveNotify.java
index fe7ddba57..fa49a46a7 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerEvtBulletMoveNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerEvtBulletMoveNotify.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.EvtBulletMoveNotifyOuterClass;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketEvtBulletMoveNotify;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerEvtCreateGadgetNotify.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerEvtCreateGadgetNotify.java
index dc1b60015..4da28973d 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerEvtCreateGadgetNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerEvtCreateGadgetNotify.java
@@ -1,10 +1,7 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.game.entity.EntityClientGadget;
-import emu.grasscutter.game.entity.EntitySolarIsotomaClientGadget;
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.game.entity.*;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.EvtCreateGadgetNotifyOuterClass.EvtCreateGadgetNotify;
 import emu.grasscutter.server.game.GameSession;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerEvtDestroyGadgetNotify.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerEvtDestroyGadgetNotify.java
index 71d1502b8..4dbe36b3e 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerEvtDestroyGadgetNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerEvtDestroyGadgetNotify.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.EvtDestroyGadgetNotifyOuterClass.EvtDestroyGadgetNotify;
 import emu.grasscutter.server.game.GameSession;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerEvtDoSkillSuccNotify.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerEvtDoSkillSuccNotify.java
index de5017b40..f2ba9444b 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerEvtDoSkillSuccNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerEvtDoSkillSuccNotify.java
@@ -1,9 +1,7 @@
 package emu.grasscutter.server.packet.recv;
 
 import emu.grasscutter.game.quest.enums.QuestContent;
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.EvtDoSkillSuccNotifyOuterClass.EvtDoSkillSuccNotify;
 import emu.grasscutter.server.game.GameSession;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerEvtEntityRenderersChangedNotify.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerEvtEntityRenderersChangedNotify.java
index 68cad064a..3404507e5 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerEvtEntityRenderersChangedNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerEvtEntityRenderersChangedNotify.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.EvtEntityRenderersChangedNotifyOuterClass;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketEvtEntityRenderersChangedNotify;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerExecuteGadgetLuaReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerExecuteGadgetLuaReq.java
index a18f87630..1612c7f72 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerExecuteGadgetLuaReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerExecuteGadgetLuaReq.java
@@ -1,11 +1,8 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.game.entity.EntityGadget;
-import emu.grasscutter.game.entity.GameEntity;
+import emu.grasscutter.game.entity.*;
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.ExecuteGadgetLuaReqOuterClass.ExecuteGadgetLuaReq;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketExecuteGadgetLuaRsp;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerExitTransPointRegionNotify.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerExitTransPointRegionNotify.java
index ecb41bdd5..d5cbf931c 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerExitTransPointRegionNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerExitTransPointRegionNotify.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.server.game.GameSession;
 
 @Opcodes(PacketOpcodes.ExitTransPointRegionNotify)
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerForgeGetQueueDataReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerForgeGetQueueDataReq.java
index 1be6a8b2e..b3b6c40e4 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerForgeGetQueueDataReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerForgeGetQueueDataReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.server.game.GameSession;
 
 @Opcodes(PacketOpcodes.ForgeGetQueueDataReq)
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerForgeQueueManipulateReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerForgeQueueManipulateReq.java
index b6891613c..000312fe3 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerForgeQueueManipulateReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerForgeQueueManipulateReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.ForgeQueueManipulateReqOuterClass.ForgeQueueManipulateReq;
 import emu.grasscutter.server.game.GameSession;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerForgeStartReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerForgeStartReq.java
index 33a89aba4..6d14bf3ff 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerForgeStartReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerForgeStartReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.ForgeStartReqOuterClass;
 import emu.grasscutter.server.game.GameSession;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerFurnitureMakeReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerFurnitureMakeReq.java
index f1dd234f7..03571173a 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerFurnitureMakeReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerFurnitureMakeReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.server.game.GameSession;
 
 @Opcodes(PacketOpcodes.FurnitureMakeReq)
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerFurnitureMakeStartReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerFurnitureMakeStartReq.java
index 2fe0ce9f8..9e34770d8 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerFurnitureMakeStartReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerFurnitureMakeStartReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.FurnitureMakeStartReqOuterClass;
 import emu.grasscutter.server.game.GameSession;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerGachaWishReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerGachaWishReq.java
index bc6fa5694..ebda049a6 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerGachaWishReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerGachaWishReq.java
@@ -1,10 +1,7 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.game.gacha.GachaBanner;
-import emu.grasscutter.game.gacha.PlayerGachaBannerInfo;
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.game.gacha.*;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.GachaWishReqOuterClass.GachaWishReq;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketGachaWishRsp;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerGadgetInteractReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerGadgetInteractReq.java
index 8759be3c5..ff833f927 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerGadgetInteractReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerGadgetInteractReq.java
@@ -1,9 +1,7 @@
 package emu.grasscutter.server.packet.recv;
 
 import emu.grasscutter.game.quest.enums.QuestContent;
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.GadgetInteractReqOuterClass.GadgetInteractReq;
 import emu.grasscutter.server.game.GameSession;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetActivityInfoReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetActivityInfoReq.java
index bfd90684d..5329a7310 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetActivityInfoReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetActivityInfoReq.java
@@ -1,11 +1,10 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.GetActivityInfoReqOuterClass;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketGetActivityInfoRsp;
+
 import java.util.HashSet;
 
 @Opcodes(PacketOpcodes.GetActivityInfoReq)
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetActivityShopSheetInfoReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetActivityShopSheetInfoReq.java
index 8c7f8ce6f..8962d088f 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetActivityShopSheetInfoReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetActivityShopSheetInfoReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.GetActivityShopSheetInfoReqOuterClass.GetActivityShopSheetInfoReq;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketGetActivityShopSheetInfoRsp;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetAllH5ActivityInfoReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetAllH5ActivityInfoReq.java
index fcf0ff080..66d4c18d9 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetAllH5ActivityInfoReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetAllH5ActivityInfoReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketH5ActivityIdsNotify;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetAllMailNotify.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetAllMailNotify.java
index 9ccbcfdc4..8c317bc23 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetAllMailNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetAllMailNotify.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.GetAllMailNotifyOuterClass.GetAllMailNotify;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketGetAllMailResultNotify;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetAllUnlockNameCardReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetAllUnlockNameCardReq.java
index effa02ea3..c29428074 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetAllUnlockNameCardReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetAllUnlockNameCardReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketGetAllUnlockNameCardRsp;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetAuthkeyReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetAuthkeyReq.java
index 732a973f6..ab9c122fc 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetAuthkeyReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetAuthkeyReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketGetAuthkeyRsp;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetChatEmojiCollectionReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetChatEmojiCollectionReq.java
index 800f8814f..5153acdcb 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetChatEmojiCollectionReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetChatEmojiCollectionReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketGetChatEmojiCollectionRsp;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetCompoundDataReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetCompoundDataReq.java
index 0a36f9296..642f67d3f 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetCompoundDataReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetCompoundDataReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.GetCompoundDataReqOuterClass;
 import emu.grasscutter.server.game.GameSession;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetDailyDungeonEntryInfoReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetDailyDungeonEntryInfoReq.java
index c38eb253e..40e0485c2 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetDailyDungeonEntryInfoReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetDailyDungeonEntryInfoReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.GetDailyDungeonEntryInfoReqOuterClass;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketGetDailyDungeonEntryInfoRsp;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetFriendShowAvatarInfoReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetFriendShowAvatarInfoReq.java
index 7141e8a06..9f6f7054f 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetFriendShowAvatarInfoReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetFriendShowAvatarInfoReq.java
@@ -1,9 +1,7 @@
 package emu.grasscutter.server.packet.recv;
 
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.GetFriendShowAvatarInfoReqOuterClass.GetFriendShowAvatarInfoReq;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketGetFriendShowAvatarInfoRsp;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetFriendShowNameCardInfoReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetFriendShowNameCardInfoReq.java
index d52e63db9..5c23ae9fb 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetFriendShowNameCardInfoReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetFriendShowNameCardInfoReq.java
@@ -1,9 +1,7 @@
 package emu.grasscutter.server.packet.recv;
 
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.GetFriendShowNameCardInfoReqOuterClass;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketGetFriendShowNameCardInfoRsp;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetFurnitureCurModuleArrangeCountReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetFurnitureCurModuleArrangeCountReq.java
index 05f6477a7..c9cda366f 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetFurnitureCurModuleArrangeCountReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetFurnitureCurModuleArrangeCountReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketFurnitureCurModuleArrangeCountNotify;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetGachaInfoReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetGachaInfoReq.java
index 8cfa62bdb..f58a9e143 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetGachaInfoReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetGachaInfoReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketGetGachaInfoRsp;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetHomeLevelUpRewardReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetHomeLevelUpRewardReq.java
index 54c651af6..04db6e4ac 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetHomeLevelUpRewardReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetHomeLevelUpRewardReq.java
@@ -4,14 +4,12 @@ import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.common.ItemParamData;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.props.ActionReason;
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.GetHomeLevelUpRewardReqOuterClass.GetHomeLevelUpRewardReq;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketGetHomeLevelUpRewardRsp;
-import java.util.List;
-import java.util.Set;
+
+import java.util.*;
 
 @Opcodes(PacketOpcodes.GetHomeLevelUpRewardReq)
 public class HandlerGetHomeLevelUpRewardReq extends PacketHandler {
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetInvestigationMonsterReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetInvestigationMonsterReq.java
index 1f9a7167e..771cc4039 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetInvestigationMonsterReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetInvestigationMonsterReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.GetInvestigationMonsterReqOuterClass;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketGetInvestigationMonsterRsp;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetMailItemReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetMailItemReq.java
index 580973d43..f572baae9 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetMailItemReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetMailItemReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.GetMailItemReqOuterClass;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketGetMailItemRsp;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetOnlinePlayerListReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetOnlinePlayerListReq.java
index 16dc591d5..b9318cd0c 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetOnlinePlayerListReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetOnlinePlayerListReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketGetOnlinePlayerListRsp;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetPlayerAskFriendListReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetPlayerAskFriendListReq.java
index 26eb5f7bd..8bb19548a 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetPlayerAskFriendListReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetPlayerAskFriendListReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketGetPlayerAskFriendListRsp;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetPlayerBlacklistReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetPlayerBlacklistReq.java
index 9dc676f73..66272bdcf 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetPlayerBlacklistReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetPlayerBlacklistReq.java
@@ -1,9 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.server.game.GameSession;
 
 @Opcodes(PacketOpcodes.GetPlayerBlacklistReq)
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetPlayerFriendListReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetPlayerFriendListReq.java
index 8dec66a7d..959b4623e 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetPlayerFriendListReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetPlayerFriendListReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketGetPlayerFriendListRsp;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetPlayerHomeCompInfoReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetPlayerHomeCompInfoReq.java
index c36f8e789..d2a8838d9 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetPlayerHomeCompInfoReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetPlayerHomeCompInfoReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketPlayerHomeCompInfoNotify;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetPlayerSocialDetailReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetPlayerSocialDetailReq.java
index 0655d95f2..79f2b80ca 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetPlayerSocialDetailReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetPlayerSocialDetailReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.GetPlayerSocialDetailReqOuterClass.GetPlayerSocialDetailReq;
 import emu.grasscutter.net.proto.SocialDetailOuterClass.SocialDetail;
 import emu.grasscutter.server.game.GameSession;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetPlayerTokenReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetPlayerTokenReq.java
index 5f25512fc..7052a0c4a 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetPlayerTokenReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetPlayerTokenReq.java
@@ -1,7 +1,5 @@
 package emu.grasscutter.server.packet.recv;
 
-import static emu.grasscutter.config.Configuration.ACCOUNT;
-
 import emu.grasscutter.*;
 import emu.grasscutter.database.DatabaseHelper;
 import emu.grasscutter.game.player.Player;
@@ -13,9 +11,12 @@ import emu.grasscutter.server.game.GameSession.SessionState;
 import emu.grasscutter.server.packet.send.PacketGetPlayerTokenRsp;
 import emu.grasscutter.utils.*;
 import emu.grasscutter.utils.helpers.ByteHelper;
+
+import javax.crypto.Cipher;
 import java.nio.ByteBuffer;
 import java.security.Signature;
-import javax.crypto.Cipher;
+
+import static emu.grasscutter.config.Configuration.ACCOUNT;
 
 @Opcodes(PacketOpcodes.GetPlayerTokenReq)
 public class HandlerGetPlayerTokenReq extends PacketHandler {
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetRegionSearchReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetRegionSearchReq.java
index 509ea5b57..40a67f19a 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetRegionSearchReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetRegionSearchReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.server.game.GameSession;
 
 @Opcodes(PacketOpcodes.GetRegionSearchReq)
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetSceneAreaReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetSceneAreaReq.java
index 179f13eef..b94dedd42 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetSceneAreaReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetSceneAreaReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.GetSceneAreaReqOuterClass.GetSceneAreaReq;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketGetSceneAreaRsp;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetScenePointReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetScenePointReq.java
index ac7dec203..9aa97ee7b 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetScenePointReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetScenePointReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.GetScenePointReqOuterClass.GetScenePointReq;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketGetScenePointRsp;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetShopReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetShopReq.java
index c0accac1b..5255b6230 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetShopReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetShopReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.GetShopReqOuterClass.GetShopReq;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketGetShopRsp;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetShopmallDataReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetShopmallDataReq.java
index cd595fb29..da784e414 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetShopmallDataReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetShopmallDataReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketGetShopmallDataRsp;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetUgcBriefInfoReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetUgcBriefInfoReq.java
index fa60efa88..31f0ceb17 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetUgcBriefInfoReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetUgcBriefInfoReq.java
@@ -1,12 +1,9 @@
 package emu.grasscutter.server.packet.recv;
 
 import emu.grasscutter.game.activity.musicgame.MusicGameBeatmap;
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.GetUgcBriefInfoReqOuterClass;
+import emu.grasscutter.net.packet.*;
+import emu.grasscutter.net.proto.*;
 import emu.grasscutter.net.proto.RetcodeOuterClass.Retcode;
-import emu.grasscutter.net.proto.UgcTypeOuterClass;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketGetUgcBriefInfoRsp;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetUgcReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetUgcReq.java
index 9b31509cd..62fb5f33c 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetUgcReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetUgcReq.java
@@ -1,12 +1,9 @@
 package emu.grasscutter.server.packet.recv;
 
 import emu.grasscutter.game.activity.musicgame.MusicGameBeatmap;
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.GetUgcReqOuterClass.GetUgcReq;
-import emu.grasscutter.net.proto.RetcodeOuterClass;
-import emu.grasscutter.net.proto.UgcTypeOuterClass;
+import emu.grasscutter.net.proto.*;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketGetUgcRsp;
 import lombok.val;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetWidgetSlotReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetWidgetSlotReq.java
index 674ae9c96..95aa02f0c 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetWidgetSlotReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetWidgetSlotReq.java
@@ -1,9 +1,7 @@
 package emu.grasscutter.server.packet.recv;
 
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketGetWidgetSlotRsp;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetWorldMpInfoReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetWorldMpInfoReq.java
index c6a09826a..38e406df2 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetWorldMpInfoReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetWorldMpInfoReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketGetWorldMpInfoRsp;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerHitTreeNotify.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerHitTreeNotify.java
index 3735fb53c..96b7b9bd4 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerHitTreeNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerHitTreeNotify.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.HitTreeNotifyOuterClass.HitTreeNotify;
 import emu.grasscutter.server.game.GameSession;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerHomeChangeBgmReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerHomeChangeBgmReq.java
index 8612d3924..b97f924a0 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerHomeChangeBgmReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerHomeChangeBgmReq.java
@@ -1,12 +1,9 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.HomeChangeBgmReqOuterClass;
 import emu.grasscutter.server.game.GameSession;
-import emu.grasscutter.server.packet.send.PacketHomeChangeBgmNotify;
-import emu.grasscutter.server.packet.send.PacketHomeChangeBgmRsp;
+import emu.grasscutter.server.packet.send.*;
 
 @Opcodes(PacketOpcodes.HomeChangeBgmReq)
 public class HandlerHomeChangeBgmReq extends PacketHandler {
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerHomeChangeEditModeReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerHomeChangeEditModeReq.java
index f6b07875d..8deaa24b8 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerHomeChangeEditModeReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerHomeChangeEditModeReq.java
@@ -1,15 +1,9 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.HomeChangeEditModeReqOuterClass;
-import emu.grasscutter.net.proto.RetcodeOuterClass;
+import emu.grasscutter.net.packet.*;
+import emu.grasscutter.net.proto.*;
 import emu.grasscutter.server.game.GameSession;
-import emu.grasscutter.server.packet.send.PacketHomeBasicInfoNotify;
-import emu.grasscutter.server.packet.send.PacketHomeChangeEditModeRsp;
-import emu.grasscutter.server.packet.send.PacketHomeComfortInfoNotify;
-import emu.grasscutter.server.packet.send.PacketHomePreChangeEditModeNotify;
+import emu.grasscutter.server.packet.send.*;
 
 @Opcodes(PacketOpcodes.HomeChangeEditModeReq)
 public class HandlerHomeChangeEditModeReq extends PacketHandler {
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerHomeChangeModuleReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerHomeChangeModuleReq.java
index ddf168b6d..7e547f522 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerHomeChangeModuleReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerHomeChangeModuleReq.java
@@ -1,16 +1,11 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.game.world.Position;
-import emu.grasscutter.game.world.Scene;
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.game.world.*;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.HomeChangeModuleReqOuterClass;
 import emu.grasscutter.server.event.player.PlayerTeleportEvent.TeleportType;
 import emu.grasscutter.server.game.GameSession;
-import emu.grasscutter.server.packet.send.PacketHomeChangeModuleRsp;
-import emu.grasscutter.server.packet.send.PacketHomeComfortInfoNotify;
-import emu.grasscutter.server.packet.send.PacketPlayerHomeCompInfoNotify;
+import emu.grasscutter.server.packet.send.*;
 
 @Opcodes(PacketOpcodes.HomeChangeModuleReq)
 public class HandlerHomeChangeModuleReq extends PacketHandler {
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerHomeChooseModuleReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerHomeChooseModuleReq.java
index ae0d2e574..f6748c238 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerHomeChooseModuleReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerHomeChooseModuleReq.java
@@ -1,13 +1,9 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.HomeChooseModuleReqOuterClass;
 import emu.grasscutter.server.game.GameSession;
-import emu.grasscutter.server.packet.send.PacketHomeChooseModuleRsp;
-import emu.grasscutter.server.packet.send.PacketHomeComfortInfoNotify;
-import emu.grasscutter.server.packet.send.PacketPlayerHomeCompInfoNotify;
+import emu.grasscutter.server.packet.send.*;
 
 @Opcodes(PacketOpcodes.HomeChooseModuleReq)
 public class HandlerHomeChooseModuleReq extends PacketHandler {
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerHomeEnterEditModeFinishReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerHomeEnterEditModeFinishReq.java
index 8b347fbfe..85f0655b5 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerHomeEnterEditModeFinishReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerHomeEnterEditModeFinishReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketHomeEnterEditModeFinishRsp;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerHomeGetArrangementInfoReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerHomeGetArrangementInfoReq.java
index e2e4512d0..a8fd6a0e6 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerHomeGetArrangementInfoReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerHomeGetArrangementInfoReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.HomeGetArrangementInfoReqOuterClass;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketHomeGetArrangementInfoRsp;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerHomeGetBasicInfoReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerHomeGetBasicInfoReq.java
index c4ea0ae47..31a644520 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerHomeGetBasicInfoReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerHomeGetBasicInfoReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketHomeBasicInfoNotify;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerHomeGetOnlineStatusReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerHomeGetOnlineStatusReq.java
index 02cf64ca3..81750a880 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerHomeGetOnlineStatusReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerHomeGetOnlineStatusReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketHomeGetOnlineStatusRsp;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerHomeKickPlayerReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerHomeKickPlayerReq.java
index 87db6bf0d..d323a8a0c 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerHomeKickPlayerReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerHomeKickPlayerReq.java
@@ -1,10 +1,7 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.HomeKickPlayerReqOuterClass;
-import emu.grasscutter.net.proto.RetcodeOuterClass;
+import emu.grasscutter.net.packet.*;
+import emu.grasscutter.net.proto.*;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketHomeKickPlayerRsp;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerHomeModuleSeenReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerHomeModuleSeenReq.java
index fa7c92775..0890cc901 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerHomeModuleSeenReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerHomeModuleSeenReq.java
@@ -1,12 +1,9 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.HomeModuleSeenReqOuterClass.HomeModuleSeenReq;
 import emu.grasscutter.server.game.GameSession;
-import emu.grasscutter.server.packet.send.PacketHomeModuleSeenRsp;
-import emu.grasscutter.server.packet.send.PacketPlayerHomeCompInfoNotify;
+import emu.grasscutter.server.packet.send.*;
 
 @Opcodes(PacketOpcodes.HomeModuleSeenReq)
 public class HandlerHomeModuleSeenReq extends PacketHandler {
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerHomeResourceTakeFetterExpReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerHomeResourceTakeFetterExpReq.java
index 18eeac3fd..ad0abc220 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerHomeResourceTakeFetterExpReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerHomeResourceTakeFetterExpReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketHomeResourceTakeFetterExpRsp;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerHomeResourceTakeHomeCoinReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerHomeResourceTakeHomeCoinReq.java
index 2d2b11741..7ecc1a464 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerHomeResourceTakeHomeCoinReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerHomeResourceTakeHomeCoinReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketHomeResourceTakeHomeCoinRsp;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerHomeSaveArrangementNoChangeReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerHomeSaveArrangementNoChangeReq.java
index 3c470e057..35fcec820 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerHomeSaveArrangementNoChangeReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerHomeSaveArrangementNoChangeReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.HomeSaveArrangementNoChangeReqOuterClass;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketHomeSaveArrangementNoChangeRsp;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerHomeSceneInitFinishReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerHomeSceneInitFinishReq.java
index d151632cc..b8bc529b0 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerHomeSceneInitFinishReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerHomeSceneInitFinishReq.java
@@ -1,13 +1,9 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.OtherPlayerEnterHomeNotifyOuterClass;
 import emu.grasscutter.server.game.GameSession;
-import emu.grasscutter.server.packet.send.PacketHomeMarkPointNotify;
-import emu.grasscutter.server.packet.send.PacketHomeSceneInitFinishRsp;
-import emu.grasscutter.server.packet.send.PacketOtherPlayerEnterOrLeaveHomeNotify;
+import emu.grasscutter.server.packet.send.*;
 
 @Opcodes(PacketOpcodes.HomeSceneInitFinishReq)
 public class HandlerHomeSceneInitFinishReq extends PacketHandler {
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerHomeSceneJumpReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerHomeSceneJumpReq.java
index e1e914940..d616b6e4c 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerHomeSceneJumpReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerHomeSceneJumpReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.HomeSceneJumpReqOuterClass;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketHomeSceneJumpRsp;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerHomeTransferReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerHomeTransferReq.java
index 26b3f664b..7d444138a 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerHomeTransferReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerHomeTransferReq.java
@@ -2,10 +2,7 @@ package emu.grasscutter.server.packet.recv;
 
 import com.github.davidmoten.guavamini.Lists;
 import emu.grasscutter.game.home.HomeFurnitureItem;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.HomeTransferReqOuterClass;
 import emu.grasscutter.server.game.GameSession;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerHomeUpdateArrangementInfoReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerHomeUpdateArrangementInfoReq.java
index d2724ed13..906475a1d 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerHomeUpdateArrangementInfoReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerHomeUpdateArrangementInfoReq.java
@@ -1,12 +1,9 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.HomeUpdateArrangementInfoReqOuterClass;
 import emu.grasscutter.server.game.GameSession;
-import emu.grasscutter.server.packet.send.PacketHomeMarkPointNotify;
-import emu.grasscutter.server.packet.send.PacketHomeUpdateArrangementInfoRsp;
+import emu.grasscutter.server.packet.send.*;
 
 @Opcodes(PacketOpcodes.HomeUpdateArrangementInfoReq)
 public class HandlerHomeUpdateArrangementInfoReq extends PacketHandler {
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerItemGivingReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerItemGivingReq.java
index 15b73fcf0..fc4d0c8be 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerItemGivingReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerItemGivingReq.java
@@ -8,6 +8,7 @@ import emu.grasscutter.net.proto.ItemGivingReqOuterClass.ItemGivingReq;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketItemGivingRsp;
 import emu.grasscutter.server.packet.send.PacketItemGivingRsp.Mode;
+
 import java.util.*;
 
 @Opcodes(PacketOpcodes.ItemGivingReq)
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerLaunchFireworksReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerLaunchFireworksReq.java
index 369fa4e24..1dd21a9a8 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerLaunchFireworksReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerLaunchFireworksReq.java
@@ -1,12 +1,9 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.LaunchFireworksReqOuterClass.LaunchFireworksReq;
 import emu.grasscutter.server.game.GameSession;
-import emu.grasscutter.server.packet.send.PacketFireworksLaunchDataNotify;
-import emu.grasscutter.server.packet.send.PacketLaunchFireworksRsp;
+import emu.grasscutter.server.packet.send.*;
 
 @Opcodes(PacketOpcodes.LaunchFireworksReq)
 public class HandlerLaunchFireworksReq extends PacketHandler {
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerLevelupCityReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerLevelupCityReq.java
index 74e61911d..7cd32da9c 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerLevelupCityReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerLevelupCityReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.LevelupCityReqOuterClass.LevelupCityReq;
 import emu.grasscutter.server.game.GameSession;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerMarkMapReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerMarkMapReq.java
index 65551d759..24a6cf491 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerMarkMapReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerMarkMapReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.MarkMapReqOuterClass.MarkMapReq;
 import emu.grasscutter.server.game.GameSession;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerMassiveEntityElementOpBatchNotify.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerMassiveEntityElementOpBatchNotify.java
index cc572cda2..70a436f8c 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerMassiveEntityElementOpBatchNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerMassiveEntityElementOpBatchNotify.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.MassiveEntityElementOpBatchNotifyOuterClass;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketMassiveEntityElementOpBatchNotify;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerMcoinExchangeHcoinReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerMcoinExchangeHcoinReq.java
index 0e3b5d8d4..922a5530b 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerMcoinExchangeHcoinReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerMcoinExchangeHcoinReq.java
@@ -1,10 +1,7 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.McoinExchangeHcoinReqOuterClass;
-import emu.grasscutter.net.proto.RetcodeOuterClass;
+import emu.grasscutter.net.packet.*;
+import emu.grasscutter.net.proto.*;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketMcoinExchangeHcoinRsp;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerMonsterAIConfigHashNotify.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerMonsterAIConfigHashNotify.java
index c2f105a27..fbb8c271b 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerMonsterAIConfigHashNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerMonsterAIConfigHashNotify.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.server.game.GameSession;
 
 @Opcodes(PacketOpcodes.MonsterAIConfigHashNotify)
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerMonsterAlertChangeNotify.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerMonsterAlertChangeNotify.java
index 0ba31887a..2cb8fc16a 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerMonsterAlertChangeNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerMonsterAlertChangeNotify.java
@@ -1,9 +1,7 @@
 package emu.grasscutter.server.packet.recv;
 
 import emu.grasscutter.game.entity.EntityMonster;
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.MonsterAlertChangeNotifyOuterClass.MonsterAlertChangeNotify;
 import emu.grasscutter.scripts.constants.EventType;
 import emu.grasscutter.scripts.data.ScriptArgs;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerMusicGameSettleReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerMusicGameSettleReq.java
index 7352c9efd..a13fe09dd 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerMusicGameSettleReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerMusicGameSettleReq.java
@@ -1,17 +1,12 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.game.activity.musicgame.MusicGameActivityHandler;
-import emu.grasscutter.game.activity.musicgame.MusicGamePlayerData;
-import emu.grasscutter.game.props.ActivityType;
-import emu.grasscutter.game.props.WatcherTriggerType;
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.game.activity.musicgame.*;
+import emu.grasscutter.game.props.*;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.MusicGameSettleReqOuterClass.MusicGameSettleReq;
 import emu.grasscutter.net.proto.RetcodeOuterClass;
 import emu.grasscutter.server.game.GameSession;
-import emu.grasscutter.server.packet.send.PacketActivityInfoNotify;
-import emu.grasscutter.server.packet.send.PacketMusicGameSettleRsp;
+import emu.grasscutter.server.packet.send.*;
 import lombok.val;
 
 @Opcodes(PacketOpcodes.MusicGameSettleReq)
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerMusicGameStartReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerMusicGameStartReq.java
index 23bf26243..ec9ca6d67 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerMusicGameStartReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerMusicGameStartReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.MusicGameStartReqOuterClass;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketMusicGameStartRsp;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerNpcTalkReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerNpcTalkReq.java
index 778098bd0..1fd006de5 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerNpcTalkReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerNpcTalkReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.NpcTalkReqOuterClass.NpcTalkReq;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketNpcTalkRsp;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerObstacleModifyNotify.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerObstacleModifyNotify.java
index 4bbb853de..8dfe00c2a 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerObstacleModifyNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerObstacleModifyNotify.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.server.game.GameSession;
 
 @Opcodes(PacketOpcodes.ObstacleModifyNotify)
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerPathfindingEnterSceneReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerPathfindingEnterSceneReq.java
index 9f68fd7b8..fd27988fb 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerPathfindingEnterSceneReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerPathfindingEnterSceneReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.PacketHeadOuterClass.PacketHead;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketPathfindingEnterSceneRsp;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerPersonalLineAllDataReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerPersonalLineAllDataReq.java
index 3d2751c9a..278bc7b54 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerPersonalLineAllDataReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerPersonalLineAllDataReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketPersonalLineAllDataRsp;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerPersonalSceneJumpReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerPersonalSceneJumpReq.java
index 6448b9a62..469bcbadb 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerPersonalSceneJumpReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerPersonalSceneJumpReq.java
@@ -3,9 +3,7 @@ package emu.grasscutter.server.packet.recv;
 import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.binout.ScenePointEntry;
 import emu.grasscutter.game.world.Position;
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.PersonalSceneJumpReqOuterClass.PersonalSceneJumpReq;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketPersonalSceneJumpRsp;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerPingReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerPingReq.java
index 21c9dc51c..b03896d4b 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerPingReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerPingReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.PacketHeadOuterClass.PacketHead;
 import emu.grasscutter.net.proto.PingReqOuterClass.PingReq;
 import emu.grasscutter.server.game.GameSession;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerPlayerApplyEnterHomeResultReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerPlayerApplyEnterHomeResultReq.java
index dd8812534..c5a87dde2 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerPlayerApplyEnterHomeResultReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerPlayerApplyEnterHomeResultReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.PlayerApplyEnterHomeResultReqOuterClass;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketPlayerApplyEnterHomeResultRsp;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerPlayerApplyEnterMpReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerPlayerApplyEnterMpReq.java
index 3874d6e6f..397e9b2ef 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerPlayerApplyEnterMpReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerPlayerApplyEnterMpReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.PlayerApplyEnterMpReqOuterClass.PlayerApplyEnterMpReq;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketPlayerApplyEnterMpRsp;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerPlayerApplyEnterMpResultReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerPlayerApplyEnterMpResultReq.java
index d1c5d3d40..3b5da04ab 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerPlayerApplyEnterMpResultReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerPlayerApplyEnterMpResultReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.PlayerApplyEnterMpResultReqOuterClass.PlayerApplyEnterMpResultReq;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketPlayerApplyEnterMpResultRsp;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerPlayerChatReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerPlayerChatReq.java
index 3cabd5cb9..54cb80d77 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerPlayerChatReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerPlayerChatReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo;
 import emu.grasscutter.net.proto.PlayerChatReqOuterClass.PlayerChatReq;
 import emu.grasscutter.server.game.GameSession;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerPlayerCompoundMaterialReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerPlayerCompoundMaterialReq.java
index 0558dca11..7f6e6459d 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerPlayerCompoundMaterialReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerPlayerCompoundMaterialReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.PlayerCompoundMaterialReqOuterClass;
 import emu.grasscutter.server.game.GameSession;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerPlayerCookArgsReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerPlayerCookArgsReq.java
index 1e44d7d75..3e0c3cffe 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerPlayerCookArgsReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerPlayerCookArgsReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.PlayerCookArgsReqOuterClass;
 import emu.grasscutter.server.game.GameSession;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerPlayerCookReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerPlayerCookReq.java
index 7445657da..a8b1a33b8 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerPlayerCookReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerPlayerCookReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.PlayerCookReqOuterClass;
 import emu.grasscutter.server.game.GameSession;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerPlayerEnterDungeonReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerPlayerEnterDungeonReq.java
index 73c12e1ef..5aa15e2de 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerPlayerEnterDungeonReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerPlayerEnterDungeonReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.PlayerEnterDungeonReqOuterClass.PlayerEnterDungeonReq;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketPlayerEnterDungeonRsp;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerPlayerForceExitReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerPlayerForceExitReq.java
index a975ff5ae..fdb25a80e 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerPlayerForceExitReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerPlayerForceExitReq.java
@@ -1,9 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.server.game.GameSession;
 
 @Opcodes(PacketOpcodes.PlayerForceExitReq)
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerPlayerGetForceQuitBanInfoReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerPlayerGetForceQuitBanInfoReq.java
index 78f931484..8b1a9036f 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerPlayerGetForceQuitBanInfoReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerPlayerGetForceQuitBanInfoReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.RetcodeOuterClass;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketPlayerGetForceQuitBanInfoRsp;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerPlayerLoginReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerPlayerLoginReq.java
index f01a79d7a..d80cc5b2e 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerPlayerLoginReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerPlayerLoginReq.java
@@ -1,10 +1,7 @@
 package emu.grasscutter.server.packet.recv;
 
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.PlayerLoginReqOuterClass.PlayerLoginReq;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.game.GameSession.SessionState;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerPlayerQuitDungeonReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerPlayerQuitDungeonReq.java
index 7a4594bd7..b1350dcb8 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerPlayerQuitDungeonReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerPlayerQuitDungeonReq.java
@@ -1,9 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.server.game.GameSession;
 
 @Opcodes(PacketOpcodes.PlayerQuitDungeonReq)
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerPlayerSetPauseReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerPlayerSetPauseReq.java
index c88c94217..8d709d902 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerPlayerSetPauseReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerPlayerSetPauseReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.PlayerSetPauseReqOuterClass.PlayerSetPauseReq;
 import emu.grasscutter.net.proto.RetcodeOuterClass.Retcode;
 import emu.grasscutter.server.game.GameSession;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerPostEnterSceneReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerPostEnterSceneReq.java
index 96559a622..2913e1905 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerPostEnterSceneReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerPostEnterSceneReq.java
@@ -1,9 +1,7 @@
 package emu.grasscutter.server.packet.recv;
 
 import emu.grasscutter.game.quest.enums.QuestContent;
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketPostEnterSceneRsp;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerPrivateChatReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerPrivateChatReq.java
index af7c10057..a6eb5d063 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerPrivateChatReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerPrivateChatReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.PrivateChatReqOuterClass.PrivateChatReq;
 import emu.grasscutter.server.game.GameSession;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerPullPrivateChatReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerPullPrivateChatReq.java
index 3afa2f8d4..b5a616ddd 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerPullPrivateChatReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerPullPrivateChatReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.PullPrivateChatReqOuterClass.PullPrivateChatReq;
 import emu.grasscutter.server.game.GameSession;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerPullRecentChatReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerPullRecentChatReq.java
index 8e7ee378b..011deda9e 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerPullRecentChatReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerPullRecentChatReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.server.game.GameSession;
 
 @Opcodes(PacketOpcodes.PullRecentChatReq)
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerQueryCodexMonsterBeKilledNumReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerQueryCodexMonsterBeKilledNumReq.java
index 314821cf1..7cffd5529 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerQueryCodexMonsterBeKilledNumReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerQueryCodexMonsterBeKilledNumReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.QueryCodexMonsterBeKilledNumReqOuterClass.QueryCodexMonsterBeKilledNumReq;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketQueryCodexMonsterBeKilledNumRsp;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerQueryPathReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerQueryPathReq.java
index 85dcbc251..3bfd7bd17 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerQueryPathReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerQueryPathReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.QueryPathReqOuterClass.QueryPathReq;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketQueryPathRsp;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerQuestDestroyEntityReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerQuestDestroyEntityReq.java
index c37b91875..b0a326912 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerQuestDestroyEntityReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerQuestDestroyEntityReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.QuestDestroyEntityReqOuterClass.QuestDestroyEntityReq;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketQuestDestroyEntityRsp;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerQuestDestroyNpcReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerQuestDestroyNpcReq.java
index e2804abd4..96373e108 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerQuestDestroyNpcReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerQuestDestroyNpcReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.QuestDestroyNpcReqOuterClass.QuestDestroyNpcReq;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketQuestDestroyNpcRsp;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerQuestTransmitReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerQuestTransmitReq.java
index 4dd93f524..e77b9709c 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerQuestTransmitReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerQuestTransmitReq.java
@@ -2,12 +2,11 @@ package emu.grasscutter.server.packet.recv;
 
 import emu.grasscutter.data.GameData;
 import emu.grasscutter.game.world.Position;
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.QuestTransmitReqOuterClass.QuestTransmitReq;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketQuestTransmitRsp;
+
 import java.util.ArrayList;
 
 @Opcodes(PacketOpcodes.QuestTransmitReq)
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerQuestUpdateQuestVarReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerQuestUpdateQuestVarReq.java
index 2127b19a5..6191848d6 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerQuestUpdateQuestVarReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerQuestUpdateQuestVarReq.java
@@ -1,9 +1,7 @@
 package emu.grasscutter.server.packet.recv;
 
 import emu.grasscutter.Grasscutter;
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.QuestUpdateQuestVarReqOuterClass.QuestUpdateQuestVarReq;
 import emu.grasscutter.net.proto.RetcodeOuterClass.Retcode;
 import emu.grasscutter.server.game.GameSession;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerQuickUseWidgetReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerQuickUseWidgetReq.java
index b9be2b956..a7cb0d658 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerQuickUseWidgetReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerQuickUseWidgetReq.java
@@ -1,15 +1,9 @@
 package emu.grasscutter.server.packet.recv;
 
 import emu.grasscutter.Grasscutter;
-import emu.grasscutter.game.inventory.GameItem;
-import emu.grasscutter.game.inventory.Inventory;
-import emu.grasscutter.game.inventory.InventoryTab;
-import emu.grasscutter.game.inventory.ItemType;
+import emu.grasscutter.game.inventory.*;
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.QuickUseWidgetRspOuterClass.QuickUseWidgetRsp;
 import emu.grasscutter.server.game.GameSession;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerReadMailNotify.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerReadMailNotify.java
index e70fa22b5..8e8bda0c1 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerReadMailNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerReadMailNotify.java
@@ -1,14 +1,12 @@
 package emu.grasscutter.server.packet.recv;
 
 import emu.grasscutter.game.mail.Mail;
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.ReadMailNotifyOuterClass;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketMailChangeNotify;
-import java.util.ArrayList;
-import java.util.List;
+
+import java.util.*;
 
 @Opcodes(PacketOpcodes.ReadMailNotify)
 public class HandlerReadMailNotify extends PacketHandler {
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerReceivedTrialAvatarActivityRewardReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerReceivedTrialAvatarActivityRewardReq.java
index 54f903781..9b2b68dd5 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerReceivedTrialAvatarActivityRewardReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerReceivedTrialAvatarActivityRewardReq.java
@@ -2,9 +2,7 @@ package emu.grasscutter.server.packet.recv;
 
 import emu.grasscutter.game.activity.trialavatar.TrialAvatarActivityHandler;
 import emu.grasscutter.game.props.ActivityType;
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.ReceivedTrialAvatarActivityRewardReqOuterClass.ReceivedTrialAvatarActivityRewardReq;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketReceivedTrialAvatarActivityRewardRsp;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerReliquaryDecomposeReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerReliquaryDecomposeReq.java
index 6844d011e..23e2fae23 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerReliquaryDecomposeReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerReliquaryDecomposeReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.ReliquaryDecomposeReqOuterClass.ReliquaryDecomposeReq;
 import emu.grasscutter.server.game.GameSession;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerReliquaryUpgradeReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerReliquaryUpgradeReq.java
index d9ddc8400..c938cf863 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerReliquaryUpgradeReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerReliquaryUpgradeReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.ReliquaryUpgradeReqOuterClass.ReliquaryUpgradeReq;
 import emu.grasscutter.server.game.GameSession;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerSceneAudioNotify.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerSceneAudioNotify.java
index 2e6e51915..581744e3a 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerSceneAudioNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerSceneAudioNotify.java
@@ -1,11 +1,10 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.SceneAudioNotifyOuterClass.SceneAudioNotify;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketSceneAudioNotify;
+
 import java.util.List;
 
 @Opcodes(PacketOpcodes.SceneAudioNotify)
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerSceneEntityDrownReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerSceneEntityDrownReq.java
index 05882f528..bfeaafd9a 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerSceneEntityDrownReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerSceneEntityDrownReq.java
@@ -1,12 +1,8 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.game.entity.EntityAvatar;
-import emu.grasscutter.game.entity.EntityMonster;
-import emu.grasscutter.game.entity.GameEntity;
+import emu.grasscutter.game.entity.*;
 import emu.grasscutter.game.props.FightProperty;
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.SceneEntityDrownReqOuterClass.SceneEntityDrownReq;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketSceneEntityDrownRsp;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerSceneInitFinishReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerSceneInitFinishReq.java
index 681f7525e..83484a512 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerSceneInitFinishReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerSceneInitFinishReq.java
@@ -1,10 +1,7 @@
 package emu.grasscutter.server.packet.recv;
 
 import emu.grasscutter.game.player.Player.SceneLoadState;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.*;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerSceneKickPlayerReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerSceneKickPlayerReq.java
index eddeddc09..06d520e09 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerSceneKickPlayerReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerSceneKickPlayerReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.SceneKickPlayerReqOuterClass.SceneKickPlayerReq;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketSceneKickPlayerRsp;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerSceneTransToPointReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerSceneTransToPointReq.java
index c3184719a..63833bf0e 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerSceneTransToPointReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerSceneTransToPointReq.java
@@ -2,9 +2,7 @@ package emu.grasscutter.server.packet.recv;
 
 import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.binout.ScenePointEntry;
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.SceneTransToPointReqOuterClass.SceneTransToPointReq;
 import emu.grasscutter.server.event.player.PlayerTeleportEvent.TeleportType;
 import emu.grasscutter.server.game.GameSession;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerSelectWorktopOptionReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerSelectWorktopOptionReq.java
index 75c27f3cf..f4b161908 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerSelectWorktopOptionReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerSelectWorktopOptionReq.java
@@ -1,11 +1,8 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.game.entity.EntityGadget;
-import emu.grasscutter.game.entity.GameEntity;
+import emu.grasscutter.game.entity.*;
 import emu.grasscutter.game.quest.enums.QuestContent;
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.SelectWorktopOptionReqOuterClass.SelectWorktopOptionReq;
 import emu.grasscutter.scripts.constants.EventType;
 import emu.grasscutter.scripts.data.ScriptArgs;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerSetBattlePassViewedReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerSetBattlePassViewedReq.java
index 4b4723c77..e5a74730f 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerSetBattlePassViewedReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerSetBattlePassViewedReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.SetBattlePassViewedReqOuterClass.SetBattlePassViewedReq;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketSetBattlePassViewedRsp;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerSetChatEmojiCollectionReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerSetChatEmojiCollectionReq.java
index ead11ac6f..9dd990ff0 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerSetChatEmojiCollectionReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerSetChatEmojiCollectionReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.SetChatEmojiCollectionReqOuterClass;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketSetChatEmojiCollectionRsp;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerSetEntityClientDataNotify.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerSetEntityClientDataNotify.java
index a2fd21952..ecbca3265 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerSetEntityClientDataNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerSetEntityClientDataNotify.java
@@ -1,9 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.SetEntityClientDataNotifyOuterClass.SetEntityClientDataNotify;
 import emu.grasscutter.server.game.GameSession;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerSetEquipLockStateReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerSetEquipLockStateReq.java
index c4b64f02b..4e9ccaa2d 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerSetEquipLockStateReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerSetEquipLockStateReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.SetEquipLockStateReqOuterClass.SetEquipLockStateReq;
 import emu.grasscutter.server.game.GameSession;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerSetFriendEnterHomeOptionReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerSetFriendEnterHomeOptionReq.java
index b2f4d6e54..b7b35a456 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerSetFriendEnterHomeOptionReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerSetFriendEnterHomeOptionReq.java
@@ -1,12 +1,9 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.SetFriendEnterHomeOptionReqOuterClass;
 import emu.grasscutter.server.game.GameSession;
-import emu.grasscutter.server.packet.send.PacketPlayerHomeCompInfoNotify;
-import emu.grasscutter.server.packet.send.PacketSetFriendEnterHomeOptionRsp;
+import emu.grasscutter.server.packet.send.*;
 
 @Opcodes(PacketOpcodes.SetFriendEnterHomeOptionReq)
 public class HandlerSetFriendEnterHomeOptionReq extends PacketHandler {
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerSetNameCardReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerSetNameCardReq.java
index d89793f51..71f857d91 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerSetNameCardReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerSetNameCardReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.SetNameCardReqOuterClass.SetNameCardReq;
 import emu.grasscutter.server.game.GameSession;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerSetOpenStateReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerSetOpenStateReq.java
index 6aaefccc2..6ac9c0eb7 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerSetOpenStateReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerSetOpenStateReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.SetOpenStateReqOuterClass.SetOpenStateReq;
 import emu.grasscutter.server.game.GameSession;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerSetPlayerBirthdayReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerSetPlayerBirthdayReq.java
index c43d93c44..4103ca8d4 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerSetPlayerBirthdayReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerSetPlayerBirthdayReq.java
@@ -1,13 +1,10 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.SetPlayerBirthdayReqOuterClass.SetPlayerBirthdayReq;
 import emu.grasscutter.net.proto.SocialDetailOuterClass.SocialDetail;
 import emu.grasscutter.server.game.GameSession;
-import emu.grasscutter.server.packet.send.PacketGetPlayerSocialDetailRsp;
-import emu.grasscutter.server.packet.send.PacketSetPlayerBirthdayRsp;
+import emu.grasscutter.server.packet.send.*;
 
 @Opcodes(PacketOpcodes.SetPlayerBirthdayReq)
 public class HandlerSetPlayerBirthdayReq extends PacketHandler {
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerSetPlayerBornDataReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerSetPlayerBornDataReq.java
index e1c61b046..ddf5ebe00 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerSetPlayerBornDataReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerSetPlayerBornDataReq.java
@@ -1,23 +1,19 @@
 package emu.grasscutter.server.packet.recv;
 
-import static emu.grasscutter.config.Configuration.GAME_INFO;
-import static emu.grasscutter.config.Configuration.GAME_OPTIONS;
-
-import emu.grasscutter.GameConstants;
-import emu.grasscutter.Grasscutter;
+import emu.grasscutter.*;
 import emu.grasscutter.command.commands.SendMailCommand.MailBuilder;
 import emu.grasscutter.data.GameData;
 import emu.grasscutter.game.avatar.Avatar;
 import emu.grasscutter.game.mail.Mail;
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.SetPlayerBornDataReqOuterClass.SetPlayerBornDataReq;
 import emu.grasscutter.server.game.GameSession;
+
 import java.util.Arrays;
 
+import static emu.grasscutter.config.Configuration.*;
+
 @Opcodes(PacketOpcodes.SetPlayerBornDataReq)
 public class HandlerSetPlayerBornDataReq extends PacketHandler {
 
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerSetPlayerHeadImageReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerSetPlayerHeadImageReq.java
index dca919192..01c41bc2a 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerSetPlayerHeadImageReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerSetPlayerHeadImageReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.SetPlayerHeadImageReqOuterClass.SetPlayerHeadImageReq;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketSetPlayerHeadImageRsp;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerSetPlayerNameReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerSetPlayerNameReq.java
index 1f79ac0e7..2ceb23653 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerSetPlayerNameReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerSetPlayerNameReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.SetPlayerNameReqOuterClass.SetPlayerNameReq;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketSetPlayerNameRsp;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerSetPlayerPropReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerSetPlayerPropReq.java
index 08c88abd9..3a0a1e341 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerSetPlayerPropReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerSetPlayerPropReq.java
@@ -1,9 +1,7 @@
 package emu.grasscutter.server.packet.recv;
 
 import emu.grasscutter.game.props.PlayerProperty;
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.SetPlayerPropReqOuterClass.SetPlayerPropReq;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketSetPlayerPropRsp;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerSetPlayerSignatureReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerSetPlayerSignatureReq.java
index a463e1e6f..335d63b99 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerSetPlayerSignatureReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerSetPlayerSignatureReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.SetPlayerSignatureReqOuterClass.SetPlayerSignatureReq;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketSetPlayerSignatureRsp;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerSetUpAvatarTeamReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerSetUpAvatarTeamReq.java
index 380edfb54..9cc7c5e54 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerSetUpAvatarTeamReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerSetUpAvatarTeamReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.SetUpAvatarTeamReqOuterClass.SetUpAvatarTeamReq;
 import emu.grasscutter.server.game.GameSession;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerSetUpLunchBoxWidgetReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerSetUpLunchBoxWidgetReq.java
index e127831aa..0b94e0690 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerSetUpLunchBoxWidgetReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerSetUpLunchBoxWidgetReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.SetUpLunchBoxWidgetReqOuterClass;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketSetUpLunchBoxWidgetRsp;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerSetWidgetSlotReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerSetWidgetSlotReq.java
index 290de2990..9fad287a8 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerSetWidgetSlotReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerSetWidgetSlotReq.java
@@ -1,14 +1,10 @@
 package emu.grasscutter.server.packet.recv;
 
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.SetWidgetSlotReqOuterClass;
-import emu.grasscutter.net.proto.WidgetSlotOpOuterClass;
+import emu.grasscutter.net.packet.*;
+import emu.grasscutter.net.proto.*;
 import emu.grasscutter.server.game.GameSession;
-import emu.grasscutter.server.packet.send.PacketSetWidgetSlotRsp;
-import emu.grasscutter.server.packet.send.PacketWidgetSlotChangeNotify;
+import emu.grasscutter.server.packet.send.*;
 
 @Opcodes(PacketOpcodes.SetWidgetSlotReq)
 public class HandlerSetWidgetSlotReq extends PacketHandler {
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerSkipPlayerGameTimeReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerSkipPlayerGameTimeReq.java
index 0b8b1d620..4a5bfe9e9 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerSkipPlayerGameTimeReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerSkipPlayerGameTimeReq.java
@@ -1,12 +1,9 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.SkipPlayerGameTimeReqOuterClass.SkipPlayerGameTimeReq;
 import emu.grasscutter.server.game.GameSession;
-import emu.grasscutter.server.packet.send.PacketPlayerGameTimeNotify;
-import emu.grasscutter.server.packet.send.PacketSkipPlayerGameTimeRsp;
+import emu.grasscutter.server.packet.send.*;
 
 @Opcodes(PacketOpcodes.SkipPlayerGameTimeReq)
 public class HandlerSkipPlayerGameTimeReq extends PacketHandler {
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerTakeAchievementGoalRewardReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerTakeAchievementGoalRewardReq.java
index bb023f245..409a8a64f 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerTakeAchievementGoalRewardReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerTakeAchievementGoalRewardReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.TakeAchievementGoalRewardReqOuterClass;
 import emu.grasscutter.server.game.GameSession;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerTakeAchievementRewardReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerTakeAchievementRewardReq.java
index 01fda6497..91579affe 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerTakeAchievementRewardReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerTakeAchievementRewardReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.TakeAchievementRewardReqOuterClass;
 import emu.grasscutter.server.game.GameSession;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerTakeBattlePassMissionPointReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerTakeBattlePassMissionPointReq.java
index 0288f833e..73102812e 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerTakeBattlePassMissionPointReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerTakeBattlePassMissionPointReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.TakeBattlePassMissionPointReqOuterClass.TakeBattlePassMissionPointReq;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketTakeBattlePassMissionPointRsp;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerTakeBattlePassRewardReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerTakeBattlePassRewardReq.java
index b201f6570..f823f5e29 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerTakeBattlePassRewardReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerTakeBattlePassRewardReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.TakeBattlePassRewardReqOuterClass.TakeBattlePassRewardReq;
 import emu.grasscutter.server.game.GameSession;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerTakeCompoundOutputReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerTakeCompoundOutputReq.java
index b05f93dc3..399829dcd 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerTakeCompoundOutputReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerTakeCompoundOutputReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.TakeCompoundOutputReqOuterClass;
 import emu.grasscutter.server.game.GameSession;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerTakeFurnitureMakeReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerTakeFurnitureMakeReq.java
index bec9366db..cde8a227b 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerTakeFurnitureMakeReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerTakeFurnitureMakeReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.TakeFurnitureMakeReqOuterClass;
 import emu.grasscutter.server.game.GameSession;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerTakePlayerLevelRewardReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerTakePlayerLevelRewardReq.java
index 2f68d5791..17b36ecf3 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerTakePlayerLevelRewardReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerTakePlayerLevelRewardReq.java
@@ -4,14 +4,12 @@ import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.common.ItemParamData;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.props.ActionReason;
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.TakePlayerLevelRewardReqOuterClass.TakePlayerLevelRewardReq;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketTakePlayerLevelRewardRsp;
-import java.util.List;
-import java.util.Set;
+
+import java.util.*;
 
 @Opcodes(PacketOpcodes.TakePlayerLevelRewardReq)
 public class HandlerTakePlayerLevelRewardReq extends PacketHandler {
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerTakeoffEquipReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerTakeoffEquipReq.java
index 56b5b1be5..3c982ec9a 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerTakeoffEquipReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerTakeoffEquipReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.TakeoffEquipReqOuterClass.TakeoffEquipReq;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketTakeoffEquipRsp;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerTowerAllDataReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerTowerAllDataReq.java
index e5dbe0b1a..231304997 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerTowerAllDataReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerTowerAllDataReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketTowerAllDataRsp;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerTowerEnterLevelReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerTowerEnterLevelReq.java
index 4e219e72d..832045ca8 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerTowerEnterLevelReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerTowerEnterLevelReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.TowerEnterLevelReqOuterClass.TowerEnterLevelReq;
 import emu.grasscutter.server.game.GameSession;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerTowerTeamSelectReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerTowerTeamSelectReq.java
index c745caa10..efffb8a7e 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerTowerTeamSelectReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerTowerTeamSelectReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.TowerTeamOuterClass;
 import emu.grasscutter.net.proto.TowerTeamSelectReqOuterClass.TowerTeamSelectReq;
 import emu.grasscutter.server.game.GameSession;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerTryEnterHomeReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerTryEnterHomeReq.java
index 5d3b14016..a37f28a2e 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerTryEnterHomeReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerTryEnterHomeReq.java
@@ -1,12 +1,8 @@
 package emu.grasscutter.server.packet.recv;
 
 import emu.grasscutter.game.home.GameHome;
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.FriendEnterHomeOptionOuterClass;
-import emu.grasscutter.net.proto.RetcodeOuterClass;
-import emu.grasscutter.net.proto.TryEnterHomeReqOuterClass;
+import emu.grasscutter.net.packet.*;
+import emu.grasscutter.net.proto.*;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketTryEnterHomeRsp;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerUnionCmdNotify.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerUnionCmdNotify.java
index 80cdaced2..475b76c51 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerUnionCmdNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerUnionCmdNotify.java
@@ -1,16 +1,13 @@
 package emu.grasscutter.server.packet.recv;
 
-import static emu.grasscutter.config.Configuration.GAME_INFO;
-import static emu.grasscutter.config.Configuration.SERVER;
-
 import emu.grasscutter.Grasscutter.ServerDebugMode;
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.UnionCmdNotifyOuterClass.UnionCmdNotify;
 import emu.grasscutter.net.proto.UnionCmdOuterClass.UnionCmd;
 import emu.grasscutter.server.game.GameSession;
 
+import static emu.grasscutter.config.Configuration.*;
+
 @Opcodes(PacketOpcodes.UnionCmdNotify)
 public class HandlerUnionCmdNotify extends PacketHandler {
     @Override
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerUnlockAvatarTalentReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerUnlockAvatarTalentReq.java
index 5f21bbc08..355c4f0b7 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerUnlockAvatarTalentReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerUnlockAvatarTalentReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.UnlockAvatarTalentReqOuterClass.UnlockAvatarTalentReq;
 import emu.grasscutter.server.game.GameSession;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerUnlockPersonalLineReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerUnlockPersonalLineReq.java
index 688273a46..b84947f0f 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerUnlockPersonalLineReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerUnlockPersonalLineReq.java
@@ -1,9 +1,7 @@
 package emu.grasscutter.server.packet.recv;
 
 import emu.grasscutter.data.GameData;
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.RetcodeOuterClass.Retcode;
 import emu.grasscutter.net.proto.UnlockPersonalLineReqOuterClass.UnlockPersonalLineReq;
 import emu.grasscutter.server.game.GameSession;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerUnlockTransPointReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerUnlockTransPointReq.java
index aa6fa6ac2..031fde3ef 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerUnlockTransPointReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerUnlockTransPointReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.RetcodeOuterClass;
 import emu.grasscutter.net.proto.UnlockTransPointReqOuterClass.UnlockTransPointReq;
 import emu.grasscutter.server.game.GameSession;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerUpdateAbilityCreatedMovingPlatformNotify.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerUpdateAbilityCreatedMovingPlatformNotify.java
index 64151cf05..29d1a777b 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerUpdateAbilityCreatedMovingPlatformNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerUpdateAbilityCreatedMovingPlatformNotify.java
@@ -2,9 +2,7 @@ package emu.grasscutter.server.packet.recv;
 
 import emu.grasscutter.game.entity.EntityGadget;
 import emu.grasscutter.game.entity.gadget.platform.AbilityRoute;
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.UpdateAbilityCreatedMovingPlatformNotifyOuterClass.UpdateAbilityCreatedMovingPlatformNotify;
 import emu.grasscutter.server.game.GameSession;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerUpdatePlayerShowAvatarListReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerUpdatePlayerShowAvatarListReq.java
index 728d34f5c..e01780cd7 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerUpdatePlayerShowAvatarListReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerUpdatePlayerShowAvatarListReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.UpdatePlayerShowAvatarListReqOuterClass;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketUpdatePlayerShowAvatarListRsp;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerUpdatePlayerShowNameCardListReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerUpdatePlayerShowNameCardListReq.java
index 8b6e454df..d5af5c8c0 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerUpdatePlayerShowNameCardListReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerUpdatePlayerShowNameCardListReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.UpdatePlayerShowNameCardListReqOuterClass;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketUpdatePlayerShowNameCardListRsp;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerUseItemReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerUseItemReq.java
index d7651e236..ffff7bc91 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerUseItemReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerUseItemReq.java
@@ -1,9 +1,7 @@
 package emu.grasscutter.server.packet.recv;
 
 import emu.grasscutter.game.inventory.GameItem;
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.UseItemReqOuterClass.UseItemReq;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketUseItemRsp;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerVehicleInteractReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerVehicleInteractReq.java
index a79eeac1a..274803fc1 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerVehicleInteractReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerVehicleInteractReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.VehicleInteractReqOuterClass;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketVehicleInteractRsp;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerWeaponAwakenReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerWeaponAwakenReq.java
index 31a293929..eaa7819a4 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerWeaponAwakenReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerWeaponAwakenReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.WeaponAwakenReqOuterClass.WeaponAwakenReq;
 import emu.grasscutter.server.game.GameSession;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerWeaponPromoteReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerWeaponPromoteReq.java
index 909a0bf8b..43fde393c 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerWeaponPromoteReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerWeaponPromoteReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.WeaponPromoteReqOuterClass.WeaponPromoteReq;
 import emu.grasscutter.server.game.GameSession;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerWeaponUpgradeReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerWeaponUpgradeReq.java
index 560899515..e014ee12e 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerWeaponUpgradeReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerWeaponUpgradeReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.WeaponUpgradeReqOuterClass.WeaponUpgradeReq;
 import emu.grasscutter.server.game.GameSession;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerWearEquipReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerWearEquipReq.java
index e17363df8..69f9efdca 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerWearEquipReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerWearEquipReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.WearEquipReqOuterClass.WearEquipReq;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketWearEquipRsp;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerWidgetDoBagReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerWidgetDoBagReq.java
index 25bb1d2e1..0c1652a6c 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerWidgetDoBagReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerWidgetDoBagReq.java
@@ -2,14 +2,10 @@ package emu.grasscutter.server.packet.recv;
 
 import emu.grasscutter.game.entity.EntityVehicle;
 import emu.grasscutter.game.world.Position;
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.WidgetDoBagReqOuterClass;
 import emu.grasscutter.server.game.GameSession;
-import emu.grasscutter.server.packet.send.PacketWidgetCoolDownNotify;
-import emu.grasscutter.server.packet.send.PacketWidgetDoBagRsp;
-import emu.grasscutter.server.packet.send.PacketWidgetGadgetDataNotify;
+import emu.grasscutter.server.packet.send.*;
 
 @Opcodes(PacketOpcodes.WidgetDoBagReq)
 public class HandlerWidgetDoBagReq extends PacketHandler {
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerWorldPlayerReviveReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerWorldPlayerReviveReq.java
index 4924d24e0..e1fcca607 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerWorldPlayerReviveReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerWorldPlayerReviveReq.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketWorldPlayerReviveRsp;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PackageTakeCompoundOutputRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PackageTakeCompoundOutputRsp.java
index c97363c60..19b9b9c1e 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PackageTakeCompoundOutputRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PackageTakeCompoundOutputRsp.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam;
 import emu.grasscutter.net.proto.TakeCompoundOutputRspOuterClass.TakeCompoundOutputRsp;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/Packet.java b/src/main/java/emu/grasscutter/server/packet/send/Packet.java
index b1da86038..ef58ef980 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/Packet.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/Packet.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 
 public class Packet extends BasePacket {
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketAbilityChangeNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketAbilityChangeNotify.java
index 1de68d8ff..fdc068811 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketAbilityChangeNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketAbilityChangeNotify.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.entity.EntityAvatar;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.AbilityChangeNotifyOuterClass.AbilityChangeNotify;
 
 public class PacketAbilityChangeNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketAbilityInvocationsNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketAbilityInvocationsNotify.java
index 7715abac6..2ded9b5ba 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketAbilityInvocationsNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketAbilityInvocationsNotify.java
@@ -1,9 +1,9 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.AbilityInvocationsNotifyOuterClass.AbilityInvocationsNotify;
 import emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry;
+
 import java.util.List;
 
 public class PacketAbilityInvocationsNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketAchievementAllDataNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketAchievementAllDataNotify.java
index 474f88dd2..a64888f58 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketAchievementAllDataNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketAchievementAllDataNotify.java
@@ -2,8 +2,7 @@ package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.achievement.Achievement;
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.AchievementAllDataNotifyOuterClass;
 
 public class PacketAchievementAllDataNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketAchievementUpdateNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketAchievementUpdateNotify.java
index 2d85554fc..51d150ca6 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketAchievementUpdateNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketAchievementUpdateNotify.java
@@ -1,9 +1,9 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.achievement.Achievement;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.AchievementUpdateNotifyOuterClass;
+
 import java.util.List;
 
 public class PacketAchievementUpdateNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketActivityInfoNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketActivityInfoNotify.java
index a11e6ec51..5ba15b47c 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketActivityInfoNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketActivityInfoNotify.java
@@ -1,9 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.ActivityInfoNotifyOuterClass;
-import emu.grasscutter.net.proto.ActivityInfoOuterClass;
+import emu.grasscutter.net.packet.*;
+import emu.grasscutter.net.proto.*;
 
 public class PacketActivityInfoNotify extends BasePacket {
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketActivityScheduleInfoNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketActivityScheduleInfoNotify.java
index 6b32fe33b..55c4845b3 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketActivityScheduleInfoNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketActivityScheduleInfoNotify.java
@@ -1,11 +1,10 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.activity.ActivityConfigItem;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.ActivityScheduleInfoNotifyOuterClass;
-import emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass;
+import emu.grasscutter.net.packet.*;
+import emu.grasscutter.net.proto.*;
 import emu.grasscutter.utils.helpers.DateHelper;
+
 import java.util.Collection;
 
 public class PacketActivityScheduleInfoNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketActivityTakeWatcherRewardRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketActivityTakeWatcherRewardRsp.java
index a4e4c9471..ecd7a2499 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketActivityTakeWatcherRewardRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketActivityTakeWatcherRewardRsp.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.ActivityTakeWatcherRewardRspOuterClass;
 
 public class PacketActivityTakeWatcherRewardRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketActivityUpdateWatcherNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketActivityUpdateWatcherNotify.java
index 9ecafcdce..fbb842e33 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketActivityUpdateWatcherNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketActivityUpdateWatcherNotify.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.activity.PlayerActivityData;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.ActivityUpdateWatcherNotifyOuterClass;
 
 public class PacketActivityUpdateWatcherNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketAddBackupAvatarTeamRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketAddBackupAvatarTeamRsp.java
index 1327703c8..52458ca4d 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketAddBackupAvatarTeamRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketAddBackupAvatarTeamRsp.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.AddBackupAvatarTeamRspOuterClass.AddBackupAvatarTeamRsp;
 import emu.grasscutter.net.proto.RetcodeOuterClass.Retcode;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketAddNoGachaAvatarCardNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketAddNoGachaAvatarCardNotify.java
index 4140bf546..011484323 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketAddNoGachaAvatarCardNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketAddNoGachaAvatarCardNotify.java
@@ -3,8 +3,7 @@ package emu.grasscutter.server.packet.send;
 import emu.grasscutter.game.avatar.Avatar;
 import emu.grasscutter.game.inventory.GameItem;
 import emu.grasscutter.game.props.ActionReason;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.AddNoGachaAvatarCardNotifyOuterClass.AddNoGachaAvatarCardNotify;
 
 public class PacketAddNoGachaAvatarCardNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketAddQuestContentProgressRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketAddQuestContentProgressRsp.java
index e4ea5e6b8..330e93a4a 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketAddQuestContentProgressRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketAddQuestContentProgressRsp.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.AddQuestContentProgressRspOuterClass;
 
 public class PacketAddQuestContentProgressRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketAllWidgetDataNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketAllWidgetDataNotify.java
index 749b21209..38fa6f3ca 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketAllWidgetDataNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketAllWidgetDataNotify.java
@@ -1,12 +1,10 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.AllWidgetDataNotifyOuterClass.AllWidgetDataNotify;
-import emu.grasscutter.net.proto.LunchBoxDataOuterClass;
-import emu.grasscutter.net.proto.WidgetSlotDataOuterClass;
-import emu.grasscutter.net.proto.WidgetSlotTagOuterClass;
+import emu.grasscutter.net.proto.*;
+
 import java.util.List;
 
 public class PacketAllWidgetDataNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketAskAddFriendNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketAskAddFriendNotify.java
index fcb9d1ec5..07c9f5a52 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketAskAddFriendNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketAskAddFriendNotify.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.friends.Friendship;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.AskAddFriendNotifyOuterClass.AskAddFriendNotify;
 
 public class PacketAskAddFriendNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketAskAddFriendRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketAskAddFriendRsp.java
index 6d611308c..64f8daa3d 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketAskAddFriendRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketAskAddFriendRsp.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.AskAddFriendRspOuterClass.AskAddFriendRsp;
 
 public class PacketAskAddFriendRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarAddNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarAddNotify.java
index 4de173d8a..40c3f1893 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarAddNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarAddNotify.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.avatar.Avatar;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.AvatarAddNotifyOuterClass.AvatarAddNotify;
 
 public class PacketAvatarAddNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarChangeCostumeNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarChangeCostumeNotify.java
index 56678717c..f6acfea65 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarChangeCostumeNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarChangeCostumeNotify.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.entity.EntityAvatar;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.AvatarChangeCostumeNotifyOuterClass.AvatarChangeCostumeNotify;
 
 public class PacketAvatarChangeCostumeNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarChangeCostumeRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarChangeCostumeRsp.java
index 5f7cecd03..10c050306 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarChangeCostumeRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarChangeCostumeRsp.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.AvatarChangeCostumeRspOuterClass.AvatarChangeCostumeRsp;
 import emu.grasscutter.net.proto.RetcodeOuterClass;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarChangeElementTypeRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarChangeElementTypeRsp.java
index 35ab5c30a..850e7c8b6 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarChangeElementTypeRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarChangeElementTypeRsp.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.AvatarChangeElementTypeRspOuterClass.AvatarChangeElementTypeRsp;
 
 public class PacketAvatarChangeElementTypeRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarDataNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarDataNotify.java
index 94c069cb7..089ad4647 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarDataNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarDataNotify.java
@@ -2,8 +2,7 @@ package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.avatar.Avatar;
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.AvatarDataNotifyOuterClass.AvatarDataNotify;
 
 public class PacketAvatarDataNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarDelNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarDelNotify.java
index 2bb5fea76..27fbebdd6 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarDelNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarDelNotify.java
@@ -1,8 +1,8 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.AvatarDelNotifyOuterClass.AvatarDelNotify;
+
 import java.util.List;
 
 public class PacketAvatarDelNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarDieAnimationEndRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarDieAnimationEndRsp.java
index 2140f6b94..c000d252e 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarDieAnimationEndRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarDieAnimationEndRsp.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.AvatarDieAnimationEndRspOuterClass.AvatarDieAnimationEndRsp;
 
 public class PacketAvatarDieAnimationEndRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarEquipChangeNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarEquipChangeNotify.java
index 4c4cbeef0..959429248 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarEquipChangeNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarEquipChangeNotify.java
@@ -1,10 +1,8 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.avatar.Avatar;
-import emu.grasscutter.game.inventory.EquipType;
-import emu.grasscutter.game.inventory.GameItem;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.game.inventory.*;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.AvatarEquipChangeNotifyOuterClass.AvatarEquipChangeNotify;
 
 public class PacketAvatarEquipChangeNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarExpeditionAllDataRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarExpeditionAllDataRsp.java
index 452417c64..c33889328 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarExpeditionAllDataRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarExpeditionAllDataRsp.java
@@ -1,11 +1,10 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.expedition.ExpeditionInfo;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.AvatarExpeditionAllDataRspOuterClass.AvatarExpeditionAllDataRsp;
-import java.util.List;
-import java.util.Map;
+
+import java.util.*;
 import java.util.stream.Collectors;
 
 public class PacketAvatarExpeditionAllDataRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarExpeditionCallBackRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarExpeditionCallBackRsp.java
index a89595314..5b88ccb5c 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarExpeditionCallBackRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarExpeditionCallBackRsp.java
@@ -1,9 +1,9 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.expedition.ExpeditionInfo;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.AvatarExpeditionCallBackRspOuterClass.AvatarExpeditionCallBackRsp;
+
 import java.util.Map;
 
 public class PacketAvatarExpeditionCallBackRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarExpeditionDataNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarExpeditionDataNotify.java
index faefe879e..9eef5da77 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarExpeditionDataNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarExpeditionDataNotify.java
@@ -1,9 +1,9 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.expedition.ExpeditionInfo;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.AvatarExpeditionDataNotifyOuterClass.AvatarExpeditionDataNotify;
+
 import java.util.Map;
 import java.util.stream.Collectors;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarExpeditionGetRewardRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarExpeditionGetRewardRsp.java
index 9aa6b527a..5c7ee5752 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarExpeditionGetRewardRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarExpeditionGetRewardRsp.java
@@ -2,11 +2,10 @@ package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.expedition.ExpeditionInfo;
 import emu.grasscutter.game.inventory.GameItem;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.AvatarExpeditionGetRewardRspOuterClass.AvatarExpeditionGetRewardRsp;
-import java.util.Collection;
-import java.util.Map;
+
+import java.util.*;
 
 public class PacketAvatarExpeditionGetRewardRsp extends BasePacket {
     public PacketAvatarExpeditionGetRewardRsp(
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarExpeditionStartRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarExpeditionStartRsp.java
index 591ec61f6..d1a08e3e7 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarExpeditionStartRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarExpeditionStartRsp.java
@@ -1,9 +1,9 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.expedition.ExpeditionInfo;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.AvatarExpeditionStartRspOuterClass.AvatarExpeditionStartRsp;
+
 import java.util.Map;
 
 public class PacketAvatarExpeditionStartRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarFetterDataNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarFetterDataNotify.java
index a5a18ae18..0eb54795d 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarFetterDataNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarFetterDataNotify.java
@@ -2,8 +2,7 @@ package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.avatar.Avatar;
 import emu.grasscutter.game.props.FetterState;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.AvatarFetterDataNotifyOuterClass.AvatarFetterDataNotify;
 import emu.grasscutter.net.proto.AvatarFetterInfoOuterClass.AvatarFetterInfo;
 import emu.grasscutter.net.proto.FetterDataOuterClass.FetterData;
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarFetterLevelRewardRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarFetterLevelRewardRsp.java
index 221fe6696..d16cfb721 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarFetterLevelRewardRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarFetterLevelRewardRsp.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.AvatarFetterLevelRewardRspOuterClass.AvatarFetterLevelRewardRsp;
 
 public class PacketAvatarFetterLevelRewardRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarFightPropNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarFightPropNotify.java
index 2be1503f6..926981c7b 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarFightPropNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarFightPropNotify.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.avatar.Avatar;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.AvatarFightPropNotifyOuterClass.AvatarFightPropNotify;
 
 public class PacketAvatarFightPropNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarFightPropUpdateNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarFightPropUpdateNotify.java
index 5fb1f9ce9..3b2099d60 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarFightPropUpdateNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarFightPropUpdateNotify.java
@@ -2,9 +2,9 @@ package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.avatar.Avatar;
 import emu.grasscutter.game.props.FightProperty;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.AvatarFightPropUpdateNotifyOuterClass.AvatarFightPropUpdateNotify;
+
 import java.util.Map;
 
 public class PacketAvatarFightPropUpdateNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarFlycloakChangeNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarFlycloakChangeNotify.java
index f7a67df23..cdc086874 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarFlycloakChangeNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarFlycloakChangeNotify.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.avatar.Avatar;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.AvatarFlycloakChangeNotifyOuterClass.AvatarFlycloakChangeNotify;
 
 public class PacketAvatarFlycloakChangeNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarGainCostumeNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarGainCostumeNotify.java
index 3b8251542..778032901 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarGainCostumeNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarGainCostumeNotify.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.AvatarGainCostumeNotifyOuterClass.AvatarGainCostumeNotify;
 
 public class PacketAvatarGainCostumeNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarGainFlycloakNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarGainFlycloakNotify.java
index 6a819b1a8..fcbdd3a8e 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarGainFlycloakNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarGainFlycloakNotify.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.AvatarGainFlycloakNotifyOuterClass.AvatarGainFlycloakNotify;
 
 public class PacketAvatarGainFlycloakNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarLifeStateChangeNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarLifeStateChangeNotify.java
index 2e70ea94f..f753e79c4 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarLifeStateChangeNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarLifeStateChangeNotify.java
@@ -2,10 +2,8 @@ package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.avatar.Avatar;
 import emu.grasscutter.game.entity.GameEntity;
-import emu.grasscutter.game.props.FightProperty;
-import emu.grasscutter.game.props.LifeState;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.game.props.*;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.AvatarLifeStateChangeNotifyOuterClass.AvatarLifeStateChangeNotify;
 import emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarPromoteRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarPromoteRsp.java
index eb3a8a0cb..f8c7eb4dd 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarPromoteRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarPromoteRsp.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.avatar.Avatar;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.AvatarPromoteRspOuterClass.AvatarPromoteRsp;
 
 public class PacketAvatarPromoteRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarPropNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarPropNotify.java
index c60a901fe..54f37c340 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarPropNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarPropNotify.java
@@ -2,9 +2,9 @@ package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.avatar.Avatar;
 import emu.grasscutter.game.props.PlayerProperty;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.AvatarPropNotifyOuterClass.AvatarPropNotify;
+
 import java.util.Map;
 
 public class PacketAvatarPropNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarSatiationDataNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarSatiationDataNotify.java
index 1205279bb..2ed0b71d4 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarSatiationDataNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarSatiationDataNotify.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.avatar.Avatar;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.AvatarSatiationDataNotifyOuterClass.AvatarSatiationDataNotify;
 import emu.grasscutter.net.proto.AvatarSatiationDataOuterClass.AvatarSatiationData;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarSkillChangeNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarSkillChangeNotify.java
index 5101c5122..81aeffc73 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarSkillChangeNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarSkillChangeNotify.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.avatar.Avatar;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.AvatarSkillChangeNotifyOuterClass.AvatarSkillChangeNotify;
 
 public class PacketAvatarSkillChangeNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarSkillDepotChangeNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarSkillDepotChangeNotify.java
index 9e852e043..63f551f63 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarSkillDepotChangeNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarSkillDepotChangeNotify.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.avatar.Avatar;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.AvatarSkillDepotChangeNotifyOuterClass.AvatarSkillDepotChangeNotify;
 
 public class PacketAvatarSkillDepotChangeNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarSkillInfoNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarSkillInfoNotify.java
index b7237d3a0..ab74e4d79 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarSkillInfoNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarSkillInfoNotify.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.AvatarSkillInfoNotifyOuterClass.AvatarSkillInfoNotify;
 import emu.grasscutter.net.proto.AvatarSkillInfoOuterClass.AvatarSkillInfo;
 import it.unimi.dsi.fastutil.ints.Int2IntMap;
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarSkillMaxChargeCountNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarSkillMaxChargeCountNotify.java
index 9deffd878..fa2698d29 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarSkillMaxChargeCountNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarSkillMaxChargeCountNotify.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.avatar.Avatar;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.AvatarSkillMaxChargeCountNotifyOuterClass.AvatarSkillMaxChargeCountNotify;
 
 public class PacketAvatarSkillMaxChargeCountNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarSkillUpgradeRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarSkillUpgradeRsp.java
index 7683e3303..7a96246de 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarSkillUpgradeRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarSkillUpgradeRsp.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.avatar.Avatar;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.AvatarSkillUpgradeRspOuterClass.AvatarSkillUpgradeRsp;
 
 public class PacketAvatarSkillUpgradeRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarTeamAllDataNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarTeamAllDataNotify.java
index 36248b184..d0bd78531 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarTeamAllDataNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarTeamAllDataNotify.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.AvatarTeamAllDataNotifyOuterClass.AvatarTeamAllDataNotify;
 
 public class PacketAvatarTeamAllDataNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarTeamUpdateNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarTeamUpdateNotify.java
index fb5b4ca4b..e95b2028e 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarTeamUpdateNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarTeamUpdateNotify.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.AvatarTeamUpdateNotifyOuterClass.AvatarTeamUpdateNotify;
 
 public class PacketAvatarTeamUpdateNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarUnlockTalentNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarUnlockTalentNotify.java
index 34add99ff..b877fc47f 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarUnlockTalentNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarUnlockTalentNotify.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.avatar.Avatar;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.AvatarUnlockTalentNotifyOuterClass.AvatarUnlockTalentNotify;
 
 public class PacketAvatarUnlockTalentNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarUpgradeRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarUpgradeRsp.java
index c587459df..b9f95dd85 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarUpgradeRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarUpgradeRsp.java
@@ -1,9 +1,9 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.avatar.Avatar;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.AvatarUpgradeRspOuterClass.AvatarUpgradeRsp;
+
 import java.util.Map;
 
 public class PacketAvatarUpgradeRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarWearFlycloakRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarWearFlycloakRsp.java
index d98099714..0275db269 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarWearFlycloakRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarWearFlycloakRsp.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.AvatarWearFlycloakRspOuterClass.AvatarWearFlycloakRsp;
 import emu.grasscutter.net.proto.RetcodeOuterClass;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketBackMyWorldRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketBackMyWorldRsp.java
index 79be2eab3..081ee7552 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketBackMyWorldRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketBackMyWorldRsp.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.BackMyWorldRspOuterClass;
 
 public class PacketBackMyWorldRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketBattlePassAllDataNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketBattlePassAllDataNotify.java
index c83297d30..1442ae7ce 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketBattlePassAllDataNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketBattlePassAllDataNotify.java
@@ -2,8 +2,7 @@ package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.data.GameData;
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.BattlePassAllDataNotifyOuterClass.BattlePassAllDataNotify;
 
 public class PacketBattlePassAllDataNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketBattlePassCurScheduleUpdateNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketBattlePassCurScheduleUpdateNotify.java
index b701b2296..92b4d9817 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketBattlePassCurScheduleUpdateNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketBattlePassCurScheduleUpdateNotify.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.BattlePassCurScheduleUpdateNotifyOuterClass.BattlePassCurScheduleUpdateNotify;
 
 public class PacketBattlePassCurScheduleUpdateNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketBattlePassMissionUpdateNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketBattlePassMissionUpdateNotify.java
index 423ba5ee3..ac13c3eb9 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketBattlePassMissionUpdateNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketBattlePassMissionUpdateNotify.java
@@ -1,9 +1,9 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.battlepass.BattlePassMission;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.BattlePassMissionUpdateNotifyOuterClass.BattlePassMissionUpdateNotify;
+
 import java.util.Collection;
 
 public class PacketBattlePassMissionUpdateNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketBeginCameraSceneLookNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketBeginCameraSceneLookNotify.java
index fb4775ff6..44d08987a 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketBeginCameraSceneLookNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketBeginCameraSceneLookNotify.java
@@ -1,12 +1,10 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.world.Position;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import java.util.ArrayList;
-import java.util.Collection;
-import lombok.Data;
-import lombok.NoArgsConstructor;
+import emu.grasscutter.net.packet.*;
+import lombok.*;
+
+import java.util.*;
 
 public final class PacketBeginCameraSceneLookNotify extends BasePacket {
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketBlossomBriefInfoNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketBlossomBriefInfoNotify.java
index d21ad2230..7e45b705b 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketBlossomBriefInfoNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketBlossomBriefInfoNotify.java
@@ -1,9 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.BlossomBriefInfoNotifyOuterClass;
-import emu.grasscutter.net.proto.BlossomBriefInfoOuterClass;
+import emu.grasscutter.net.packet.*;
+import emu.grasscutter.net.proto.*;
 
 public class PacketBlossomBriefInfoNotify extends BasePacket {
     public PacketBlossomBriefInfoNotify(
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketBuyBattlePassLevelRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketBuyBattlePassLevelRsp.java
index 61284c2a2..e8b118488 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketBuyBattlePassLevelRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketBuyBattlePassLevelRsp.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.BuyBattlePassLevelRspOuterClass.BuyBattlePassLevelRsp;
 
 public class PacketBuyBattlePassLevelRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketBuyGoodsRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketBuyGoodsRsp.java
index 7b98c0cd6..d9fa2eded 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketBuyGoodsRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketBuyGoodsRsp.java
@@ -1,9 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.BuyGoodsRspOuterClass;
-import emu.grasscutter.net.proto.ShopGoodsOuterClass;
+import emu.grasscutter.net.packet.*;
+import emu.grasscutter.net.proto.*;
 
 public class PacketBuyGoodsRsp extends BasePacket {
     public PacketBuyGoodsRsp(int shopType, int boughtNum, ShopGoodsOuterClass.ShopGoods sg) {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketBuyResinRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketBuyResinRsp.java
index 05a56783b..8aa73678e 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketBuyResinRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketBuyResinRsp.java
@@ -2,8 +2,7 @@ package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.props.PlayerProperty;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.BuyResinRspOuterClass;
 
 public class PacketBuyResinRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketCalcWeaponUpgradeReturnItemsRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketCalcWeaponUpgradeReturnItemsRsp.java
index 75736cc88..363750f9d 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketCalcWeaponUpgradeReturnItemsRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketCalcWeaponUpgradeReturnItemsRsp.java
@@ -1,10 +1,10 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.CalcWeaponUpgradeReturnItemsRspOuterClass.CalcWeaponUpgradeReturnItemsRsp;
 import emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam;
 import emu.grasscutter.net.proto.RetcodeOuterClass;
+
 import java.util.List;
 
 public class PacketCalcWeaponUpgradeReturnItemsRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketCanUseSkillNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketCanUseSkillNotify.java
index 25678720b..7cb85f2e2 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketCanUseSkillNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketCanUseSkillNotify.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.CanUseSkillNotifyOuterClass;
 
 public class PacketCanUseSkillNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketCardProductRewardNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketCardProductRewardNotify.java
index 16420bf1a..2741c78a2 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketCardProductRewardNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketCardProductRewardNotify.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.CardProductRewardNotifyOuterClass.CardProductRewardNotify;
 
 public class PacketCardProductRewardNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketChallengeDataNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketChallengeDataNotify.java
index 7c2f81c5b..15415b5bc 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketChallengeDataNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketChallengeDataNotify.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.dungeons.challenge.WorldChallenge;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.ChallengeDataNotifyOuterClass.ChallengeDataNotify;
 
 public class PacketChallengeDataNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketChangeAvatarRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketChangeAvatarRsp.java
index b53a19048..94521ef33 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketChangeAvatarRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketChangeAvatarRsp.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.ChangeAvatarRspOuterClass.ChangeAvatarRsp;
 import emu.grasscutter.net.proto.RetcodeOuterClass;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketChangeGameTimeRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketChangeGameTimeRsp.java
index fbcee6b76..181091d49 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketChangeGameTimeRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketChangeGameTimeRsp.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.ChangeGameTimeRspOuterClass.ChangeGameTimeRsp;
 
 public class PacketChangeGameTimeRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketChangeMpTeamAvatarRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketChangeMpTeamAvatarRsp.java
index 37e05fe71..4e2b283f1 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketChangeMpTeamAvatarRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketChangeMpTeamAvatarRsp.java
@@ -1,9 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.game.player.Player;
-import emu.grasscutter.game.player.TeamInfo;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.game.player.*;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.ChangeMpTeamAvatarRspOuterClass.ChangeMpTeamAvatarRsp;
 
 public class PacketChangeMpTeamAvatarRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketChangeTeamNameRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketChangeTeamNameRsp.java
index 2accf453e..444882ede 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketChangeTeamNameRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketChangeTeamNameRsp.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.ChangeTeamNameRspOuterClass.ChangeTeamNameRsp;
 
 public class PacketChangeTeamNameRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketChapterStateNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketChapterStateNotify.java
index ba4ad9b89..7dd33e7c9 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketChapterStateNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketChapterStateNotify.java
@@ -1,9 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.ChapterStateNotifyOuterClass;
-import emu.grasscutter.net.proto.ChapterStateOuterClass;
+import emu.grasscutter.net.packet.*;
+import emu.grasscutter.net.proto.*;
 
 public class PacketChapterStateNotify extends BasePacket {
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketCheckUgcStateRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketCheckUgcStateRsp.java
index 34fa93ace..47df94523 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketCheckUgcStateRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketCheckUgcStateRsp.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.CheckUgcStateRspOuterClass.CheckUgcStateRsp;
 import emu.grasscutter.net.proto.RetcodeOuterClass;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketCheckUgcUpdateRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketCheckUgcUpdateRsp.java
index f5e1d5530..9e6eefad3 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketCheckUgcUpdateRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketCheckUgcUpdateRsp.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.CheckUgcUpdateRspOuterClass.CheckUgcUpdateRsp;
 import emu.grasscutter.net.proto.UgcTypeOuterClass.UgcType;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketChooseCurAvatarTeamRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketChooseCurAvatarTeamRsp.java
index 33ebb57d1..f5c0dd146 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketChooseCurAvatarTeamRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketChooseCurAvatarTeamRsp.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.ChooseCurAvatarTeamRspOuterClass.ChooseCurAvatarTeamRsp;
 
 public class PacketChooseCurAvatarTeamRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketClientAbilitiesInitFinishCombineNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketClientAbilitiesInitFinishCombineNotify.java
index f1c0d40ec..e0a5cacfb 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketClientAbilitiesInitFinishCombineNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketClientAbilitiesInitFinishCombineNotify.java
@@ -1,9 +1,9 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.ClientAbilitiesInitFinishCombineNotifyOuterClass.ClientAbilitiesInitFinishCombineNotify;
 import emu.grasscutter.net.proto.EntityAbilityInvokeEntryOuterClass.EntityAbilityInvokeEntry;
+
 import java.util.List;
 
 public class PacketClientAbilitiesInitFinishCombineNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketClientAbilityInitFinishNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketClientAbilityInitFinishNotify.java
index bde56d254..4d1bbc8cd 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketClientAbilityInitFinishNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketClientAbilityInitFinishNotify.java
@@ -1,9 +1,9 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry;
 import emu.grasscutter.net.proto.ClientAbilityInitFinishNotifyOuterClass.ClientAbilityInitFinishNotify;
+
 import java.util.List;
 
 public class PacketClientAbilityInitFinishNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketCloseCommonTipsNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketCloseCommonTipsNotify.java
index b30d4d3b2..e90a39541 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketCloseCommonTipsNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketCloseCommonTipsNotify.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.CloseCommonTipsNotifyOuterClass.CloseCommonTipsNotify;
 
 public class PacketCloseCommonTipsNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketCodexDataFullNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketCodexDataFullNotify.java
index 163932899..105266517 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketCodexDataFullNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketCodexDataFullNotify.java
@@ -2,10 +2,10 @@ package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.data.GameData;
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.CodexDataFullNotifyOuterClass.CodexDataFullNotify;
 import emu.grasscutter.net.proto.CodexTypeDataOuterClass.CodexTypeData;
+
 import java.util.Collections;
 
 public class PacketCodexDataFullNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketCodexDataUpdateNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketCodexDataUpdateNotify.java
index 75128f1e6..8a92d3a21 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketCodexDataUpdateNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketCodexDataUpdateNotify.java
@@ -2,8 +2,7 @@ package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.data.GameData;
 import emu.grasscutter.game.quest.GameMainQuest;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.CodexDataUpdateNotifyOuterClass.CodexDataUpdateNotify;
 
 public class PacketCodexDataUpdateNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketCombatInvocationsNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketCombatInvocationsNotify.java
index 7bd04d52b..d12698875 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketCombatInvocationsNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketCombatInvocationsNotify.java
@@ -1,9 +1,9 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.CombatInvocationsNotifyOuterClass.CombatInvocationsNotify;
 import emu.grasscutter.net.proto.CombatInvokeEntryOuterClass.CombatInvokeEntry;
+
 import java.util.List;
 
 public class PacketCombatInvocationsNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketCombineDataNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketCombineDataNotify.java
index 354d50c28..3894b8df5 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketCombineDataNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketCombineDataNotify.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.CombineDataNotifyOuterClass.CombineDataNotify;
 
 public class PacketCombineDataNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketCombineFormulaDataNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketCombineFormulaDataNotify.java
index b2c382210..971d8c6e7 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketCombineFormulaDataNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketCombineFormulaDataNotify.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.CombineFormulaDataNotifyOuterClass.CombineFormulaDataNotify;
 
 public class PacketCombineFormulaDataNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketCombineRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketCombineRsp.java
index 025b2d3a9..a3e24239b 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketCombineRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketCombineRsp.java
@@ -1,11 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.CombineReqOuterClass;
-import emu.grasscutter.net.proto.CombineRspOuterClass;
-import emu.grasscutter.net.proto.ItemParamOuterClass;
-import emu.grasscutter.net.proto.RetcodeOuterClass;
+import emu.grasscutter.net.packet.*;
+import emu.grasscutter.net.proto.*;
 
 public class PacketCombineRsp extends BasePacket {
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketCompoundDataNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketCompoundDataNotify.java
index 47f1c7093..2a96bb02e 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketCompoundDataNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketCompoundDataNotify.java
@@ -1,11 +1,10 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.CompoundDataNotifyOuterClass.CompoundDataNotify;
 import emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData;
-import java.util.List;
-import java.util.Set;
+
+import java.util.*;
 
 public class PacketCompoundDataNotify extends BasePacket {
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketCookDataNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketCookDataNotify.java
index 9d157c137..0252a6636 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketCookDataNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketCookDataNotify.java
@@ -1,9 +1,9 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.CookDataNotifyOuterClass.CookDataNotify;
 import emu.grasscutter.net.proto.CookRecipeDataOuterClass.CookRecipeData;
+
 import java.util.List;
 
 public class PacketCookDataNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketCookRecipeDataNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketCookRecipeDataNotify.java
index ea9fd99bb..e8ed8f804 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketCookRecipeDataNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketCookRecipeDataNotify.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.CookRecipeDataNotifyOuterClass.CookRecipeDataNotify;
 import emu.grasscutter.net.proto.CookRecipeDataOuterClass.CookRecipeData;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketCreateVehicleRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketCreateVehicleRsp.java
index 873e69b86..fec9b6195 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketCreateVehicleRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketCreateVehicleRsp.java
@@ -1,14 +1,13 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.game.entity.EntityVehicle;
-import emu.grasscutter.game.entity.GameEntity;
+import emu.grasscutter.game.entity.*;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.world.Position;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.CreateVehicleRspOuterClass.CreateVehicleRsp;
 import emu.grasscutter.net.proto.VehicleInteractTypeOuterClass;
 import emu.grasscutter.net.proto.VehicleMemberOuterClass.VehicleMember;
+
 import java.util.List;
 
 public class PacketCreateVehicleRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketCutsceneBeginNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketCutsceneBeginNotify.java
index fd9414ea4..6cc2504bf 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketCutsceneBeginNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketCutsceneBeginNotify.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.CutSceneBeginNotifyOuterClass.CutSceneBeginNotify;
 
 public class PacketCutsceneBeginNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketDealAddFriendRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketDealAddFriendRsp.java
index 8259e4044..a5cf79893 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketDealAddFriendRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketDealAddFriendRsp.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.DealAddFriendResultTypeOuterClass.DealAddFriendResultType;
 import emu.grasscutter.net.proto.DealAddFriendRspOuterClass.DealAddFriendRsp;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketDelBackupAvatarTeamRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketDelBackupAvatarTeamRsp.java
index cdfddfea5..40ea65409 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketDelBackupAvatarTeamRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketDelBackupAvatarTeamRsp.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.DelBackupAvatarTeamRspOuterClass.DelBackupAvatarTeamRsp;
 import emu.grasscutter.net.proto.RetcodeOuterClass.Retcode;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketDelMailRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketDelMailRsp.java
index e41ffc5ae..f17119601 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketDelMailRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketDelMailRsp.java
@@ -1,9 +1,9 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.DelMailRspOuterClass.DelMailRsp;
+
 import java.util.List;
 
 public class PacketDelMailRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketDelQuestNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketDelQuestNotify.java
index 64858822f..9d04a3bbc 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketDelQuestNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketDelQuestNotify.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.QuestDelNotifyOuterClass.QuestDelNotify;
 
 public class PacketDelQuestNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketDelTeamEntityNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketDelTeamEntityNotify.java
index b31b29a6c..6e9505362 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketDelTeamEntityNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketDelTeamEntityNotify.java
@@ -1,8 +1,8 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.DelTeamEntityNotifyOuterClass.DelTeamEntityNotify;
+
 import java.util.List;
 
 public class PacketDelTeamEntityNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketDeleteFriendNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketDeleteFriendNotify.java
index b0c64e906..b8755d962 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketDeleteFriendNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketDeleteFriendNotify.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.DeleteFriendNotifyOuterClass.DeleteFriendNotify;
 
 public class PacketDeleteFriendNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketDeleteFriendRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketDeleteFriendRsp.java
index ad98eb804..561fe2483 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketDeleteFriendRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketDeleteFriendRsp.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.DeleteFriendRspOuterClass.DeleteFriendRsp;
 
 public class PacketDeleteFriendRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketDestroyMaterialRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketDestroyMaterialRsp.java
index d4463f6dc..f8e0e72f8 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketDestroyMaterialRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketDestroyMaterialRsp.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.DestroyMaterialRspOuterClass.DestroyMaterialRsp;
 import it.unimi.dsi.fastutil.ints.Int2IntMap;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketDoGachaRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketDoGachaRsp.java
index 9697a2699..f8d95c435 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketDoGachaRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketDoGachaRsp.java
@@ -1,14 +1,13 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.data.common.ItemParamData;
-import emu.grasscutter.game.gacha.GachaBanner;
-import emu.grasscutter.game.gacha.PlayerGachaBannerInfo;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.game.gacha.*;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.DoGachaRspOuterClass.DoGachaRsp;
 import emu.grasscutter.net.proto.GachaItemOuterClass.GachaItem;
 import emu.grasscutter.net.proto.RetcodeOuterClass;
 import emu.grasscutter.net.proto.RetcodeOuterClass.Retcode;
+
 import java.util.List;
 
 public class PacketDoGachaRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketDropHintNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketDropHintNotify.java
index 6898231e0..726a7e807 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketDropHintNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketDropHintNotify.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.inventory.GameItem;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.DropHintNotifyOuterClass.DropHintNotify;
 import emu.grasscutter.net.proto.VectorOuterClass.Vector;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketDungeonChallengeBeginNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketDungeonChallengeBeginNotify.java
index d59bfb9cb..b219f0420 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketDungeonChallengeBeginNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketDungeonChallengeBeginNotify.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.dungeons.challenge.WorldChallenge;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.DungeonChallengeBeginNotifyOuterClass.DungeonChallengeBeginNotify;
 
 public class PacketDungeonChallengeBeginNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketDungeonChallengeFinishNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketDungeonChallengeFinishNotify.java
index e2bb932f9..9d621c2d3 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketDungeonChallengeFinishNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketDungeonChallengeFinishNotify.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.dungeons.challenge.WorldChallenge;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.DungeonChallengeFinishNotifyOuterClass.DungeonChallengeFinishNotify;
 
 public class PacketDungeonChallengeFinishNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketDungeonEntryInfoRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketDungeonEntryInfoRsp.java
index 57a025699..3f81797ed 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketDungeonEntryInfoRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketDungeonEntryInfoRsp.java
@@ -1,12 +1,11 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.data.common.PointData;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo;
 import emu.grasscutter.net.proto.DungeonEntryInfoRspOuterClass.DungeonEntryInfoRsp;
-import java.util.Arrays;
-import java.util.List;
+
+import java.util.*;
 
 public class PacketDungeonEntryInfoRsp extends BasePacket {
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketDungeonPlayerDieNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketDungeonPlayerDieNotify.java
index 310346784..92a17332a 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketDungeonPlayerDieNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketDungeonPlayerDieNotify.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.DungeonPlayerDieNotifyOuterClass.DungeonPlayerDieNotify;
 import emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketDungeonPlayerDieRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketDungeonPlayerDieRsp.java
index 7d3569a4c..cfe4cf88a 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketDungeonPlayerDieRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketDungeonPlayerDieRsp.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.DungeonPlayerDieRspOuterClass.DungeonPlayerDieRsp;
 import emu.grasscutter.net.proto.RetcodeOuterClass.Retcode;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketDungeonSettleNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketDungeonSettleNotify.java
index 5439c8922..d0ba37f43 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketDungeonSettleNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketDungeonSettleNotify.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.dungeons.dungeon_results.BaseDungeonResult;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 
 public class PacketDungeonSettleNotify extends BasePacket {
     public PacketDungeonSettleNotify(BaseDungeonResult result) {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketDungeonShowReminderNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketDungeonShowReminderNotify.java
index c0c612ff8..c2c237908 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketDungeonShowReminderNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketDungeonShowReminderNotify.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.DungeonShowReminderNotifyOuterClass;
 
 public class PacketDungeonShowReminderNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketDungeonSlipRevivePointActivateRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketDungeonSlipRevivePointActivateRsp.java
index de4a846d3..061b59885 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketDungeonSlipRevivePointActivateRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketDungeonSlipRevivePointActivateRsp.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.DungeonSlipRevivePointActivateRspOuterClass.DungeonSlipRevivePointActivateRsp;
 import emu.grasscutter.net.proto.RetcodeOuterClass;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketDungeonWayPointActivateRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketDungeonWayPointActivateRsp.java
index fa233efbf..9c14c321b 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketDungeonWayPointActivateRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketDungeonWayPointActivateRsp.java
@@ -1,9 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.DungeonWayPointActivateRspOuterClass;
-import emu.grasscutter.net.proto.RetcodeOuterClass;
+import emu.grasscutter.net.packet.*;
+import emu.grasscutter.net.proto.*;
 
 public class PacketDungeonWayPointActivateRsp extends BasePacket {
     public PacketDungeonWayPointActivateRsp(boolean success, int pointId) {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketDungeonWayPointNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketDungeonWayPointNotify.java
index 64e0df0ba..07d7a506c 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketDungeonWayPointNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketDungeonWayPointNotify.java
@@ -1,8 +1,8 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.DungeonWayPointNotifyOuterClass;
+
 import java.util.Set;
 
 public class PacketDungeonWayPointNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketEndCameraSceneLookNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketEndCameraSceneLookNotify.java
index b3cb73297..e749f8c87 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketEndCameraSceneLookNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketEndCameraSceneLookNotify.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.EndCameraSceneLookNotifyOuterClass.EndCameraSceneLookNotify;
 
 public class PacketEndCameraSceneLookNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketEnterSceneDoneRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketEnterSceneDoneRsp.java
index 6eb9607e5..a9dfba32c 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketEnterSceneDoneRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketEnterSceneDoneRsp.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.EnterSceneDoneRspOuterClass.EnterSceneDoneRsp;
 
 public class PacketEnterSceneDoneRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketEnterScenePeerNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketEnterScenePeerNotify.java
index e638ec448..fa9a61def 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketEnterScenePeerNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketEnterScenePeerNotify.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.EnterScenePeerNotifyOuterClass.EnterScenePeerNotify;
 
 public class PacketEnterScenePeerNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketEnterSceneReadyRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketEnterSceneReadyRsp.java
index e5bc13a04..3b7555907 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketEnterSceneReadyRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketEnterSceneReadyRsp.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.EnterSceneReadyRspOuterClass.EnterSceneReadyRsp;
 
 public class PacketEnterSceneReadyRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketEnterTrialAvatarActivityDungeonRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketEnterTrialAvatarActivityDungeonRsp.java
index da232f857..ec21808ee 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketEnterTrialAvatarActivityDungeonRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketEnterTrialAvatarActivityDungeonRsp.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.EnterTrialAvatarActivityDungeonRspOuterClass.EnterTrialAvatarActivityDungeonRsp;
 import emu.grasscutter.net.proto.RetcodeOuterClass;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketEnterWorldAreaRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketEnterWorldAreaRsp.java
index 2fe29d21d..0f3fde117 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketEnterWorldAreaRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketEnterWorldAreaRsp.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.EnterWorldAreaReqOuterClass.EnterWorldAreaReq;
 import emu.grasscutter.net.proto.EnterWorldAreaRspOuterClass.EnterWorldAreaRsp;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketEntityAiSyncNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketEntityAiSyncNotify.java
index a3f093982..936920823 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketEntityAiSyncNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketEntityAiSyncNotify.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.AiSyncInfoOuterClass.AiSyncInfo;
 import emu.grasscutter.net.proto.EntityAiSyncNotifyOuterClass.EntityAiSyncNotify;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketEntityFightPropChangeReasonNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketEntityFightPropChangeReasonNotify.java
index bbb8f255a..e73f897c0 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketEntityFightPropChangeReasonNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketEntityFightPropChangeReasonNotify.java
@@ -2,12 +2,12 @@ package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.entity.GameEntity;
 import emu.grasscutter.game.props.FightProperty;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.ChangeEnergyReasonOuterClass.ChangeEnergyReason;
 import emu.grasscutter.net.proto.ChangeHpReasonOuterClass.ChangeHpReason;
 import emu.grasscutter.net.proto.EntityFightPropChangeReasonNotifyOuterClass.EntityFightPropChangeReasonNotify;
 import emu.grasscutter.net.proto.PropChangeReasonOuterClass.PropChangeReason;
+
 import java.util.List;
 
 public class PacketEntityFightPropChangeReasonNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketEntityFightPropUpdateNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketEntityFightPropUpdateNotify.java
index 8705c6311..22c0f952a 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketEntityFightPropUpdateNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketEntityFightPropUpdateNotify.java
@@ -2,9 +2,9 @@ package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.entity.GameEntity;
 import emu.grasscutter.game.props.FightProperty;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.EntityFightPropUpdateNotifyOuterClass.EntityFightPropUpdateNotify;
+
 import java.util.Collection;
 
 public class PacketEntityFightPropUpdateNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketEvtAvatarEnterFocusNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketEvtAvatarEnterFocusNotify.java
index c348a9180..e7eae1ccb 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketEvtAvatarEnterFocusNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketEvtAvatarEnterFocusNotify.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.EvtAvatarEnterFocusNotifyOuterClass;
 
 public class PacketEvtAvatarEnterFocusNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketEvtAvatarExitFocusNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketEvtAvatarExitFocusNotify.java
index 7b63b083e..0de4cfb42 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketEvtAvatarExitFocusNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketEvtAvatarExitFocusNotify.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.EvtAvatarExitFocusNotifyOuterClass;
 
 public class PacketEvtAvatarExitFocusNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketEvtAvatarLockChairRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketEvtAvatarLockChairRsp.java
index 43050dbd5..2d32d98e1 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketEvtAvatarLockChairRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketEvtAvatarLockChairRsp.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.entity.EntityAvatar;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.EvtAvatarLockChairReqOuterClass.EvtAvatarLockChairReq;
 import emu.grasscutter.net.proto.EvtAvatarLockChairRspOuterClass.EvtAvatarLockChairRsp;
 import emu.grasscutter.net.proto.RetcodeOuterClass;
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketEvtAvatarSitDownNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketEvtAvatarSitDownNotify.java
index a0e3de447..9864c02ce 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketEvtAvatarSitDownNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketEvtAvatarSitDownNotify.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.EvtAvatarSitDownNotifyOuterClass.EvtAvatarSitDownNotify;
 
 public class PacketEvtAvatarSitDownNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketEvtAvatarStandUpNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketEvtAvatarStandUpNotify.java
index a13a626ad..0a33f74b3 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketEvtAvatarStandUpNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketEvtAvatarStandUpNotify.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.EvtAvatarStandUpNotifyOuterClass.EvtAvatarStandUpNotify;
 
 public class PacketEvtAvatarStandUpNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketEvtAvatarUpdateFocusNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketEvtAvatarUpdateFocusNotify.java
index 667ab3d39..4376f5fa5 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketEvtAvatarUpdateFocusNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketEvtAvatarUpdateFocusNotify.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.EvtAvatarUpdateFocusNotifyOuterClass;
 
 public class PacketEvtAvatarUpdateFocusNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketEvtBulletDeactiveNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketEvtBulletDeactiveNotify.java
index 3a61e108c..681e574b9 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketEvtBulletDeactiveNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketEvtBulletDeactiveNotify.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.EvtBulletDeactiveNotifyOuterClass;
 
 public class PacketEvtBulletDeactiveNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketEvtBulletHitNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketEvtBulletHitNotify.java
index e86ab6079..95833d46c 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketEvtBulletHitNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketEvtBulletHitNotify.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.EvtBulletHitNotifyOuterClass;
 
 public class PacketEvtBulletHitNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketEvtBulletMoveNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketEvtBulletMoveNotify.java
index 361d7fafe..0e4dd0933 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketEvtBulletMoveNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketEvtBulletMoveNotify.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.EvtBulletMoveNotifyOuterClass;
 
 public class PacketEvtBulletMoveNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketEvtEntityRenderersChangedNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketEvtEntityRenderersChangedNotify.java
index 246d7da96..92b56ec27 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketEvtEntityRenderersChangedNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketEvtEntityRenderersChangedNotify.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.EvtEntityRenderersChangedNotifyOuterClass;
 
 public class PacketEvtEntityRenderersChangedNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketExecuteGadgetLuaRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketExecuteGadgetLuaRsp.java
index d459356b4..a94656300 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketExecuteGadgetLuaRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketExecuteGadgetLuaRsp.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.ExecuteGadgetLuaRspOuterClass.ExecuteGadgetLuaRsp;
 
 public class PacketExecuteGadgetLuaRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketFinishedParentQuestNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketFinishedParentQuestNotify.java
index a814caf92..8e955a2c9 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketFinishedParentQuestNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketFinishedParentQuestNotify.java
@@ -3,8 +3,7 @@ package emu.grasscutter.server.packet.send;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.quest.GameMainQuest;
 import emu.grasscutter.game.quest.enums.ParentQuestState;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.FinishedParentQuestNotifyOuterClass.FinishedParentQuestNotify;
 
 public class PacketFinishedParentQuestNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketFinishedParentQuestUpdateNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketFinishedParentQuestUpdateNotify.java
index 1b65920fd..266632ab0 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketFinishedParentQuestUpdateNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketFinishedParentQuestUpdateNotify.java
@@ -1,9 +1,9 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.quest.GameMainQuest;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.FinishedParentQuestUpdateNotifyOuterClass.FinishedParentQuestUpdateNotify;
+
 import java.util.List;
 
 public class PacketFinishedParentQuestUpdateNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketForgeDataNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketForgeDataNotify.java
index f3df6e68b..266443cc0 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketForgeDataNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketForgeDataNotify.java
@@ -1,9 +1,9 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.ForgeDataNotifyOuterClass.ForgeDataNotify;
 import emu.grasscutter.net.proto.ForgeQueueDataOuterClass.ForgeQueueData;
+
 import java.util.Map;
 
 public class PacketForgeDataNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketForgeFormulaDataNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketForgeFormulaDataNotify.java
index c4f861e9c..6d8157a97 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketForgeFormulaDataNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketForgeFormulaDataNotify.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.ForgeFormulaDataNotifyOuterClass.ForgeFormulaDataNotify;
 
 public class PacketForgeFormulaDataNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketForgeGetQueueDataRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketForgeGetQueueDataRsp.java
index 50f4b94ef..9afb87b31 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketForgeGetQueueDataRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketForgeGetQueueDataRsp.java
@@ -1,10 +1,10 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.ForgeGetQueueDataRspOuterClass.ForgeGetQueueDataRsp;
 import emu.grasscutter.net.proto.ForgeQueueDataOuterClass.ForgeQueueData;
 import emu.grasscutter.net.proto.RetcodeOuterClass.Retcode;
+
 import java.util.Map;
 
 public class PacketForgeGetQueueDataRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketForgeQueueDataNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketForgeQueueDataNotify.java
index 4cd9473a8..90f28d88f 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketForgeQueueDataNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketForgeQueueDataNotify.java
@@ -1,11 +1,10 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.ForgeQueueDataNotifyOuterClass.ForgeQueueDataNotify;
 import emu.grasscutter.net.proto.ForgeQueueDataOuterClass.ForgeQueueData;
-import java.util.List;
-import java.util.Map;
+
+import java.util.*;
 
 public class PacketForgeQueueDataNotify extends BasePacket {
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketForgeQueueManipulateRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketForgeQueueManipulateRsp.java
index 297fb8b14..34877376f 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketForgeQueueManipulateRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketForgeQueueManipulateRsp.java
@@ -1,12 +1,12 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.inventory.GameItem;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.ForgeQueueManipulateRspOuterClass.ForgeQueueManipulateRsp;
 import emu.grasscutter.net.proto.ForgeQueueManipulateTypeOuterClass.ForgeQueueManipulateType;
 import emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam;
 import emu.grasscutter.net.proto.RetcodeOuterClass.Retcode;
+
 import java.util.List;
 
 public class PacketForgeQueueManipulateRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketForgeStartRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketForgeStartRsp.java
index dc2adc3a8..cee287cde 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketForgeStartRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketForgeStartRsp.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.ForgeStartRspOuterClass.ForgeStartRsp;
 import emu.grasscutter.net.proto.RetcodeOuterClass.Retcode;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketFurnitureCurModuleArrangeCountNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketFurnitureCurModuleArrangeCountNotify.java
index b3f31a55e..61a608606 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketFurnitureCurModuleArrangeCountNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketFurnitureCurModuleArrangeCountNotify.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.FurnitureCurModuleArrangeCountNotifyOuterClass;
 
 public class PacketFurnitureCurModuleArrangeCountNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketFurnitureMakeRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketFurnitureMakeRsp.java
index 7ee6964c7..9e881a12b 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketFurnitureMakeRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketFurnitureMakeRsp.java
@@ -1,11 +1,8 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.game.home.FurnitureMakeSlotItem;
-import emu.grasscutter.game.home.GameHome;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.FurnitureMakeRspOuterClass;
-import emu.grasscutter.net.proto.FurnitureMakeSlotOuterClass;
+import emu.grasscutter.game.home.*;
+import emu.grasscutter.net.packet.*;
+import emu.grasscutter.net.proto.*;
 
 public class PacketFurnitureMakeRsp extends BasePacket {
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketFurnitureMakeStartRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketFurnitureMakeStartRsp.java
index d50a67a6d..8b948c9f2 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketFurnitureMakeStartRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketFurnitureMakeStartRsp.java
@@ -1,10 +1,8 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.FurnitureMakeDataOuterClass;
-import emu.grasscutter.net.proto.FurnitureMakeSlotOuterClass;
-import emu.grasscutter.net.proto.FurnitureMakeStartRspOuterClass;
+import emu.grasscutter.net.packet.*;
+import emu.grasscutter.net.proto.*;
+
 import java.util.List;
 
 public class PacketFurnitureMakeStartRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketGachaWishRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketGachaWishRsp.java
index fac0dbbaa..c8a704937 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketGachaWishRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketGachaWishRsp.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.GachaWishRspOuterClass.GachaWishRsp;
 
 public class PacketGachaWishRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketGadgetAutoPickDropInfoNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketGadgetAutoPickDropInfoNotify.java
index 936454e27..0f7714e9d 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketGadgetAutoPickDropInfoNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketGadgetAutoPickDropInfoNotify.java
@@ -1,9 +1,9 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.inventory.GameItem;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.GadgetAutoPickDropInfoNotifyOuterClass.GadgetAutoPickDropInfoNotify;
+
 import java.util.Collection;
 
 public class PacketGadgetAutoPickDropInfoNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketGadgetInteractRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketGadgetInteractRsp.java
index e964693a8..9b8087118 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketGadgetInteractRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketGadgetInteractRsp.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.entity.EntityBaseGadget;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.GadgetInteractRspOuterClass.GadgetInteractRsp;
 import emu.grasscutter.net.proto.InterOpTypeOuterClass.InterOpType;
 import emu.grasscutter.net.proto.InteractTypeOuterClass.InteractType;
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketGadgetStateNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketGadgetStateNotify.java
index eacfb79b3..780d03429 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketGadgetStateNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketGadgetStateNotify.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.entity.EntityGadget;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.GadgetStateNotifyOuterClass.GadgetStateNotify;
 
 public class PacketGadgetStateNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketGetActivityInfoRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketGetActivityInfoRsp.java
index f23cc4a73..cf445446f 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketGetActivityInfoRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketGetActivityInfoRsp.java
@@ -1,9 +1,9 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.activity.ActivityManager;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.GetActivityInfoRspOuterClass.GetActivityInfoRsp;
+
 import java.util.Set;
 
 public class PacketGetActivityInfoRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketGetActivityShopSheetInfoRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketGetActivityShopSheetInfoRsp.java
index c8afa93b4..ca9f8f527 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketGetActivityShopSheetInfoRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketGetActivityShopSheetInfoRsp.java
@@ -1,15 +1,13 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.data.GameData;
-import emu.grasscutter.game.activity.ActivityConfigItem;
-import emu.grasscutter.game.activity.ActivityManager;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.game.activity.*;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.ActivityShopSheetInfoOuterClass.ActivityShopSheetInfo;
 import emu.grasscutter.net.proto.GetActivityShopSheetInfoRspOuterClass.GetActivityShopSheetInfoRsp;
 import emu.grasscutter.net.proto.RetcodeOuterClass;
-import java.util.ArrayList;
-import java.util.List;
+
+import java.util.*;
 
 public class PacketGetActivityShopSheetInfoRsp extends BasePacket {
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketGetAllActivatedBargainDataRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketGetAllActivatedBargainDataRsp.java
index aa11585c4..7492e5b98 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketGetAllActivatedBargainDataRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketGetAllActivatedBargainDataRsp.java
@@ -4,6 +4,7 @@ import emu.grasscutter.game.quest.BargainRecord;
 import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.GetAllActivatedBargainDataRspOuterClass.GetAllActivatedBargainDataRsp;
 import emu.grasscutter.net.proto.RetcodeOuterClass.Retcode;
+
 import java.util.Collection;
 
 public final class PacketGetAllActivatedBargainDataRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketGetAllMailResultNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketGetAllMailResultNotify.java
index 06f27089f..296d9fd41 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketGetAllMailResultNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketGetAllMailResultNotify.java
@@ -1,10 +1,10 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.GetAllMailResultNotifyOuterClass.GetAllMailResultNotify;
 import emu.grasscutter.utils.Utils;
+
 import java.time.Instant;
 import java.util.List;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketGetAllUnlockNameCardRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketGetAllUnlockNameCardRsp.java
index a4c7f709c..d9359dcd8 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketGetAllUnlockNameCardRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketGetAllUnlockNameCardRsp.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.GetAllUnlockNameCardRspOuterClass.GetAllUnlockNameCardRsp;
 
 public class PacketGetAllUnlockNameCardRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketGetAuthkeyRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketGetAuthkeyRsp.java
index e6f0c3432..0fb474f5a 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketGetAuthkeyRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketGetAuthkeyRsp.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.GetAuthkeyRspOuterClass.GetAuthkeyRsp;
 import emu.grasscutter.net.proto.RetcodeOuterClass;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketGetChatEmojiCollectionRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketGetChatEmojiCollectionRsp.java
index 70cae4e6c..aaa8848ce 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketGetChatEmojiCollectionRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketGetChatEmojiCollectionRsp.java
@@ -1,9 +1,8 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.ChatEmojiCollectionDataOuterClass;
-import emu.grasscutter.net.proto.GetChatEmojiCollectionRspOuterClass;
+import emu.grasscutter.net.packet.*;
+import emu.grasscutter.net.proto.*;
+
 import java.util.List;
 
 public class PacketGetChatEmojiCollectionRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketGetCompoundDataRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketGetCompoundDataRsp.java
index b89273432..114e12b0c 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketGetCompoundDataRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketGetCompoundDataRsp.java
@@ -1,12 +1,11 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData;
 import emu.grasscutter.net.proto.GetCompoundDataRspOuterClass.GetCompoundDataRsp;
 import emu.grasscutter.net.proto.RetcodeOuterClass.Retcode;
-import java.util.List;
-import java.util.Set;
+
+import java.util.*;
 
 public class PacketGetCompoundDataRsp extends BasePacket {
     public PacketGetCompoundDataRsp(
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketGetDailyDungeonEntryInfoRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketGetDailyDungeonEntryInfoRsp.java
index 40351e225..035406c2f 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketGetDailyDungeonEntryInfoRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketGetDailyDungeonEntryInfoRsp.java
@@ -2,11 +2,8 @@ package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.excels.dungeon.DungeonEntryData;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.DailyDungeonEntryInfoOuterClass;
-import emu.grasscutter.net.proto.DungeonEntryInfoOuterClass;
-import emu.grasscutter.net.proto.GetDailyDungeonEntryInfoRspOuterClass;
+import emu.grasscutter.net.packet.*;
+import emu.grasscutter.net.proto.*;
 
 public class PacketGetDailyDungeonEntryInfoRsp extends BasePacket {
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketGetFriendShowAvatarInfoRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketGetFriendShowAvatarInfoRsp.java
index 6f7eb62b4..cf1060975 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketGetFriendShowAvatarInfoRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketGetFriendShowAvatarInfoRsp.java
@@ -1,10 +1,9 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.GetFriendShowAvatarInfoRspOuterClass.GetFriendShowAvatarInfoRsp;
 import emu.grasscutter.net.proto.ShowAvatarInfoOuterClass.ShowAvatarInfo;
+
 import java.util.List;
 
 @Opcodes(PacketOpcodes.GetFriendShowAvatarInfoRsp)
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketGetFriendShowNameCardInfoRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketGetFriendShowNameCardInfoRsp.java
index 5c8a4bee2..84d2ff737 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketGetFriendShowNameCardInfoRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketGetFriendShowNameCardInfoRsp.java
@@ -1,8 +1,8 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.GetFriendShowNameCardInfoRspOuterClass;
+
 import java.util.List;
 
 public class PacketGetFriendShowNameCardInfoRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketGetGachaInfoRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketGetGachaInfoRsp.java
index 2e7addb00..b8423471a 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketGetGachaInfoRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketGetGachaInfoRsp.java
@@ -2,8 +2,7 @@ package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.gacha.GachaSystem;
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 
 public class PacketGetGachaInfoRsp extends BasePacket {
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketGetHomeLevelUpRewardRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketGetHomeLevelUpRewardRsp.java
index 12964f603..36dd1c931 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketGetHomeLevelUpRewardRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketGetHomeLevelUpRewardRsp.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.GetHomeLevelUpRewardRspOuterClass.GetHomeLevelUpRewardRsp;
 
 public class PacketGetHomeLevelUpRewardRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketGetInvestigationMonsterRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketGetInvestigationMonsterRsp.java
index 81ac3da57..124c9b4c2 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketGetInvestigationMonsterRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketGetInvestigationMonsterRsp.java
@@ -2,9 +2,9 @@ package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.world.WorldDataSystem;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.GetInvestigationMonsterRspOuterClass;
+
 import java.util.List;
 
 public class PacketGetInvestigationMonsterRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketGetMailItemRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketGetMailItemRsp.java
index 63a365c57..3ec476219 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketGetMailItemRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketGetMailItemRsp.java
@@ -5,12 +5,11 @@ import emu.grasscutter.game.inventory.GameItem;
 import emu.grasscutter.game.mail.Mail;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.props.ActionReason;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.EquipParamOuterClass;
 import emu.grasscutter.net.proto.GetMailItemRspOuterClass.GetMailItemRsp;
-import java.util.ArrayList;
-import java.util.List;
+
+import java.util.*;
 import java.util.stream.Collectors;
 
 public class PacketGetMailItemRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketGetOnlinePlayerListRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketGetOnlinePlayerListRsp.java
index a81a632cc..c706ce49e 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketGetOnlinePlayerListRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketGetOnlinePlayerListRsp.java
@@ -2,9 +2,9 @@ package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.GetOnlinePlayerListRspOuterClass.GetOnlinePlayerListRsp;
+
 import java.util.List;
 
 public class PacketGetOnlinePlayerListRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketGetPlayerAskFriendListRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketGetPlayerAskFriendListRsp.java
index 9f8573008..1186b8e0a 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketGetPlayerAskFriendListRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketGetPlayerAskFriendListRsp.java
@@ -2,8 +2,7 @@ package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.friends.Friendship;
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.GetPlayerAskFriendListRspOuterClass.GetPlayerAskFriendListRsp;
 
 public class PacketGetPlayerAskFriendListRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketGetPlayerFriendListRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketGetPlayerFriendListRsp.java
index 86e60e0d0..04b39136c 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketGetPlayerFriendListRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketGetPlayerFriendListRsp.java
@@ -3,13 +3,11 @@ package emu.grasscutter.server.packet.send;
 import emu.grasscutter.GameConstants;
 import emu.grasscutter.game.friends.Friendship;
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief;
-import emu.grasscutter.net.proto.FriendEnterHomeOptionOuterClass;
+import emu.grasscutter.net.proto.*;
 import emu.grasscutter.net.proto.FriendOnlineStateOuterClass.FriendOnlineState;
 import emu.grasscutter.net.proto.GetPlayerFriendListRspOuterClass.GetPlayerFriendListRsp;
-import emu.grasscutter.net.proto.PlatformTypeOuterClass;
 import emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture;
 
 import static emu.grasscutter.config.Configuration.GAME_INFO;
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketGetPlayerSocialDetailRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketGetPlayerSocialDetailRsp.java
index d5b80045b..2862927dd 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketGetPlayerSocialDetailRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketGetPlayerSocialDetailRsp.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.GetPlayerSocialDetailRspOuterClass.GetPlayerSocialDetailRsp;
 import emu.grasscutter.net.proto.RetcodeOuterClass;
 import emu.grasscutter.net.proto.SocialDetailOuterClass.SocialDetail;
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketGetPlayerTokenRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketGetPlayerTokenRsp.java
index 2f681d75c..29d855651 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketGetPlayerTokenRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketGetPlayerTokenRsp.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
 import com.google.protobuf.ByteString;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.GetPlayerTokenRspOuterClass.GetPlayerTokenRsp;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.utils.Crypto;
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketGetSceneAreaRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketGetSceneAreaRsp.java
index 1c1b6673c..2e9a99577 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketGetSceneAreaRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketGetSceneAreaRsp.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.GetSceneAreaRspOuterClass.GetSceneAreaRsp;
 
 public class PacketGetSceneAreaRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketGetScenePointRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketGetScenePointRsp.java
index b5fa53903..609376fb1 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketGetScenePointRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketGetScenePointRsp.java
@@ -2,8 +2,7 @@ package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.data.GameData;
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.GetScenePointRspOuterClass.GetScenePointRsp;
 
 public class PacketGetScenePointRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketGetShopRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketGetShopRsp.java
index 4b090033d..149f6f2ef 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketGetShopRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketGetShopRsp.java
@@ -2,18 +2,14 @@ package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.game.shop.ShopInfo;
-import emu.grasscutter.game.shop.ShopLimit;
-import emu.grasscutter.game.shop.ShopSystem;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.GetShopRspOuterClass;
-import emu.grasscutter.net.proto.ItemParamOuterClass;
+import emu.grasscutter.game.shop.*;
+import emu.grasscutter.net.packet.*;
+import emu.grasscutter.net.proto.*;
 import emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods;
 import emu.grasscutter.net.proto.ShopOuterClass.Shop;
 import emu.grasscutter.utils.Utils;
-import java.util.ArrayList;
-import java.util.List;
+
+import java.util.*;
 import java.util.stream.Collectors;
 
 public class PacketGetShopRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketGetShopmallDataRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketGetShopmallDataRsp.java
index 437cb0b5c..5fbe06605 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketGetShopmallDataRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketGetShopmallDataRsp.java
@@ -1,8 +1,8 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.GetShopmallDataRspOuterClass.GetShopmallDataRsp;
+
 import java.util.List;
 
 public class PacketGetShopmallDataRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketGetUgcBriefInfoRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketGetUgcBriefInfoRsp.java
index c9b30251c..f5fc30d4a 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketGetUgcBriefInfoRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketGetUgcBriefInfoRsp.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.GetUgcBriefInfoRspOuterClass.GetUgcBriefInfoRsp;
 import emu.grasscutter.net.proto.RetcodeOuterClass;
 import emu.grasscutter.net.proto.UgcMusicBriefInfoOuterClass.UgcMusicBriefInfo;
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketGetUgcRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketGetUgcRsp.java
index d4ef18d17..891f6b6f0 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketGetUgcRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketGetUgcRsp.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.GetUgcReqOuterClass.GetUgcReq;
 import emu.grasscutter.net.proto.GetUgcRspOuterClass.GetUgcRsp;
 import emu.grasscutter.net.proto.RetcodeOuterClass.Retcode;
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketGetWidgetSlotRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketGetWidgetSlotRsp.java
index 1d20c1b09..1b56dbf89 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketGetWidgetSlotRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketGetWidgetSlotRsp.java
@@ -1,11 +1,9 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.GetWidgetSlotRspOuterClass;
-import emu.grasscutter.net.proto.WidgetSlotDataOuterClass;
-import emu.grasscutter.net.proto.WidgetSlotTagOuterClass;
+import emu.grasscutter.net.packet.*;
+import emu.grasscutter.net.proto.*;
+
 import java.util.List;
 
 public class PacketGetWidgetSlotRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketGetWorldMpInfoRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketGetWorldMpInfoRsp.java
index 0306f6c91..e49a67b8e 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketGetWorldMpInfoRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketGetWorldMpInfoRsp.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.world.World;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.GetWorldMpInfoRspOuterClass.GetWorldMpInfoRsp;
 
 public class PacketGetWorldMpInfoRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketGivingRecordNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketGivingRecordNotify.java
index 2e1a4bf09..9898ec605 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketGivingRecordNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketGivingRecordNotify.java
@@ -3,6 +3,7 @@ package emu.grasscutter.server.packet.send;
 import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.GivingRecordNotifyOuterClass.GivingRecordNotify;
 import emu.grasscutter.net.proto.GivingRecordOuterClass.GivingRecord;
+
 import java.util.Collection;
 
 public final class PacketGivingRecordNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketGroupSuiteNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketGroupSuiteNotify.java
index 0afd78e2e..db88af153 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketGroupSuiteNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketGroupSuiteNotify.java
@@ -2,11 +2,10 @@ package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.data.binout.SceneNpcBornEntry;
 import emu.grasscutter.game.quest.QuestGroupSuite;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.GroupSuiteNotifyOuterClass;
-import java.util.Collection;
-import java.util.List;
+
+import java.util.*;
 
 public class PacketGroupSuiteNotify extends BasePacket {
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketGroupUnloadNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketGroupUnloadNotify.java
index 928e4dbb0..f0ce0885c 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketGroupUnloadNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketGroupUnloadNotify.java
@@ -1,8 +1,8 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.GroupUnloadNotifyOuterClass;
+
 import java.util.List;
 
 public class PacketGroupUnloadNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketH5ActivityIdsNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketH5ActivityIdsNotify.java
index 4fc6968ec..cc547aea6 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketH5ActivityIdsNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketH5ActivityIdsNotify.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.H5ActivityIdsNotifyOuterClass.H5ActivityIdsNotify;
 
 public class PacketH5ActivityIdsNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketHomeAllUnlockedBgmIdListNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketHomeAllUnlockedBgmIdListNotify.java
index b5a77aad0..e4ee7bfc5 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketHomeAllUnlockedBgmIdListNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketHomeAllUnlockedBgmIdListNotify.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.HomeAllUnlockedBgmIdListNotifyOuterClass;
 
 public class PacketHomeAllUnlockedBgmIdListNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketHomeBasicInfoNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketHomeBasicInfoNotify.java
index d12c6b1f7..61ca9effe 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketHomeBasicInfoNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketHomeBasicInfoNotify.java
@@ -1,10 +1,8 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.HomeBasicInfoNotifyOuterClass;
-import emu.grasscutter.net.proto.HomeBasicInfoOuterClass;
+import emu.grasscutter.net.packet.*;
+import emu.grasscutter.net.proto.*;
 
 public class PacketHomeBasicInfoNotify extends BasePacket {
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketHomeChangeBgmNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketHomeChangeBgmNotify.java
index d1d52fbcd..cdc117f86 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketHomeChangeBgmNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketHomeChangeBgmNotify.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.HomeChangeBgmNotifyOuterClass;
 
 public class PacketHomeChangeBgmNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketHomeChangeBgmRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketHomeChangeBgmRsp.java
index 7d66e8c4c..a290abf77 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketHomeChangeBgmRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketHomeChangeBgmRsp.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.HomeChangeBgmRspOuterClass;
 
 public class PacketHomeChangeBgmRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketHomeChangeEditModeRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketHomeChangeEditModeRsp.java
index cd63b730f..c23e91492 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketHomeChangeEditModeRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketHomeChangeEditModeRsp.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.HomeChangeEditModeRspOuterClass;
 
 public class PacketHomeChangeEditModeRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketHomeChangeModuleRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketHomeChangeModuleRsp.java
index 4cb00b9ed..de279cf3d 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketHomeChangeModuleRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketHomeChangeModuleRsp.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.HomeChangeModuleRspOuterClass;
 
 public class PacketHomeChangeModuleRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketHomeChooseModuleRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketHomeChooseModuleRsp.java
index 3890f79bb..9d2cec56d 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketHomeChooseModuleRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketHomeChooseModuleRsp.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.HomeChooseModuleRspOuterClass;
 
 public class PacketHomeChooseModuleRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketHomeComfortInfoNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketHomeComfortInfoNotify.java
index d3a3371fe..236af820b 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketHomeComfortInfoNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketHomeComfortInfoNotify.java
@@ -2,12 +2,10 @@ package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.home.HomeBlockItem;
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.HomeComfortInfoNotifyOuterClass;
-import emu.grasscutter.net.proto.HomeModuleComfortInfoOuterClass;
-import java.util.ArrayList;
-import java.util.List;
+import emu.grasscutter.net.packet.*;
+import emu.grasscutter.net.proto.*;
+
+import java.util.*;
 
 public class PacketHomeComfortInfoNotify extends BasePacket {
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketHomeEnterEditModeFinishRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketHomeEnterEditModeFinishRsp.java
index 903a08481..958080924 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketHomeEnterEditModeFinishRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketHomeEnterEditModeFinishRsp.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 
 public class PacketHomeEnterEditModeFinishRsp extends BasePacket {
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketHomeGetArrangementInfoRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketHomeGetArrangementInfoRsp.java
index 54488c939..09e01975b 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketHomeGetArrangementInfoRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketHomeGetArrangementInfoRsp.java
@@ -2,8 +2,7 @@ package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.home.HomeSceneItem;
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.HomeGetArrangementInfoRspOuterClass;
 
 import java.util.List;
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketHomeGetOnlineStatusRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketHomeGetOnlineStatusRsp.java
index d9c18a0e3..888495304 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketHomeGetOnlineStatusRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketHomeGetOnlineStatusRsp.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.HomeGetOnlineStatusRspOuterClass;
 
 import java.util.List;
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketHomeKickPlayerRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketHomeKickPlayerRsp.java
index 694094ed2..d9dc68254 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketHomeKickPlayerRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketHomeKickPlayerRsp.java
@@ -1,9 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.HomeKickPlayerReqOuterClass;
-import emu.grasscutter.net.proto.HomeKickPlayerRspOuterClass;
+import emu.grasscutter.net.packet.*;
+import emu.grasscutter.net.proto.*;
 
 public class PacketHomeKickPlayerRsp extends BasePacket {
     public PacketHomeKickPlayerRsp(int retcode, HomeKickPlayerReqOuterClass.HomeKickPlayerReq req) {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketHomeMarkPointNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketHomeMarkPointNotify.java
index 908dabd1b..c9b6fa987 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketHomeMarkPointNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketHomeMarkPointNotify.java
@@ -1,13 +1,9 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.game.home.HomeBlockItem;
-import emu.grasscutter.game.home.HomeMarkPointProtoFactory;
+import emu.grasscutter.game.home.*;
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.HomeMarkPointNotifyOuterClass;
-import emu.grasscutter.net.proto.HomeMarkPointSceneDataOuterClass;
-import emu.grasscutter.net.proto.VectorOuterClass;
+import emu.grasscutter.net.packet.*;
+import emu.grasscutter.net.proto.*;
 
 import java.util.Collection;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketHomeModuleSeenRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketHomeModuleSeenRsp.java
index 51a590818..823f58609 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketHomeModuleSeenRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketHomeModuleSeenRsp.java
@@ -1,8 +1,8 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.HomeModuleSeenRspOuterClass.HomeModuleSeenRsp;
+
 import java.util.List;
 
 public class PacketHomeModuleSeenRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketHomeModuleUnlockNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketHomeModuleUnlockNotify.java
index a2bdec141..a7c5b69f7 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketHomeModuleUnlockNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketHomeModuleUnlockNotify.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.HomeModuleUnlockNotifyOuterClass.HomeModuleUnlockNotify;
 
 public class PacketHomeModuleUnlockNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketHomeNewUnlockedBgmIdListNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketHomeNewUnlockedBgmIdListNotify.java
index e7402ce84..8ca714742 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketHomeNewUnlockedBgmIdListNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketHomeNewUnlockedBgmIdListNotify.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.HomeNewUnlockedBgmIdListNotifyOuterClass;
 
 public class PacketHomeNewUnlockedBgmIdListNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketHomePreChangeEditModeNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketHomePreChangeEditModeNotify.java
index cfb17ae6c..58a3e1102 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketHomePreChangeEditModeNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketHomePreChangeEditModeNotify.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.HomePreChangeEditModeNotifyOuterClass;
 
 public class PacketHomePreChangeEditModeNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketHomeResourceNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketHomeResourceNotify.java
index 2b6928fbf..b5c32c93e 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketHomeResourceNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketHomeResourceNotify.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.HomeResourceNotifyOuterClass;
 import emu.grasscutter.net.proto.HomeResourceOuterClass.HomeResource;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketHomeResourceTakeFetterExpRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketHomeResourceTakeFetterExpRsp.java
index 55ae5a0f9..0b4f35d6d 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketHomeResourceTakeFetterExpRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketHomeResourceTakeFetterExpRsp.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.HomeResourceOuterClass.HomeResource;
 import emu.grasscutter.net.proto.HomeResourceTakeFetterExpRspOuterClass;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketHomeResourceTakeHomeCoinRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketHomeResourceTakeHomeCoinRsp.java
index b5283ed4b..2722ca66a 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketHomeResourceTakeHomeCoinRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketHomeResourceTakeHomeCoinRsp.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.HomeResourceOuterClass.HomeResource;
 import emu.grasscutter.net.proto.HomeResourceTakeHomeCoinRspOuterClass;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketHomeSaveArrangementNoChangeRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketHomeSaveArrangementNoChangeRsp.java
index 11008d864..45708f177 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketHomeSaveArrangementNoChangeRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketHomeSaveArrangementNoChangeRsp.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.HomeSaveArrangementNoChangeRspOuterClass;
 
 public class PacketHomeSaveArrangementNoChangeRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketHomeSceneInitFinishRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketHomeSceneInitFinishRsp.java
index 2595cc40e..8d1d9e27a 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketHomeSceneInitFinishRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketHomeSceneInitFinishRsp.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.HomeSceneInitFinishReqOuterClass;
 
 public class PacketHomeSceneInitFinishRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketHomeSceneJumpRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketHomeSceneJumpRsp.java
index 0da6158d6..6cbbfa34f 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketHomeSceneJumpRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketHomeSceneJumpRsp.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.HomeSceneJumpRspOuterClass;
 
 public class PacketHomeSceneJumpRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketHomeUpdateArrangementInfoRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketHomeUpdateArrangementInfoRsp.java
index 10dbd65e4..b580127f5 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketHomeUpdateArrangementInfoRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketHomeUpdateArrangementInfoRsp.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 
 public class PacketHomeUpdateArrangementInfoRsp extends BasePacket {
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketHostPlayerNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketHostPlayerNotify.java
index eadc0f274..d31e8e0c5 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketHostPlayerNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketHostPlayerNotify.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.world.World;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.HostPlayerNotifyOuterClass.HostPlayerNotify;
 
 public class PacketHostPlayerNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketItemAddHintNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketItemAddHintNotify.java
index 60bb94080..49628f7b9 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketItemAddHintNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketItemAddHintNotify.java
@@ -2,9 +2,9 @@ package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.inventory.GameItem;
 import emu.grasscutter.game.props.ActionReason;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.ItemAddHintNotifyOuterClass.ItemAddHintNotify;
+
 import java.util.Collection;
 
 public class PacketItemAddHintNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketLaunchFireworksRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketLaunchFireworksRsp.java
index 35e9375de..e2f8da0ee 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketLaunchFireworksRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketLaunchFireworksRsp.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 
 public class PacketLaunchFireworksRsp extends BasePacket {
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketLevelupCityRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketLevelupCityRsp.java
index 74cb7a988..75bda4f5a 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketLevelupCityRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketLevelupCityRsp.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo;
 import emu.grasscutter.net.proto.LevelupCityRspOuterClass.LevelupCityRsp;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketLifeStateChangeNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketLifeStateChangeNotify.java
index 2aed8e7cf..5214730c1 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketLifeStateChangeNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketLifeStateChangeNotify.java
@@ -2,8 +2,7 @@ package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.entity.GameEntity;
 import emu.grasscutter.game.props.LifeState;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.LifeStateChangeNotifyOuterClass.LifeStateChangeNotify;
 import emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketMailChangeNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketMailChangeNotify.java
index a6d337e8a..28e0e173b 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketMailChangeNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketMailChangeNotify.java
@@ -2,15 +2,14 @@ package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.mail.Mail;
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.EquipParamOuterClass.EquipParam;
 import emu.grasscutter.net.proto.MailChangeNotifyOuterClass.MailChangeNotify;
 import emu.grasscutter.net.proto.MailDataOuterClass.MailData;
 import emu.grasscutter.net.proto.MailItemOuterClass.MailItem;
 import emu.grasscutter.net.proto.MailTextContentOuterClass.MailTextContent;
-import java.util.ArrayList;
-import java.util.List;
+
+import java.util.*;
 
 public class PacketMailChangeNotify extends BasePacket {
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketMarkMapRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketMarkMapRsp.java
index 94ed1c902..21340735e 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketMarkMapRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketMarkMapRsp.java
@@ -1,10 +1,10 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.managers.mapmark.MapMark;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint;
 import emu.grasscutter.net.proto.MarkMapRspOuterClass.MarkMapRsp;
+
 import java.util.Map;
 
 public class PacketMarkMapRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketMarkNewNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketMarkNewNotify.java
index e6f8daa85..5ec76bb2e 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketMarkNewNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketMarkNewNotify.java
@@ -1,9 +1,9 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.MarkNewNotifyOuterClass.MarkNewNotify;
+
 import java.util.ArrayList;
 
 public class PacketMarkNewNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketMassiveEntityElementOpBatchNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketMassiveEntityElementOpBatchNotify.java
index 1e3c670a8..09575be40 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketMassiveEntityElementOpBatchNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketMassiveEntityElementOpBatchNotify.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.MassiveEntityElementOpBatchNotifyOuterClass;
 
 public class PacketMassiveEntityElementOpBatchNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketMcoinExchangeHcoinRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketMcoinExchangeHcoinRsp.java
index eac0c8948..5bcf5a9d1 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketMcoinExchangeHcoinRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketMcoinExchangeHcoinRsp.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.McoinExchangeHcoinRspOuterClass;
 
 public class PacketMcoinExchangeHcoinRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketMonsterForceAlertNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketMonsterForceAlertNotify.java
index 6a8b8dc93..e99d69491 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketMonsterForceAlertNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketMonsterForceAlertNotify.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.MonsterForceAlertNotifyOuterClass.MonsterForceAlertNotify;
 
 // Sets openState to value
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketMusicGameSettleRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketMusicGameSettleRsp.java
index 89b16880d..b769fe500 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketMusicGameSettleRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketMusicGameSettleRsp.java
@@ -1,10 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.MusicGameSettleReqOuterClass;
-import emu.grasscutter.net.proto.MusicGameSettleRspOuterClass;
-import emu.grasscutter.net.proto.RetcodeOuterClass;
+import emu.grasscutter.net.packet.*;
+import emu.grasscutter.net.proto.*;
 
 public class PacketMusicGameSettleRsp extends BasePacket {
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketMusicGameStartRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketMusicGameStartRsp.java
index 137cfdb22..31f465dca 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketMusicGameStartRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketMusicGameStartRsp.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.MusicGameStartRspOuterClass;
 
 public class PacketMusicGameStartRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketNpcTalkRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketNpcTalkRsp.java
index 6c707f998..24c34c267 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketNpcTalkRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketNpcTalkRsp.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.NpcTalkRspOuterClass.NpcTalkRsp;
 
 public class PacketNpcTalkRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketOpenStateChangeNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketOpenStateChangeNotify.java
index 1751b2c78..b7d64592e 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketOpenStateChangeNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketOpenStateChangeNotify.java
@@ -1,8 +1,8 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.OpenStateChangeNotifyOuterClass.OpenStateChangeNotify;
+
 import java.util.Map;
 
 // Sets openState to value
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketOpenStateUpdateNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketOpenStateUpdateNotify.java
index a5b7858cc..6fbc5d3c8 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketOpenStateUpdateNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketOpenStateUpdateNotify.java
@@ -2,10 +2,8 @@ package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.excels.OpenStateData;
-import emu.grasscutter.game.player.Player;
-import emu.grasscutter.game.player.PlayerProgressManager;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.game.player.*;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.OpenStateUpdateNotifyOuterClass.OpenStateUpdateNotify;
 
 import static emu.grasscutter.config.Configuration.GAME_OPTIONS;
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketOtherPlayerEnterOrLeaveHomeNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketOtherPlayerEnterOrLeaveHomeNotify.java
index ec2417102..53c9ede74 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketOtherPlayerEnterOrLeaveHomeNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketOtherPlayerEnterOrLeaveHomeNotify.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.OtherPlayerEnterHomeNotifyOuterClass;
 
 public class PacketOtherPlayerEnterOrLeaveHomeNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketPathfindingEnterSceneRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketPathfindingEnterSceneRsp.java
index eb9458f21..389937142 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketPathfindingEnterSceneRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketPathfindingEnterSceneRsp.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 
 public class PacketPathfindingEnterSceneRsp extends BasePacket {
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketPersonalLineAllDataRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketPersonalLineAllDataRsp.java
index 20f1e09e4..3d1ae30ec 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketPersonalLineAllDataRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketPersonalLineAllDataRsp.java
@@ -1,13 +1,11 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.data.GameData;
-import emu.grasscutter.game.quest.GameMainQuest;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.game.quest.*;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.PersonalLineAllDataRspOuterClass;
-import java.util.Collection;
-import java.util.Map;
+
+import java.util.*;
 import java.util.stream.Collectors;
 
 public class PacketPersonalLineAllDataRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketPersonalSceneJumpRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketPersonalSceneJumpRsp.java
index 9a4e96c99..a64d5908b 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketPersonalSceneJumpRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketPersonalSceneJumpRsp.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.world.Position;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.PersonalSceneJumpRspOuterClass.PersonalSceneJumpRsp;
 
 public class PacketPersonalSceneJumpRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketPingRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketPingRsp.java
index 8fb1744ea..d57a2368f 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketPingRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketPingRsp.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.PingRspOuterClass.PingRsp;
 
 public class PacketPingRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketPlatformChangeRouteNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketPlatformChangeRouteNotify.java
index 0bfb28171..79fc87474 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketPlatformChangeRouteNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketPlatformChangeRouteNotify.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.entity.EntityGadget;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.PlatformChangeRouteNotifyOuterClass.PlatformChangeRouteNotify;
 import lombok.val;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketPlatformStartRouteNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketPlatformStartRouteNotify.java
index 12e7c25c3..055191d93 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketPlatformStartRouteNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketPlatformStartRouteNotify.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.entity.EntityGadget;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.PlatformStartRouteNotifyOuterClass.PlatformStartRouteNotify;
 import lombok.val;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketPlatformStopRouteNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketPlatformStopRouteNotify.java
index cfe871888..bcb99ed64 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketPlatformStopRouteNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketPlatformStopRouteNotify.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.entity.EntityGadget;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.PlatformStopRouteNotifyOuterClass;
 
 public class PacketPlatformStopRouteNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerApplyEnterHomeNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerApplyEnterHomeNotify.java
index 834c57d34..f1eec7178 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerApplyEnterHomeNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerApplyEnterHomeNotify.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.PlayerApplyEnterHomeNotifyOuterClass;
 
 public class PacketPlayerApplyEnterHomeNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerApplyEnterHomeResultNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerApplyEnterHomeResultNotify.java
index b2b5df58b..705d44a36 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerApplyEnterHomeResultNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerApplyEnterHomeResultNotify.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.PlayerApplyEnterHomeResultNotifyOuterClass;
 
 public class PacketPlayerApplyEnterHomeResultNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerApplyEnterHomeResultRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerApplyEnterHomeResultRsp.java
index 63194ae8b..e092338ee 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerApplyEnterHomeResultRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerApplyEnterHomeResultRsp.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.PlayerApplyEnterHomeResultRspOuterClass;
 
 public class PacketPlayerApplyEnterHomeResultRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerApplyEnterMpNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerApplyEnterMpNotify.java
index 8b76f1796..2bda6b10c 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerApplyEnterMpNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerApplyEnterMpNotify.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.PlayerApplyEnterMpNotifyOuterClass.PlayerApplyEnterMpNotify;
 
 public class PacketPlayerApplyEnterMpNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerApplyEnterMpResultNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerApplyEnterMpResultNotify.java
index 871ed0d80..0725b8d1b 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerApplyEnterMpResultNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerApplyEnterMpResultNotify.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.PlayerApplyEnterMpResultNotifyOuterClass;
 import emu.grasscutter.net.proto.PlayerApplyEnterMpResultNotifyOuterClass.PlayerApplyEnterMpResultNotify;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerApplyEnterMpResultRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerApplyEnterMpResultRsp.java
index 20b05c53e..9af83e9e4 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerApplyEnterMpResultRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerApplyEnterMpResultRsp.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.PlayerApplyEnterMpResultRspOuterClass.PlayerApplyEnterMpResultRsp;
 
 public class PacketPlayerApplyEnterMpResultRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerApplyEnterMpRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerApplyEnterMpRsp.java
index f7f687c0f..a3d347946 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerApplyEnterMpRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerApplyEnterMpRsp.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.PlayerApplyEnterMpRspOuterClass.PlayerApplyEnterMpRsp;
 
 public class PacketPlayerApplyEnterMpRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerChatNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerChatNotify.java
index f54138e7c..e2f9b3094 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerChatNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerChatNotify.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo;
 import emu.grasscutter.net.proto.PlayerChatNotifyOuterClass.PlayerChatNotify;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerChatRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerChatRsp.java
index abf86cac0..277c85a79 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerChatRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerChatRsp.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.PlayerChatRspOuterClass.PlayerChatRsp;
 
 public class PacketPlayerChatRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerCompoundMaterialRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerCompoundMaterialRsp.java
index e42efb565..f24ca0a45 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerCompoundMaterialRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerCompoundMaterialRsp.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData;
 import emu.grasscutter.net.proto.PlayerCompoundMaterialRspOuterClass.PlayerCompoundMaterialRsp;
 import emu.grasscutter.net.proto.RetcodeOuterClass.Retcode;
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerCookArgsRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerCookArgsRsp.java
index 8b9c1c84b..e5f52d766 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerCookArgsRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerCookArgsRsp.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.PlayerCookArgsRspOuterClass.PlayerCookArgsRsp;
 
 public class PacketPlayerCookArgsRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerCookRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerCookRsp.java
index b27b25fa2..8578e7275 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerCookRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerCookRsp.java
@@ -1,12 +1,12 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.inventory.GameItem;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.CookRecipeDataOuterClass.CookRecipeData;
 import emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam;
 import emu.grasscutter.net.proto.PlayerCookRspOuterClass.PlayerCookRsp;
 import emu.grasscutter.net.proto.RetcodeOuterClass.Retcode;
+
 import java.util.List;
 
 public class PacketPlayerCookRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerDataNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerDataNotify.java
index f2cb61cbb..dca56bf9b 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerDataNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerDataNotify.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.PlayerDataNotifyOuterClass.PlayerDataNotify;
 import emu.grasscutter.net.proto.PropValueOuterClass.PropValue;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerEnterDungeonRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerEnterDungeonRsp.java
index b779854f9..56b1171ef 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerEnterDungeonRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerEnterDungeonRsp.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.PlayerEnterDungeonRspOuterClass.PlayerEnterDungeonRsp;
 import emu.grasscutter.net.proto.RetcodeOuterClass.Retcode;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerEnterSceneNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerEnterSceneNotify.java
index 4b78d81f1..45ed81560 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerEnterSceneNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerEnterSceneNotify.java
@@ -5,8 +5,7 @@ import emu.grasscutter.game.player.Player.SceneLoadState;
 import emu.grasscutter.game.props.EnterReason;
 import emu.grasscutter.game.world.Position;
 import emu.grasscutter.game.world.data.TeleportProperties;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.EnterTypeOuterClass.EnterType;
 import emu.grasscutter.net.proto.PlayerEnterSceneNotifyOuterClass.PlayerEnterSceneNotify;
 import emu.grasscutter.utils.Utils;
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerGameTimeNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerGameTimeNotify.java
index 2c1cd1c47..fadf9ab45 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerGameTimeNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerGameTimeNotify.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.PlayerGameTimeNotifyOuterClass.PlayerGameTimeNotify;
 
 public class PacketPlayerGameTimeNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerGetForceQuitBanInfoRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerGetForceQuitBanInfoRsp.java
index 8f66c5479..9ba7a8df4 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerGetForceQuitBanInfoRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerGetForceQuitBanInfoRsp.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.PlayerGetForceQuitBanInfoRspOuterClass.PlayerGetForceQuitBanInfoRsp;
 
 public class PacketPlayerGetForceQuitBanInfoRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerHomeCompInfoNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerHomeCompInfoNotify.java
index 8e0024e78..8fd1f1e6e 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerHomeCompInfoNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerHomeCompInfoNotify.java
@@ -1,10 +1,8 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.PlayerHomeCompInfoNotifyOuterClass;
-import emu.grasscutter.net.proto.PlayerHomeCompInfoOuterClass;
+import emu.grasscutter.net.packet.*;
+import emu.grasscutter.net.proto.*;
 
 public class PacketPlayerHomeCompInfoNotify extends BasePacket {
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerLevelRewardUpdateNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerLevelRewardUpdateNotify.java
index 3ba251101..9f1baccfd 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerLevelRewardUpdateNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerLevelRewardUpdateNotify.java
@@ -1,8 +1,8 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.PlayerLevelRewardUpdateNotifyOuterClass.PlayerLevelRewardUpdateNotify;
+
 import java.util.Set;
 
 public class PacketPlayerLevelRewardUpdateNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerLoginRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerLoginRsp.java
index 8505a4da5..1213b9efd 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerLoginRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerLoginRsp.java
@@ -1,7 +1,5 @@
 package emu.grasscutter.server.packet.send;
 
-import static emu.grasscutter.config.Configuration.*;
-
 import com.google.protobuf.ByteString;
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.Grasscutter.ServerRunMode;
@@ -12,8 +10,11 @@ import emu.grasscutter.net.proto.RegionInfoOuterClass.RegionInfo;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.http.dispatch.RegionHandler;
 import emu.grasscutter.utils.Crypto;
+
 import java.util.Objects;
 
+import static emu.grasscutter.config.Configuration.*;
+
 public class PacketPlayerLoginRsp extends BasePacket {
 
     private static QueryCurrRegionHttpRspOuterClass.QueryCurrRegionHttpRsp regionCache;
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerPreEnterMpNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerPreEnterMpNotify.java
index e4213e43d..1dda55e77 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerPreEnterMpNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerPreEnterMpNotify.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.PlayerPreEnterMpNotifyOuterClass;
 
 public class PacketPlayerPreEnterMpNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerPropChangeNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerPropChangeNotify.java
index 64e43a728..c90f945cb 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerPropChangeNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerPropChangeNotify.java
@@ -2,8 +2,7 @@ package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.props.PlayerProperty;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.PlayerPropChangeNotifyOuterClass.PlayerPropChangeNotify;
 
 public class PacketPlayerPropChangeNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerPropChangeReasonNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerPropChangeReasonNotify.java
index bbc03b907..c4ef253d1 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerPropChangeReasonNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerPropChangeReasonNotify.java
@@ -2,8 +2,7 @@ package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.props.PlayerProperty;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.PlayerPropChangeReasonNotifyOuterClass.PlayerPropChangeReasonNotify;
 import emu.grasscutter.net.proto.PropChangeReasonOuterClass.PropChangeReason;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerPropNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerPropNotify.java
index 133d0f93e..d31542265 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerPropNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerPropNotify.java
@@ -2,8 +2,7 @@ package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.props.PlayerProperty;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.PlayerPropNotifyOuterClass.PlayerPropNotify;
 import emu.grasscutter.utils.helpers.ProtoHelper;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerSetPauseRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerSetPauseRsp.java
index 902fd18e7..ece61f9bd 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerSetPauseRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerSetPauseRsp.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.PlayerSetPauseRspOuterClass.PlayerSetPauseRsp;
 import emu.grasscutter.net.proto.RetcodeOuterClass.Retcode;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerStoreNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerStoreNotify.java
index 7cf87ef19..d2f4afbfd 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerStoreNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerStoreNotify.java
@@ -1,15 +1,14 @@
 package emu.grasscutter.server.packet.send;
 
-import static emu.grasscutter.config.Configuration.GAME_OPTIONS;
-
 import emu.grasscutter.game.inventory.GameItem;
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.ItemOuterClass.Item;
 import emu.grasscutter.net.proto.PlayerStoreNotifyOuterClass.PlayerStoreNotify;
 import emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType;
 
+import static emu.grasscutter.config.Configuration.GAME_OPTIONS;
+
 public class PacketPlayerStoreNotify extends BasePacket {
 
     public PacketPlayerStoreNotify(Player player) {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerTimeNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerTimeNotify.java
index d13ee68aa..f8f190abb 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerTimeNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerTimeNotify.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.PlayerTimeNotifyOuterClass.PlayerTimeNotify;
 
 public class PacketPlayerTimeNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerWorldSceneInfoListNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerWorldSceneInfoListNotify.java
index 32d638f9c..b3347ba50 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerWorldSceneInfoListNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerWorldSceneInfoListNotify.java
@@ -2,11 +2,11 @@ package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.excels.scene.SceneTagData;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.MapLayerInfoOuterClass;
 import emu.grasscutter.net.proto.PlayerWorldSceneInfoListNotifyOuterClass.PlayerWorldSceneInfoListNotify;
 import emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfo;
+
 import java.util.stream.IntStream;
 
 public class PacketPlayerWorldSceneInfoListNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketPostEnterSceneRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketPostEnterSceneRsp.java
index 234d7e89e..67a94d4ba 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketPostEnterSceneRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketPostEnterSceneRsp.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.PostEnterSceneRspOuterClass.PostEnterSceneRsp;
 
 public class PacketPostEnterSceneRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketPrivateChatNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketPrivateChatNotify.java
index 97a2e9bef..4d66f2e05 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketPrivateChatNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketPrivateChatNotify.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo;
 import emu.grasscutter.net.proto.PrivateChatNotifyOuterClass.PrivateChatNotify;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketProudSkillChangeNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketProudSkillChangeNotify.java
index 709da44f9..a30fd0899 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketProudSkillChangeNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketProudSkillChangeNotify.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.avatar.Avatar;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.ProudSkillChangeNotifyOuterClass.ProudSkillChangeNotify;
 
 public class PacketProudSkillChangeNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketProudSkillExtraLevelNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketProudSkillExtraLevelNotify.java
index 713a70055..7b456b4f7 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketProudSkillExtraLevelNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketProudSkillExtraLevelNotify.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.avatar.Avatar;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.ProudSkillExtraLevelNotifyOuterClass.ProudSkillExtraLevelNotify;
 
 public class PacketProudSkillExtraLevelNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketPullPrivateChatRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketPullPrivateChatRsp.java
index 326c3b291..a25c4eb49 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketPullPrivateChatRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketPullPrivateChatRsp.java
@@ -1,10 +1,10 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo;
 import emu.grasscutter.net.proto.PullPrivateChatRspOuterClass.PullPrivateChatRsp;
 import emu.grasscutter.net.proto.RetcodeOuterClass.Retcode;
+
 import java.util.List;
 
 public class PacketPullPrivateChatRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketPullRecentChatRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketPullRecentChatRsp.java
index cc46c1e32..86826898a 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketPullRecentChatRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketPullRecentChatRsp.java
@@ -1,9 +1,9 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo;
 import emu.grasscutter.net.proto.PullRecentChatRspOuterClass.PullRecentChatRsp;
+
 import java.util.List;
 
 public class PacketPullRecentChatRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketQueryCodexMonsterBeKilledNumRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketQueryCodexMonsterBeKilledNumRsp.java
index 92d481aba..452f271fd 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketQueryCodexMonsterBeKilledNumRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketQueryCodexMonsterBeKilledNumRsp.java
@@ -1,9 +1,9 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.QueryCodexMonsterBeKilledNumRspOuterClass.QueryCodexMonsterBeKilledNumRsp;
+
 import java.util.List;
 
 public class PacketQueryCodexMonsterBeKilledNumRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketQueryPathRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketQueryPathRsp.java
index 52cb5838c..03f5b18ab 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketQueryPathRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketQueryPathRsp.java
@@ -1,10 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.PathStatusTypeOuterClass;
-import emu.grasscutter.net.proto.QueryPathReqOuterClass;
-import emu.grasscutter.net.proto.QueryPathRspOuterClass;
+import emu.grasscutter.net.packet.*;
+import emu.grasscutter.net.proto.*;
 
 public class PacketQueryPathRsp extends BasePacket {
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketQuestCreateEntityRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketQuestCreateEntityRsp.java
index 47e61d013..42edabd78 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketQuestCreateEntityRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketQuestCreateEntityRsp.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.QuestCreateEntityReqOuterClass.QuestCreateEntityReq;
 import emu.grasscutter.net.proto.QuestCreateEntityRspOuterClass.QuestCreateEntityRsp;
 import emu.grasscutter.net.proto.RetcodeOuterClass.Retcode;
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketQuestDestroyEntityRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketQuestDestroyEntityRsp.java
index b43e58da6..9ffb21e1c 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketQuestDestroyEntityRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketQuestDestroyEntityRsp.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.QuestDestroyEntityReqOuterClass.QuestDestroyEntityReq;
 import emu.grasscutter.net.proto.QuestDestroyEntityRspOuterClass.QuestDestroyEntityRsp;
 import emu.grasscutter.net.proto.RetcodeOuterClass.Retcode;
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketQuestDestroyNpcRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketQuestDestroyNpcRsp.java
index fa560acda..5ef634d24 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketQuestDestroyNpcRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketQuestDestroyNpcRsp.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.QuestDestroyNpcRspOuterClass.QuestDestroyNpcRsp;
 
 public class PacketQuestDestroyNpcRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketQuestGlobalVarNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketQuestGlobalVarNotify.java
index 7bab2f27d..28d6cf418 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketQuestGlobalVarNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketQuestGlobalVarNotify.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.QuestGlobalVarNotifyOuterClass.QuestGlobalVarNotify;
 import emu.grasscutter.net.proto.QuestGlobalVarOuterClass.QuestGlobalVar;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketQuestListNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketQuestListNotify.java
index fb68b11f9..a335d73db 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketQuestListNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketQuestListNotify.java
@@ -2,8 +2,7 @@ package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.quest.enums.QuestState;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.QuestListNotifyOuterClass.QuestListNotify;
 
 public class PacketQuestListNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketQuestListUpdateNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketQuestListUpdateNotify.java
index 95d94fc36..497769e8a 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketQuestListUpdateNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketQuestListUpdateNotify.java
@@ -1,9 +1,9 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.QuestListUpdateNotifyOuterClass.QuestListUpdateNotify;
+
 import java.util.List;
 
 public class PacketQuestListUpdateNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketQuestProgressUpdateNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketQuestProgressUpdateNotify.java
index d71039e85..f84841a6d 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketQuestProgressUpdateNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketQuestProgressUpdateNotify.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.QuestProgressUpdateNotifyOuterClass.QuestProgressUpdateNotify;
 
 public class PacketQuestProgressUpdateNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketQuestTransmitRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketQuestTransmitRsp.java
index 143817c37..33ef078fc 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketQuestTransmitRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketQuestTransmitRsp.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.QuestTransmitReqOuterClass.QuestTransmitReq;
 import emu.grasscutter.net.proto.QuestTransmitRspOuterClass.QuestTransmitRsp;
 import emu.grasscutter.net.proto.RetcodeOuterClass.Retcode;
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketQuestUpdateQuestVarNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketQuestUpdateQuestVarNotify.java
index 4dfd2e2d6..174c8fe81 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketQuestUpdateQuestVarNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketQuestUpdateQuestVarNotify.java
@@ -1,8 +1,8 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.QuestUpdateQuestVarNotifyOuterClass.QuestUpdateQuestVarNotify;
+
 import java.util.stream.IntStream;
 
 public class PacketQuestUpdateQuestVarNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketQuestUpdateQuestVarRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketQuestUpdateQuestVarRsp.java
index e077351ee..2b35314bf 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketQuestUpdateQuestVarRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketQuestUpdateQuestVarRsp.java
@@ -1,8 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.QuestUpdateQuestVarReqOuterClass.QuestUpdateQuestVarReq;
 import emu.grasscutter.net.proto.QuestUpdateQuestVarRspOuterClass;
 import emu.grasscutter.net.proto.RetcodeOuterClass.Retcode;
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketReceivedTrialAvatarActivityRewardRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketReceivedTrialAvatarActivityRewardRsp.java
index 683801dd5..ef2332cba 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketReceivedTrialAvatarActivityRewardRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketReceivedTrialAvatarActivityRewardRsp.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.ReceivedTrialAvatarActivityRewardRspOuterClass.ReceivedTrialAvatarActivityRewardRsp;
 import emu.grasscutter.net.proto.RetcodeOuterClass.Retcode;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketReliquaryDecomposeRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketReliquaryDecomposeRsp.java
index 2989b4f7f..15ed7fe0a 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketReliquaryDecomposeRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketReliquaryDecomposeRsp.java
@@ -1,9 +1,9 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.ReliquaryDecomposeRspOuterClass.ReliquaryDecomposeRsp;
 import emu.grasscutter.net.proto.RetcodeOuterClass.Retcode;
+
 import java.util.List;
 
 public class PacketReliquaryDecomposeRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketReliquaryUpgradeRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketReliquaryUpgradeRsp.java
index dd2978e24..4fc775cbf 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketReliquaryUpgradeRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketReliquaryUpgradeRsp.java
@@ -1,9 +1,9 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.inventory.GameItem;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.ReliquaryUpgradeRspOuterClass.ReliquaryUpgradeRsp;
+
 import java.util.List;
 
 public class PacketReliquaryUpgradeRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketResinChangeNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketResinChangeNotify.java
index 7d6cb967e..f5aa5ba2e 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketResinChangeNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketResinChangeNotify.java
@@ -2,8 +2,7 @@ package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.props.PlayerProperty;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.ResinChangeNotifyOuterClass.ResinChangeNotify;
 
 public class PacketResinChangeNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketSceneAreaUnlockNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketSceneAreaUnlockNotify.java
index b57543b5f..d07f1df05 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketSceneAreaUnlockNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketSceneAreaUnlockNotify.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.SceneAreaUnlockNotifyOuterClass.SceneAreaUnlockNotify;
 
 public class PacketSceneAreaUnlockNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketSceneAreaWeatherNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketSceneAreaWeatherNotify.java
index 78b04426c..e87cb3a5e 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketSceneAreaWeatherNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketSceneAreaWeatherNotify.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.SceneAreaWeatherNotifyOuterClass.SceneAreaWeatherNotify;
 
 public class PacketSceneAreaWeatherNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketSceneAudioNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketSceneAudioNotify.java
index 8a21848e0..70c5d1c48 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketSceneAudioNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketSceneAudioNotify.java
@@ -1,8 +1,8 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.SceneAudioNotifyOuterClass;
+
 import java.util.List;
 
 public class PacketSceneAudioNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketSceneEntityAppearNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketSceneEntityAppearNotify.java
index d1d6ca8f6..5f4ccc25f 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketSceneEntityAppearNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketSceneEntityAppearNotify.java
@@ -2,10 +2,10 @@ package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.entity.GameEntity;
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.SceneEntityAppearNotifyOuterClass.SceneEntityAppearNotify;
 import emu.grasscutter.net.proto.VisionTypeOuterClass.VisionType;
+
 import java.util.Collection;
 
 public class PacketSceneEntityAppearNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketSceneEntityDisappearNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketSceneEntityDisappearNotify.java
index e0e2a48c0..73f59c91a 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketSceneEntityDisappearNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketSceneEntityDisappearNotify.java
@@ -1,10 +1,10 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.entity.GameEntity;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.SceneEntityDisappearNotifyOuterClass.SceneEntityDisappearNotify;
 import emu.grasscutter.net.proto.VisionTypeOuterClass.VisionType;
+
 import java.util.Collection;
 
 public class PacketSceneEntityDisappearNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketSceneEntityDrownRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketSceneEntityDrownRsp.java
index 30610d37b..e8af537d8 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketSceneEntityDrownRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketSceneEntityDrownRsp.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.SceneEntityDrownRspOuterClass.SceneEntityDrownRsp;
 
 public class PacketSceneEntityDrownRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketSceneEntityMoveNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketSceneEntityMoveNotify.java
index 7f681e054..e09466901 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketSceneEntityMoveNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketSceneEntityMoveNotify.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.EntityMoveInfoOuterClass.EntityMoveInfo;
 import emu.grasscutter.net.proto.SceneEntityMoveNotifyOuterClass.SceneEntityMoveNotify;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketSceneEntityUpdateNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketSceneEntityUpdateNotify.java
index 096dbc677..100bac49f 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketSceneEntityUpdateNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketSceneEntityUpdateNotify.java
@@ -2,10 +2,10 @@ package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.entity.GameEntity;
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.SceneEntityUpdateNotifyOuterClass.SceneEntityUpdateNotify;
 import emu.grasscutter.net.proto.VisionTypeOuterClass.VisionType;
+
 import java.util.Collection;
 
 public class PacketSceneEntityUpdateNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketSceneForceLockNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketSceneForceLockNotify.java
index 25d39bccf..60f119829 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketSceneForceLockNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketSceneForceLockNotify.java
@@ -1,11 +1,11 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.SceneForceLockNotifyOuterClass.SceneForceLockNotify;
-import java.util.Collection;
 import lombok.val;
 
+import java.util.Collection;
+
 public class PacketSceneForceLockNotify extends BasePacket {
     public PacketSceneForceLockNotify(Collection locked) {
         super(PacketOpcodes.SceneForceLockNotify);
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketSceneForceUnlockNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketSceneForceUnlockNotify.java
index 50190533d..28b301fdc 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketSceneForceUnlockNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketSceneForceUnlockNotify.java
@@ -1,11 +1,11 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.SceneForceUnlockNotifyOuterClass.SceneForceUnlockNotify;
-import java.util.Collection;
 import lombok.val;
 
+import java.util.Collection;
+
 public class PacketSceneForceUnlockNotify extends BasePacket {
     public PacketSceneForceUnlockNotify(Collection unlocked, boolean isAdd) {
         super(PacketOpcodes.SceneForceUnlockNotify);
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketSceneInitFinishRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketSceneInitFinishRsp.java
index 6f53067fe..b175da523 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketSceneInitFinishRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketSceneInitFinishRsp.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.SceneInitFinishRspOuterClass.SceneInitFinishRsp;
 
 public class PacketSceneInitFinishRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketSceneKickPlayerRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketSceneKickPlayerRsp.java
index e03e834b9..13e6e39ab 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketSceneKickPlayerRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketSceneKickPlayerRsp.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.RetcodeOuterClass;
 import emu.grasscutter.net.proto.SceneKickPlayerRspOuterClass.SceneKickPlayerRsp;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketScenePlayerInfoNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketScenePlayerInfoNotify.java
index 7dcdb377a..beceb5810 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketScenePlayerInfoNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketScenePlayerInfoNotify.java
@@ -2,8 +2,7 @@ package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.world.World;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.ScenePlayerInfoNotifyOuterClass.ScenePlayerInfoNotify;
 import emu.grasscutter.net.proto.ScenePlayerInfoOuterClass.ScenePlayerInfo;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketScenePlayerLocationNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketScenePlayerLocationNotify.java
index c1aafbf98..15d64ce9d 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketScenePlayerLocationNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketScenePlayerLocationNotify.java
@@ -2,8 +2,7 @@ package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.world.Scene;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.ScenePlayerLocationNotifyOuterClass.ScenePlayerLocationNotify;
 
 public class PacketScenePlayerLocationNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketScenePlayerSoundNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketScenePlayerSoundNotify.java
index f5ca35580..316fdb796 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketScenePlayerSoundNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketScenePlayerSoundNotify.java
@@ -1,11 +1,11 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.world.Position;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.ScenePlayerSoundNotifyOuterClass.ScenePlayerSoundNotify;
 import emu.grasscutter.net.proto.ScenePlayerSoundNotifyOuterClass.ScenePlayerSoundNotify.PlaySoundType;
 import emu.grasscutter.net.proto.VectorOuterClass.Vector;
+
 import java.util.Objects;
 
 public class PacketScenePlayerSoundNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketScenePointUnlockNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketScenePointUnlockNotify.java
index bc3818293..c6d8d63dc 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketScenePointUnlockNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketScenePointUnlockNotify.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.ScenePointUnlockNotifyOuterClass.ScenePointUnlockNotify;
 
 public class PacketScenePointUnlockNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketSceneTeamUpdateNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketSceneTeamUpdateNotify.java
index 644534531..d904e5aa1 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketSceneTeamUpdateNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketSceneTeamUpdateNotify.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo;
 import emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar;
 import emu.grasscutter.net.proto.SceneTeamUpdateNotifyOuterClass.SceneTeamUpdateNotify;
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketSceneTimeNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketSceneTimeNotify.java
index d018e6fca..f92a5e63d 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketSceneTimeNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketSceneTimeNotify.java
@@ -2,8 +2,7 @@ package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.world.Scene;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.SceneTimeNotifyOuterClass.SceneTimeNotify;
 
 public class PacketSceneTimeNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketSceneTransToPointRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketSceneTransToPointRsp.java
index 88726d44d..f73e8d74d 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketSceneTransToPointRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketSceneTransToPointRsp.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.RetcodeOuterClass;
 import emu.grasscutter.net.proto.SceneTransToPointRspOuterClass.SceneTransToPointRsp;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketSelectWorktopOptionRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketSelectWorktopOptionRsp.java
index f4b19d297..8a0e92d72 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketSelectWorktopOptionRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketSelectWorktopOptionRsp.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.SelectWorktopOptionRspOuterClass.SelectWorktopOptionRsp;
 
 public class PacketSelectWorktopOptionRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketServerAnnounceNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketServerAnnounceNotify.java
index 61962bbf6..84b0d9527 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketServerAnnounceNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketServerAnnounceNotify.java
@@ -1,10 +1,9 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.AnnounceDataOuterClass;
-import emu.grasscutter.net.proto.ServerAnnounceNotifyOuterClass;
+import emu.grasscutter.net.packet.*;
+import emu.grasscutter.net.proto.*;
 import emu.grasscutter.utils.Utils;
+
 import java.util.List;
 
 public class PacketServerAnnounceNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketServerAnnounceRevokeNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketServerAnnounceRevokeNotify.java
index 70eb64c32..a9ee5762a 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketServerAnnounceRevokeNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketServerAnnounceRevokeNotify.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.ServerAnnounceRevokeNotifyOuterClass;
 
 public class PacketServerAnnounceRevokeNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketServerBuffChangeNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketServerBuffChangeNotify.java
index 87aea963c..53058b115 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketServerBuffChangeNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketServerBuffChangeNotify.java
@@ -2,10 +2,10 @@ package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.player.PlayerBuffManager.PlayerBuff;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.ServerBuffChangeNotifyOuterClass.ServerBuffChangeNotify;
 import emu.grasscutter.net.proto.ServerBuffChangeNotifyOuterClass.ServerBuffChangeNotify.ServerBuffChangeType;
+
 import java.util.Collection;
 import java.util.stream.Stream;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketServerCondMeetQuestListUpdateNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketServerCondMeetQuestListUpdateNotify.java
index 87b36abe0..d51a4730b 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketServerCondMeetQuestListUpdateNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketServerCondMeetQuestListUpdateNotify.java
@@ -2,8 +2,7 @@ package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.ServerCondMeetQuestListUpdateNotifyOuterClass.ServerCondMeetQuestListUpdateNotify;
 
 import java.util.List;
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketServerGlobalValueChangeNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketServerGlobalValueChangeNotify.java
index 5ad32969c..5c2c63697 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketServerGlobalValueChangeNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketServerGlobalValueChangeNotify.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.entity.GameEntity;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.ServerGlobalValueChangeNotifyOuterClass.ServerGlobalValueChangeNotify;
 import emu.grasscutter.utils.Utils;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketServerTimeNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketServerTimeNotify.java
index fdfcc4a38..5027adb2d 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketServerTimeNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketServerTimeNotify.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.ServerTimeNotifyOuterClass.ServerTimeNotify;
 
 public class PacketServerTimeNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketSetBattlePassViewedRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketSetBattlePassViewedRsp.java
index 059828d32..ee2e379fc 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketSetBattlePassViewedRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketSetBattlePassViewedRsp.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.SetBattlePassViewedRspOuterClass.SetBattlePassViewedRsp;
 
 public class PacketSetBattlePassViewedRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketSetChatEmojiCollectionRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketSetChatEmojiCollectionRsp.java
index ed312da85..e60d14af3 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketSetChatEmojiCollectionRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketSetChatEmojiCollectionRsp.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 
 public class PacketSetChatEmojiCollectionRsp extends BasePacket {
     public PacketSetChatEmojiCollectionRsp() {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketSetEquipLockStateRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketSetEquipLockStateRsp.java
index beb76d86e..756c40d34 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketSetEquipLockStateRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketSetEquipLockStateRsp.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.inventory.GameItem;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.SetEquipLockStateRspOuterClass.SetEquipLockStateRsp;
 
 public class PacketSetEquipLockStateRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketSetFriendEnterHomeOptionRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketSetFriendEnterHomeOptionRsp.java
index 240c49179..9839973c2 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketSetFriendEnterHomeOptionRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketSetFriendEnterHomeOptionRsp.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 
 public class PacketSetFriendEnterHomeOptionRsp extends BasePacket {
     public PacketSetFriendEnterHomeOptionRsp() {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketSetNameCardRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketSetNameCardRsp.java
index 49dcc1f4d..36d68688a 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketSetNameCardRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketSetNameCardRsp.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.SetNameCardRspOuterClass.SetNameCardRsp;
 
 public class PacketSetNameCardRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketSetOpenStateRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketSetOpenStateRsp.java
index 8328f325f..db6869daa 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketSetOpenStateRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketSetOpenStateRsp.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.RetcodeOuterClass.Retcode;
 import emu.grasscutter.net.proto.SetOpenStateRspOuterClass.SetOpenStateRsp;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketSetPlayerBirthdayRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketSetPlayerBirthdayRsp.java
index 3f4941a14..2851b1461 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketSetPlayerBirthdayRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketSetPlayerBirthdayRsp.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.SetPlayerBirthdayRspOuterClass.SetPlayerBirthdayRsp;
 
 public class PacketSetPlayerBirthdayRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketSetPlayerHeadImageRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketSetPlayerHeadImageRsp.java
index 713e5af73..418ea80c8 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketSetPlayerHeadImageRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketSetPlayerHeadImageRsp.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture;
 import emu.grasscutter.net.proto.SetPlayerHeadImageRspOuterClass.SetPlayerHeadImageRsp;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketSetPlayerNameRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketSetPlayerNameRsp.java
index 52a7e4414..6bfc40424 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketSetPlayerNameRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketSetPlayerNameRsp.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.SetPlayerNameRspOuterClass.SetPlayerNameRsp;
 
 public class PacketSetPlayerNameRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketSetPlayerPropRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketSetPlayerPropRsp.java
index 050d7d470..77cd709df 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketSetPlayerPropRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketSetPlayerPropRsp.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.SetPlayerPropRspOuterClass.SetPlayerPropRsp;
 
 public class PacketSetPlayerPropRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketSetPlayerSignatureRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketSetPlayerSignatureRsp.java
index 878a2ca29..6fe3afd82 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketSetPlayerSignatureRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketSetPlayerSignatureRsp.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.SetPlayerSignatureRspOuterClass.SetPlayerSignatureRsp;
 
 public class PacketSetPlayerSignatureRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketSetUpAvatarTeamRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketSetUpAvatarTeamRsp.java
index fe796ad9e..998e3692b 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketSetUpAvatarTeamRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketSetUpAvatarTeamRsp.java
@@ -1,9 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.game.player.Player;
-import emu.grasscutter.game.player.TeamInfo;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.game.player.*;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.SetUpAvatarTeamRspOuterClass.SetUpAvatarTeamRsp;
 
 public class PacketSetUpAvatarTeamRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketSetUpLunchBoxWidgetRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketSetUpLunchBoxWidgetRsp.java
index 51396a46d..47fef3686 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketSetUpLunchBoxWidgetRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketSetUpLunchBoxWidgetRsp.java
@@ -1,9 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.LunchBoxDataOuterClass;
-import emu.grasscutter.net.proto.SetUpLunchBoxWidgetRspOuterClass;
+import emu.grasscutter.net.packet.*;
+import emu.grasscutter.net.proto.*;
 
 public class PacketSetUpLunchBoxWidgetRsp extends BasePacket {
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketSetWidgetSlotRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketSetWidgetSlotRsp.java
index f8262865c..79722390d 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketSetWidgetSlotRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketSetWidgetSlotRsp.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.SetWidgetSlotRspOuterClass;
 
 public class PacketSetWidgetSlotRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketShowClientGuideNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketShowClientGuideNotify.java
index 76a2a4739..f7e850e69 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketShowClientGuideNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketShowClientGuideNotify.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.ShowClientGuideNotifyOuterClass.ShowClientGuideNotify;
 
 public class PacketShowClientGuideNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketShowCommonTipsNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketShowCommonTipsNotify.java
index b2b2638cd..dfa6c963a 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketShowCommonTipsNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketShowCommonTipsNotify.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.ShowCommonTipsNotifyOuterClass.ShowCommonTipsNotify;
 
 public class PacketShowCommonTipsNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketSkipPlayerGameTimeRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketSkipPlayerGameTimeRsp.java
index d301b0c24..c22f82cb2 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketSkipPlayerGameTimeRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketSkipPlayerGameTimeRsp.java
@@ -1,9 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.SkipPlayerGameTimeReqOuterClass;
-import emu.grasscutter.net.proto.SkipPlayerGameTimeRspOuterClass;
+import emu.grasscutter.net.packet.*;
+import emu.grasscutter.net.proto.*;
 
 public class PacketSkipPlayerGameTimeRsp extends BasePacket {
     public PacketSkipPlayerGameTimeRsp(SkipPlayerGameTimeReqOuterClass.SkipPlayerGameTimeReq req) {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketStoreItemChangeNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketStoreItemChangeNotify.java
index 5130c78a9..45c0ce1cb 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketStoreItemChangeNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketStoreItemChangeNotify.java
@@ -1,10 +1,10 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.inventory.GameItem;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.StoreItemChangeNotifyOuterClass.StoreItemChangeNotify;
 import emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType;
+
 import java.util.Collection;
 
 public class PacketStoreItemChangeNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketStoreItemDelNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketStoreItemDelNotify.java
index c61e9e704..047cfe670 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketStoreItemDelNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketStoreItemDelNotify.java
@@ -1,10 +1,10 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.inventory.GameItem;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.StoreItemDelNotifyOuterClass.StoreItemDelNotify;
 import emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType;
+
 import java.util.Collection;
 
 public class PacketStoreItemDelNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketStoreWeightLimitNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketStoreWeightLimitNotify.java
index 3d95a1e03..33b8989ff 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketStoreWeightLimitNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketStoreWeightLimitNotify.java
@@ -1,12 +1,11 @@
 package emu.grasscutter.server.packet.send;
 
-import static emu.grasscutter.config.Configuration.INVENTORY_LIMITS;
-
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType;
 import emu.grasscutter.net.proto.StoreWeightLimitNotifyOuterClass.StoreWeightLimitNotify;
 
+import static emu.grasscutter.config.Configuration.INVENTORY_LIMITS;
+
 public class PacketStoreWeightLimitNotify extends BasePacket {
 
     public PacketStoreWeightLimitNotify() {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketSyncScenePlayTeamEntityNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketSyncScenePlayTeamEntityNotify.java
index d39df9254..3ad975088 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketSyncScenePlayTeamEntityNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketSyncScenePlayTeamEntityNotify.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.SyncScenePlayTeamEntityNotifyOuterClass.SyncScenePlayTeamEntityNotify;
 
 public class PacketSyncScenePlayTeamEntityNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketSyncTeamEntityNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketSyncTeamEntityNotify.java
index 55bbec61a..6d36f24a8 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketSyncTeamEntityNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketSyncTeamEntityNotify.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo;
 import emu.grasscutter.net.proto.SyncTeamEntityNotifyOuterClass.SyncTeamEntityNotify;
 import emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo;
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketTakeAchievementGoalRewardRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketTakeAchievementGoalRewardRsp.java
index e6ec4f841..1d231a39d 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketTakeAchievementGoalRewardRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketTakeAchievementGoalRewardRsp.java
@@ -1,10 +1,8 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.ItemParamOuterClass;
-import emu.grasscutter.net.proto.RetcodeOuterClass;
-import emu.grasscutter.net.proto.TakeAchievementGoalRewardRspOuterClass;
+import emu.grasscutter.net.packet.*;
+import emu.grasscutter.net.proto.*;
+
 import java.util.List;
 
 public class PacketTakeAchievementGoalRewardRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketTakeAchievementRewardReq.java b/src/main/java/emu/grasscutter/server/packet/send/PacketTakeAchievementRewardReq.java
index 16f42f376..9dd58ddae 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketTakeAchievementRewardReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketTakeAchievementRewardReq.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.TakeAchievementRewardReqOuterClass.TakeAchievementRewardReq;
 import emu.grasscutter.server.game.GameSession;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketTakeAchievementRewardRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketTakeAchievementRewardRsp.java
index df0f02c42..0c0246c62 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketTakeAchievementRewardRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketTakeAchievementRewardRsp.java
@@ -1,10 +1,8 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.ItemParamOuterClass;
-import emu.grasscutter.net.proto.RetcodeOuterClass;
-import emu.grasscutter.net.proto.TakeAchievementRewardRspOuterClass;
+import emu.grasscutter.net.packet.*;
+import emu.grasscutter.net.proto.*;
+
 import java.util.List;
 
 public class PacketTakeAchievementRewardRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketTakeBattlePassMissionPointRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketTakeBattlePassMissionPointRsp.java
index faeefd7de..349973bfa 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketTakeBattlePassMissionPointRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketTakeBattlePassMissionPointRsp.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 
 public class PacketTakeBattlePassMissionPointRsp extends BasePacket {
     public PacketTakeBattlePassMissionPointRsp() {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketTakeBattlePassRewardRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketTakeBattlePassRewardRsp.java
index a9a2b9df6..270e1fea1 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketTakeBattlePassRewardRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketTakeBattlePassRewardRsp.java
@@ -1,11 +1,11 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.inventory.GameItem;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.BattlePassRewardTakeOption;
 import emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam;
 import emu.grasscutter.net.proto.TakeBattlePassRewardRspOuterClass.TakeBattlePassRewardRsp;
+
 import java.util.List;
 
 public class PacketTakeBattlePassRewardRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketTakeFurnitureMakeRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketTakeFurnitureMakeRsp.java
index 8bbd89d7b..88c7108e9 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketTakeFurnitureMakeRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketTakeFurnitureMakeRsp.java
@@ -1,11 +1,8 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.FurnitureMakeDataOuterClass;
-import emu.grasscutter.net.proto.FurnitureMakeSlotOuterClass;
-import emu.grasscutter.net.proto.ItemParamOuterClass;
-import emu.grasscutter.net.proto.TakeFurnitureMakeRspOuterClass;
+import emu.grasscutter.net.packet.*;
+import emu.grasscutter.net.proto.*;
+
 import java.util.List;
 
 public class PacketTakeFurnitureMakeRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketTakePlayerLevelRewardRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketTakePlayerLevelRewardRsp.java
index e0352dd22..14b3e4f2f 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketTakePlayerLevelRewardRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketTakePlayerLevelRewardRsp.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.TakePlayerLevelRewardRspOuterClass.TakePlayerLevelRewardRsp;
 
 public class PacketTakePlayerLevelRewardRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketTakeoffEquipRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketTakeoffEquipRsp.java
index b2bc1658b..b3aef2ec8 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketTakeoffEquipRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketTakeoffEquipRsp.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.TakeoffEquipRspOuterClass.TakeoffEquipRsp;
 
 public class PacketTakeoffEquipRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketTowerAllDataRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketTowerAllDataRsp.java
index 32ba0764f..bbb3e5408 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketTowerAllDataRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketTowerAllDataRsp.java
@@ -1,18 +1,15 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.game.tower.TowerManager;
-import emu.grasscutter.game.tower.TowerSystem;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.game.tower.*;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.TowerAllDataRspOuterClass.TowerAllDataRsp;
 import emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelRecord;
 import emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecord;
 import emu.grasscutter.net.proto.TowerLevelRecordOuterClass;
 import emu.grasscutter.utils.helpers.DateHelper;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
+
+import java.util.*;
+import java.util.stream.*;
 
 public class PacketTowerAllDataRsp extends BasePacket {
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketTowerCurLevelRecordChangeNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketTowerCurLevelRecordChangeNotify.java
index 816b15120..0876ca052 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketTowerCurLevelRecordChangeNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketTowerCurLevelRecordChangeNotify.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.TowerCurLevelRecordChangeNotifyOuterClass.TowerCurLevelRecordChangeNotify;
 import emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelRecord;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketTowerEnterLevelRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketTowerEnterLevelRsp.java
index 796d9a291..654977e30 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketTowerEnterLevelRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketTowerEnterLevelRsp.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.TowerEnterLevelRspOuterClass.TowerEnterLevelRsp;
 
 public class PacketTowerEnterLevelRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketTowerFloorRecordChangeNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketTowerFloorRecordChangeNotify.java
index 6c81740e3..a34a9787b 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketTowerFloorRecordChangeNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketTowerFloorRecordChangeNotify.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.TowerFloorRecordChangeNotifyOuterClass.TowerFloorRecordChangeNotify;
 import emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecord;
 import emu.grasscutter.net.proto.TowerLevelRecordOuterClass.TowerLevelRecord;
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketTowerLevelStarCondNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketTowerLevelStarCondNotify.java
index 115c39e96..56dcfefdf 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketTowerLevelStarCondNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketTowerLevelStarCondNotify.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.TowerLevelStarCondDataOuterClass.TowerLevelStarCondData;
 import emu.grasscutter.net.proto.TowerLevelStarCondNotifyOuterClass.TowerLevelStarCondNotify;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketTowerMiddleLevelChangeTeamNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketTowerMiddleLevelChangeTeamNotify.java
index c03c39632..0a412c647 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketTowerMiddleLevelChangeTeamNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketTowerMiddleLevelChangeTeamNotify.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.TowerMiddleLevelChangeTeamNotifyOuterClass;
 
 public class PacketTowerMiddleLevelChangeTeamNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketTowerTeamSelectRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketTowerTeamSelectRsp.java
index 1784a964a..438b2d325 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketTowerTeamSelectRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketTowerTeamSelectRsp.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.TowerTeamSelectRspOuterClass.TowerTeamSelectRsp;
 
 public class PacketTowerTeamSelectRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketTryEnterHomeRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketTryEnterHomeRsp.java
index 5d5344e0e..d6c91fc8a 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketTryEnterHomeRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketTryEnterHomeRsp.java
@@ -1,9 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.RetcodeOuterClass;
-import emu.grasscutter.net.proto.TryEnterHomeRspOuterClass;
+import emu.grasscutter.net.packet.*;
+import emu.grasscutter.net.proto.*;
 
 public class PacketTryEnterHomeRsp extends BasePacket {
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketUnlockAvatarTalentRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketUnlockAvatarTalentRsp.java
index 870476e0b..e82c951d6 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketUnlockAvatarTalentRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketUnlockAvatarTalentRsp.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.avatar.Avatar;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.UnlockAvatarTalentRspOuterClass.UnlockAvatarTalentRsp;
 
 public class PacketUnlockAvatarTalentRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketUnlockNameCardNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketUnlockNameCardNotify.java
index f435af212..74b5f399c 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketUnlockNameCardNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketUnlockNameCardNotify.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.UnlockNameCardNotifyOuterClass.UnlockNameCardNotify;
 
 public class PacketUnlockNameCardNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketUnlockPersonalLineRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketUnlockPersonalLineRsp.java
index f5f205e53..6ed3f7260 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketUnlockPersonalLineRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketUnlockPersonalLineRsp.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.RetcodeOuterClass.Retcode;
 import emu.grasscutter.net.proto.UnlockPersonalLineRspOuterClass;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketUnlockTransPointRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketUnlockTransPointRsp.java
index fe7f52fe1..0718348d3 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketUnlockTransPointRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketUnlockTransPointRsp.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.RetcodeOuterClass.Retcode;
 import emu.grasscutter.net.proto.UnlockTransPointRspOuterClass.UnlockTransPointRsp;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketUnlockedFurnitureFormulaDataNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketUnlockedFurnitureFormulaDataNotify.java
index 6be0fb949..c5c33c294 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketUnlockedFurnitureFormulaDataNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketUnlockedFurnitureFormulaDataNotify.java
@@ -1,8 +1,8 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.UnlockedFurnitureFormulaDataNotifyOuterClass;
+
 import java.util.Set;
 
 public class PacketUnlockedFurnitureFormulaDataNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketUnlockedFurnitureSuiteDataNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketUnlockedFurnitureSuiteDataNotify.java
index 59a9cfe05..336679926 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketUnlockedFurnitureSuiteDataNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketUnlockedFurnitureSuiteDataNotify.java
@@ -1,8 +1,8 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.UnlockedFurnitureSuiteDataNotifyOuterClass;
+
 import java.util.Set;
 
 public class PacketUnlockedFurnitureSuiteDataNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketUpdatePlayerShowAvatarListRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketUpdatePlayerShowAvatarListRsp.java
index 5fafa206d..f47eef050 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketUpdatePlayerShowAvatarListRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketUpdatePlayerShowAvatarListRsp.java
@@ -1,8 +1,8 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.UpdatePlayerShowAvatarListRspOuterClass.UpdatePlayerShowAvatarListRsp;
+
 import java.util.List;
 
 public class PacketUpdatePlayerShowAvatarListRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketUpdatePlayerShowNameCardListRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketUpdatePlayerShowNameCardListRsp.java
index 95b395e0b..9afcddb0b 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketUpdatePlayerShowNameCardListRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketUpdatePlayerShowNameCardListRsp.java
@@ -1,8 +1,8 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.UpdatePlayerShowNameCardListRspOuterClass;
+
 import java.util.List;
 
 public class PacketUpdatePlayerShowNameCardListRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketUseItemRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketUseItemRsp.java
index 9147438ed..9b4b7dbf2 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketUseItemRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketUseItemRsp.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.inventory.GameItem;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.RetcodeOuterClass;
 import emu.grasscutter.net.proto.UseItemRspOuterClass.UseItemRsp;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketVehicleInteractRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketVehicleInteractRsp.java
index dfcfb0576..d97be81c9 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketVehicleInteractRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketVehicleInteractRsp.java
@@ -1,11 +1,9 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.game.entity.EntityVehicle;
-import emu.grasscutter.game.entity.GameEntity;
+import emu.grasscutter.game.entity.*;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.quest.enums.QuestContent;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.VehicleInteractRspOuterClass.VehicleInteractRsp;
 import emu.grasscutter.net.proto.VehicleInteractTypeOuterClass.VehicleInteractType;
 import emu.grasscutter.net.proto.VehicleMemberOuterClass.VehicleMember;
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketVehicleStaminaNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketVehicleStaminaNotify.java
index 1510b1cc9..b40dad8f0 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketVehicleStaminaNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketVehicleStaminaNotify.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.VehicleStaminaNotifyOuterClass.VehicleStaminaNotify;
 
 public class PacketVehicleStaminaNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketWeaponAwakenRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketWeaponAwakenRsp.java
index 3bf49d12d..05169f5e9 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketWeaponAwakenRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketWeaponAwakenRsp.java
@@ -2,8 +2,7 @@ package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.avatar.Avatar;
 import emu.grasscutter.game.inventory.GameItem;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.WeaponAwakenRspOuterClass.WeaponAwakenRsp;
 
 public class PacketWeaponAwakenRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketWeaponPromoteRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketWeaponPromoteRsp.java
index dac904f24..081b1b3eb 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketWeaponPromoteRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketWeaponPromoteRsp.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.inventory.GameItem;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.WeaponPromoteRspOuterClass.WeaponPromoteRsp;
 
 public class PacketWeaponPromoteRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketWeaponUpgradeRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketWeaponUpgradeRsp.java
index 0abe162d0..06ff03c41 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketWeaponUpgradeRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketWeaponUpgradeRsp.java
@@ -1,10 +1,10 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.inventory.GameItem;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam;
 import emu.grasscutter.net.proto.WeaponUpgradeRspOuterClass.WeaponUpgradeRsp;
+
 import java.util.List;
 
 public class PacketWeaponUpgradeRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketWearEquipRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketWearEquipRsp.java
index 81d2ea2f2..a6345e7da 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketWearEquipRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketWearEquipRsp.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.WearEquipRspOuterClass.WearEquipRsp;
 
 public class PacketWearEquipRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketWidgetCoolDownNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketWidgetCoolDownNotify.java
index 0162ba09b..6ec361768 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketWidgetCoolDownNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketWidgetCoolDownNotify.java
@@ -1,9 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass;
-import emu.grasscutter.net.proto.WidgetCoolDownNotifyOuterClass;
+import emu.grasscutter.net.packet.*;
+import emu.grasscutter.net.proto.*;
 
 public class PacketWidgetCoolDownNotify extends BasePacket {
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketWidgetDoBagRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketWidgetDoBagRsp.java
index f26053c17..abe945525 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketWidgetDoBagRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketWidgetDoBagRsp.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.WidgetDoBagRspOuterClass;
 
 public class PacketWidgetDoBagRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketWidgetGadgetAllDataNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketWidgetGadgetAllDataNotify.java
index b0000efb7..dc97b65a2 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketWidgetGadgetAllDataNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketWidgetGadgetAllDataNotify.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.WidgetGadgetAllDataNotifyOuterClass.WidgetGadgetAllDataNotify;
 
 public class PacketWidgetGadgetAllDataNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketWidgetGadgetDataNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketWidgetGadgetDataNotify.java
index 5d40772e2..fa83095c8 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketWidgetGadgetDataNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketWidgetGadgetDataNotify.java
@@ -1,9 +1,8 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.WidgetGadgetDataNotifyOuterClass;
-import emu.grasscutter.net.proto.WidgetGadgetDataOuterClass;
+import emu.grasscutter.net.packet.*;
+import emu.grasscutter.net.proto.*;
+
 import java.io.IOException;
 import java.util.List;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketWidgetSlotChangeNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketWidgetSlotChangeNotify.java
index 07b97e226..db460c930 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketWidgetSlotChangeNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketWidgetSlotChangeNotify.java
@@ -1,10 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.WidgetSlotChangeNotifyOuterClass;
-import emu.grasscutter.net.proto.WidgetSlotDataOuterClass;
-import emu.grasscutter.net.proto.WidgetSlotOpOuterClass;
+import emu.grasscutter.net.packet.*;
+import emu.grasscutter.net.proto.*;
 
 public class PacketWidgetSlotChangeNotify extends BasePacket {
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketWindSeedClientNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketWindSeedClientNotify.java
index d29c54a95..c96273b38 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketWindSeedClientNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketWindSeedClientNotify.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
 import com.google.protobuf.ByteString;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.WindSeedType1NotifyOuterClass.WindSeedType1Notify;
 
 public final class PacketWindSeedClientNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketWorktopOptionNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketWorktopOptionNotify.java
index 52135e423..6afa32e25 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketWorktopOptionNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketWorktopOptionNotify.java
@@ -2,8 +2,7 @@ package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.entity.EntityGadget;
 import emu.grasscutter.game.entity.gadget.GadgetWorktop;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.WorktopOptionNotifyOuterClass.WorktopOptionNotify;
 
 public class PacketWorktopOptionNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketWorldChestOpenNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketWorldChestOpenNotify.java
index dd8ff5ad1..0d3e132c5 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketWorldChestOpenNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketWorldChestOpenNotify.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.WorldChestOpenNotifyOuterClass.WorldChestOpenNotify;
 
 public class PacketWorldChestOpenNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketWorldDataNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketWorldDataNotify.java
index 5ad2dc95d..c01d2b147 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketWorldDataNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketWorldDataNotify.java
@@ -1,8 +1,7 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.world.World;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.PropValueOuterClass.PropValue;
 import emu.grasscutter.net.proto.WorldDataNotifyOuterClass.WorldDataNotify;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketWorldPlayerDieNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketWorldPlayerDieNotify.java
index df973baa2..e51b2ee77 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketWorldPlayerDieNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketWorldPlayerDieNotify.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType;
 import emu.grasscutter.net.proto.WorldPlayerDieNotifyOuterClass.WorldPlayerDieNotify;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketWorldPlayerInfoNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketWorldPlayerInfoNotify.java
index a1e44e8b3..be45982b2 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketWorldPlayerInfoNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketWorldPlayerInfoNotify.java
@@ -2,8 +2,7 @@ package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.world.World;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.WorldPlayerInfoNotifyOuterClass.WorldPlayerInfoNotify;
 
 public class PacketWorldPlayerInfoNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketWorldPlayerLocationNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketWorldPlayerLocationNotify.java
index 25d8b673f..68c5d066e 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketWorldPlayerLocationNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketWorldPlayerLocationNotify.java
@@ -2,8 +2,7 @@ package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.world.World;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.WorldPlayerLocationNotifyOuterClass.WorldPlayerLocationNotify;
 
 public class PacketWorldPlayerLocationNotify extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketWorldPlayerRTTNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketWorldPlayerRTTNotify.java
index 4b2ae556d..a05b0b2d2 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketWorldPlayerRTTNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketWorldPlayerRTTNotify.java
@@ -2,8 +2,7 @@ package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.world.World;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.PlayerRTTInfoOuterClass.PlayerRTTInfo;
 import emu.grasscutter.net.proto.WorldPlayerRTTNotifyOuterClass.WorldPlayerRTTNotify;
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketWorldPlayerReviveRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketWorldPlayerReviveRsp.java
index 4c57f3f13..b68b80211 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketWorldPlayerReviveRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketWorldPlayerReviveRsp.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.WorldPlayerReviveRspOuterClass.WorldPlayerReviveRsp;
 
 public class PacketWorldPlayerReviveRsp extends BasePacket {
diff --git a/src/main/java/emu/grasscutter/server/scheduler/AsyncServerTask.java b/src/main/java/emu/grasscutter/server/scheduler/AsyncServerTask.java
index 38e4c2a02..264a80ff3 100644
--- a/src/main/java/emu/grasscutter/server/scheduler/AsyncServerTask.java
+++ b/src/main/java/emu/grasscutter/server/scheduler/AsyncServerTask.java
@@ -1,8 +1,9 @@
 package emu.grasscutter.server.scheduler;
 
-import javax.annotation.Nullable;
 import lombok.Getter;
 
+import javax.annotation.Nullable;
+
 /** A server task that should be run asynchronously. */
 public final class AsyncServerTask implements Runnable {
     /* The runnable to run. */
diff --git a/src/main/java/emu/grasscutter/task/Task.java b/src/main/java/emu/grasscutter/task/Task.java
index 92c2a1a6a..303e29d1a 100644
--- a/src/main/java/emu/grasscutter/task/Task.java
+++ b/src/main/java/emu/grasscutter/task/Task.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.task;
 
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.*;
 
 /*
 * So what is cron expression?
diff --git a/src/main/java/emu/grasscutter/task/TaskMap.java b/src/main/java/emu/grasscutter/task/TaskMap.java
index f9da26241..313032af0 100644
--- a/src/main/java/emu/grasscutter/task/TaskMap.java
+++ b/src/main/java/emu/grasscutter/task/TaskMap.java
@@ -1,11 +1,12 @@
 package emu.grasscutter.task;
 
 import emu.grasscutter.Grasscutter;
-import java.util.*;
 import org.quartz.*;
 import org.quartz.impl.StdSchedulerFactory;
 import org.reflections.Reflections;
 
+import java.util.*;
+
 @SuppressWarnings({"UnusedReturnValue", "unused"})
 public final class TaskMap {
     private final Map tasks = new HashMap<>();
diff --git a/src/main/java/emu/grasscutter/task/tasks/AnnouncementTask.java b/src/main/java/emu/grasscutter/task/tasks/AnnouncementTask.java
index 30e032987..ee9531aed 100644
--- a/src/main/java/emu/grasscutter/task/tasks/AnnouncementTask.java
+++ b/src/main/java/emu/grasscutter/task/tasks/AnnouncementTask.java
@@ -2,14 +2,12 @@ package emu.grasscutter.task.tasks;
 
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.game.systems.AnnouncementSystem;
-import emu.grasscutter.task.Task;
-import emu.grasscutter.task.TaskHandler;
-import java.util.Date;
-import java.util.Map;
+import emu.grasscutter.task.*;
+import org.quartz.*;
+
+import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
-import org.quartz.JobExecutionContext;
-import org.quartz.JobExecutionException;
 
 @Task(
         taskName = "Announcement",
diff --git a/src/main/java/emu/grasscutter/task/tasks/MoonCard.java b/src/main/java/emu/grasscutter/task/tasks/MoonCard.java
index 42becd681..5ec13e120 100644
--- a/src/main/java/emu/grasscutter/task/tasks/MoonCard.java
+++ b/src/main/java/emu/grasscutter/task/tasks/MoonCard.java
@@ -1,10 +1,8 @@
 package emu.grasscutter.task.tasks;
 
 import emu.grasscutter.Grasscutter;
-import emu.grasscutter.task.Task;
-import emu.grasscutter.task.TaskHandler;
-import org.quartz.JobExecutionContext;
-import org.quartz.JobExecutionException;
+import emu.grasscutter.task.*;
+import org.quartz.*;
 
 @Task(taskName = "MoonCard", taskCronExpression = "0 0 0 * * ?", triggerName = "MoonCardTrigger")
 // taskCronExpression: Fixed time period: 0:0:0 every day (twenty-four hour system)
diff --git a/src/main/java/emu/grasscutter/tools/Dumpers.java b/src/main/java/emu/grasscutter/tools/Dumpers.java
index 8420d9914..6ba57689e 100644
--- a/src/main/java/emu/grasscutter/tools/Dumpers.java
+++ b/src/main/java/emu/grasscutter/tools/Dumpers.java
@@ -1,24 +1,19 @@
 package emu.grasscutter.tools;
 
-import emu.grasscutter.command.Command;
+import emu.grasscutter.command.*;
 import emu.grasscutter.command.Command.TargetRequirement;
-import emu.grasscutter.command.CommandMap;
-import emu.grasscutter.data.GameData;
-import emu.grasscutter.data.ResourceLoader;
+import emu.grasscutter.data.*;
 import emu.grasscutter.game.inventory.ItemType;
 import emu.grasscutter.game.props.SceneType;
 import emu.grasscutter.utils.JsonUtils;
 import emu.grasscutter.utils.lang.Language;
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
 import lombok.AllArgsConstructor;
 
+import java.io.*;
+import java.nio.file.Files;
+import java.util.*;
+import java.util.stream.Collectors;
+
 public interface Dumpers {
     // See `src/handbook/data/README.md` for attributions.
 
diff --git a/src/main/java/emu/grasscutter/tools/Tools.java b/src/main/java/emu/grasscutter/tools/Tools.java
index a611acb89..e28ea00fa 100644
--- a/src/main/java/emu/grasscutter/tools/Tools.java
+++ b/src/main/java/emu/grasscutter/tools/Tools.java
@@ -1,8 +1,5 @@
 package emu.grasscutter.tools;
 
-import static emu.grasscutter.utils.FileUtils.getResourcePath;
-import static emu.grasscutter.utils.lang.Language.getTextMapKey;
-
 import emu.grasscutter.*;
 import emu.grasscutter.command.*;
 import emu.grasscutter.data.*;
@@ -14,6 +11,8 @@ import emu.grasscutter.utils.*;
 import emu.grasscutter.utils.lang.Language;
 import emu.grasscutter.utils.lang.Language.TextStrings;
 import it.unimi.dsi.fastutil.ints.*;
+import lombok.*;
+
 import java.io.*;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.*;
@@ -22,7 +21,9 @@ import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.*;
-import lombok.*;
+
+import static emu.grasscutter.utils.FileUtils.getResourcePath;
+import static emu.grasscutter.utils.lang.Language.getTextMapKey;
 
 public final class Tools {
     /**
diff --git a/src/main/java/emu/grasscutter/utils/Crypto.java b/src/main/java/emu/grasscutter/utils/Crypto.java
index c63d8f81a..9a48f9601 100644
--- a/src/main/java/emu/grasscutter/utils/Crypto.java
+++ b/src/main/java/emu/grasscutter/utils/Crypto.java
@@ -2,20 +2,14 @@ package emu.grasscutter.utils;
 
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.server.http.objects.QueryCurRegionRspJson;
+
+import javax.crypto.Cipher;
 import java.io.ByteArrayOutputStream;
 import java.nio.file.Path;
-import java.security.KeyFactory;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.security.SecureRandom;
-import java.security.Signature;
-import java.security.spec.PKCS8EncodedKeySpec;
-import java.security.spec.X509EncodedKeySpec;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
+import java.security.*;
+import java.security.spec.*;
+import java.util.*;
 import java.util.regex.Pattern;
-import javax.crypto.Cipher;
 
 public final class Crypto {
 
diff --git a/src/main/java/emu/grasscutter/utils/DispatchUtils.java b/src/main/java/emu/grasscutter/utils/DispatchUtils.java
index 752a837b6..ab3beb013 100644
--- a/src/main/java/emu/grasscutter/utils/DispatchUtils.java
+++ b/src/main/java/emu/grasscutter/utils/DispatchUtils.java
@@ -1,23 +1,20 @@
 package emu.grasscutter.utils;
 
-import static emu.grasscutter.config.Configuration.DISPATCH_INFO;
-
 import com.google.gson.JsonObject;
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.auth.AuthenticationSystem.AuthenticationRequest;
 import emu.grasscutter.database.DatabaseHelper;
-import emu.grasscutter.game.Account;
-import emu.grasscutter.game.HandbookActions;
-import emu.grasscutter.server.dispatch.IDispatcher;
-import emu.grasscutter.server.dispatch.PacketIds;
+import emu.grasscutter.game.*;
+import emu.grasscutter.server.dispatch.*;
 import emu.grasscutter.server.http.handlers.GachaHandler;
 import emu.grasscutter.server.http.objects.LoginTokenRequestJson;
-import emu.grasscutter.utils.objects.HandbookBody;
+import emu.grasscutter.utils.objects.*;
 import emu.grasscutter.utils.objects.HandbookBody.*;
-import emu.grasscutter.utils.objects.JObject;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.TimeUnit;
+
 import javax.annotation.Nullable;
+import java.util.concurrent.*;
+
+import static emu.grasscutter.config.Configuration.DISPATCH_INFO;
 
 public interface DispatchUtils {
     /**
diff --git a/src/main/java/emu/grasscutter/utils/FileUtils.java b/src/main/java/emu/grasscutter/utils/FileUtils.java
index efde279cd..97f100659 100644
--- a/src/main/java/emu/grasscutter/utils/FileUtils.java
+++ b/src/main/java/emu/grasscutter/utils/FileUtils.java
@@ -1,20 +1,15 @@
 package emu.grasscutter.utils;
 
 import emu.grasscutter.Grasscutter;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
+import lombok.val;
+
+import java.io.*;
 import java.net.URISyntaxException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.FileSystem;
-import java.nio.file.FileSystems;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-import lombok.val;
+import java.nio.file.*;
+import java.util.*;
+import java.util.stream.*;
 
 public final class FileUtils {
     private static final Path DATA_DEFAULT_PATH;
diff --git a/src/main/java/emu/grasscutter/utils/JsonAdapters.java b/src/main/java/emu/grasscutter/utils/JsonAdapters.java
index a44e46bac..9eaf1f51e 100644
--- a/src/main/java/emu/grasscutter/utils/JsonAdapters.java
+++ b/src/main/java/emu/grasscutter/utils/JsonAdapters.java
@@ -7,10 +7,11 @@ import emu.grasscutter.data.common.DynamicFloat;
 import emu.grasscutter.game.world.*;
 import it.unimi.dsi.fastutil.floats.FloatArrayList;
 import it.unimi.dsi.fastutil.ints.*;
+import lombok.val;
+
 import java.io.IOException;
 import java.lang.reflect.Field;
 import java.util.*;
-import lombok.val;
 
 public interface JsonAdapters {
     class DynamicFloatAdapter extends TypeAdapter {
diff --git a/src/main/java/emu/grasscutter/utils/JsonUtils.java b/src/main/java/emu/grasscutter/utils/JsonUtils.java
index cfb3ba20d..fab55908a 100644
--- a/src/main/java/emu/grasscutter/utils/JsonUtils.java
+++ b/src/main/java/emu/grasscutter/utils/JsonUtils.java
@@ -3,21 +3,16 @@ package emu.grasscutter.utils;
 import com.google.gson.*;
 import com.google.gson.reflect.TypeToken;
 import emu.grasscutter.data.common.DynamicFloat;
-import emu.grasscutter.game.world.GridPosition;
-import emu.grasscutter.game.world.Position;
+import emu.grasscutter.game.world.*;
 import emu.grasscutter.utils.JsonAdapters.*;
 import emu.grasscutter.utils.objects.JObject;
 import it.unimi.dsi.fastutil.ints.IntList;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.Reader;
+
+import java.io.*;
 import java.lang.reflect.Type;
 import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.List;
-import java.util.Map;
+import java.nio.file.*;
+import java.util.*;
 
 public final class JsonUtils {
     static final Gson gson =
diff --git a/src/main/java/emu/grasscutter/utils/StartupArguments.java b/src/main/java/emu/grasscutter/utils/StartupArguments.java
index 6b61163b9..3b7e7cbdc 100644
--- a/src/main/java/emu/grasscutter/utils/StartupArguments.java
+++ b/src/main/java/emu/grasscutter/utils/StartupArguments.java
@@ -1,19 +1,16 @@
 package emu.grasscutter.utils;
 
-import static emu.grasscutter.config.Configuration.*;
-
-import ch.qos.logback.classic.Level;
-import ch.qos.logback.classic.Logger;
-import emu.grasscutter.BuildConfig;
-import emu.grasscutter.GameConstants;
-import emu.grasscutter.Grasscutter;
+import ch.qos.logback.classic.*;
+import emu.grasscutter.*;
 import emu.grasscutter.net.packet.PacketOpcodesUtils;
 import emu.grasscutter.tools.Dumpers;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.Function;
 import org.slf4j.LoggerFactory;
 
+import java.util.*;
+import java.util.function.Function;
+
+import static emu.grasscutter.config.Configuration.*;
+
 /** A parser for start-up arguments. */
 public interface StartupArguments {
     /* A map of parameter -> argument handler. */
diff --git a/src/main/java/emu/grasscutter/utils/TsvUtils.java b/src/main/java/emu/grasscutter/utils/TsvUtils.java
index 2fe66d4d3..d89497466 100644
--- a/src/main/java/emu/grasscutter/utils/TsvUtils.java
+++ b/src/main/java/emu/grasscutter/utils/TsvUtils.java
@@ -1,25 +1,22 @@
 package emu.grasscutter.utils;
 
-import static emu.grasscutter.utils.Utils.nonRegexSplit;
-
 import com.google.gson.*;
 import com.google.gson.annotations.SerializedName;
 import emu.grasscutter.Grasscutter;
 import it.unimi.dsi.fastutil.Pair;
-import it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap;
-import it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap;
+import it.unimi.dsi.fastutil.ints.*;
 import it.unimi.dsi.fastutil.objects.Object2IntArrayMap;
+import lombok.val;
+
 import java.io.IOException;
 import java.lang.reflect.*;
 import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.NoSuchFileException;
-import java.nio.file.Path;
+import java.nio.file.*;
 import java.util.*;
 import java.util.function.Function;
-import java.util.stream.IntStream;
-import java.util.stream.Stream;
-import lombok.val;
+import java.util.stream.*;
+
+import static emu.grasscutter.utils.Utils.nonRegexSplit;
 
 // Throughout this file, commented System.out.println debug log calls are left in.
 // This is because the default logger will deadlock when operating on parallel streams.
diff --git a/src/main/java/emu/grasscutter/utils/Utils.java b/src/main/java/emu/grasscutter/utils/Utils.java
index 435d6d0f1..b0a27c3fb 100644
--- a/src/main/java/emu/grasscutter/utils/Utils.java
+++ b/src/main/java/emu/grasscutter/utils/Utils.java
@@ -1,8 +1,5 @@
 package emu.grasscutter.utils;
 
-import static emu.grasscutter.utils.FileUtils.getResourcePath;
-import static emu.grasscutter.utils.lang.Language.translate;
-
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.config.ConfigContainer;
 import emu.grasscutter.data.DataLoader;
@@ -11,6 +8,9 @@ import emu.grasscutter.utils.objects.Returnable;
 import io.javalin.http.Context;
 import io.netty.buffer.*;
 import it.unimi.dsi.fastutil.ints.*;
+import org.slf4j.Logger;
+
+import javax.annotation.Nullable;
 import java.io.*;
 import java.lang.reflect.Field;
 import java.nio.charset.StandardCharsets;
@@ -19,8 +19,9 @@ import java.time.*;
 import java.time.temporal.TemporalAdjusters;
 import java.util.*;
 import java.util.concurrent.ThreadLocalRandom;
-import javax.annotation.Nullable;
-import org.slf4j.Logger;
+
+import static emu.grasscutter.utils.FileUtils.getResourcePath;
+import static emu.grasscutter.utils.lang.Language.translate;
 
 @SuppressWarnings({"UnusedReturnValue", "BooleanMethodIsAlwaysInverted"})
 public final class Utils {
diff --git a/src/main/java/emu/grasscutter/utils/helpers/DateHelper.java b/src/main/java/emu/grasscutter/utils/helpers/DateHelper.java
index ee412727e..baa612545 100644
--- a/src/main/java/emu/grasscutter/utils/helpers/DateHelper.java
+++ b/src/main/java/emu/grasscutter/utils/helpers/DateHelper.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.utils.helpers;
 
-import java.util.Calendar;
-import java.util.Date;
+import java.util.*;
 
 public interface DateHelper {
     static Date onlyYearMonthDay(Date now) {
diff --git a/src/main/java/emu/grasscutter/utils/lang/Language.java b/src/main/java/emu/grasscutter/utils/lang/Language.java
index 25bf8bdbd..e0c1df11f 100644
--- a/src/main/java/emu/grasscutter/utils/lang/Language.java
+++ b/src/main/java/emu/grasscutter/utils/lang/Language.java
@@ -1,8 +1,5 @@
 package emu.grasscutter.utils.lang;
 
-import static emu.grasscutter.config.Configuration.FALLBACK_LANGUAGE;
-import static emu.grasscutter.utils.FileUtils.*;
-
 import com.google.gson.*;
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.data.*;
@@ -11,6 +8,8 @@ import emu.grasscutter.game.player.Player;
 import emu.grasscutter.utils.*;
 import it.unimi.dsi.fastutil.ints.*;
 import it.unimi.dsi.fastutil.objects.*;
+import lombok.EqualsAndHashCode;
+
 import java.io.*;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.*;
@@ -18,7 +17,9 @@ import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.regex.*;
 import java.util.stream.*;
-import lombok.EqualsAndHashCode;
+
+import static emu.grasscutter.config.Configuration.FALLBACK_LANGUAGE;
+import static emu.grasscutter.utils.FileUtils.*;
 
 public final class Language {
     private static final Map cachedLanguages = new ConcurrentHashMap<>();
diff --git a/src/main/java/emu/grasscutter/utils/objects/FieldFetch.java b/src/main/java/emu/grasscutter/utils/objects/FieldFetch.java
index 6af162463..7b864e743 100644
--- a/src/main/java/emu/grasscutter/utils/objects/FieldFetch.java
+++ b/src/main/java/emu/grasscutter/utils/objects/FieldFetch.java
@@ -3,8 +3,9 @@ package emu.grasscutter.utils.objects;
 import com.google.gson.*;
 import emu.grasscutter.server.dispatch.IDispatcher;
 import emu.grasscutter.utils.Utils;
+
 import java.lang.reflect.Field;
-import java.util.*;
+import java.util.HashMap;
 
 public interface FieldFetch {
     /**
diff --git a/src/main/java/emu/grasscutter/utils/objects/HandbookBody.java b/src/main/java/emu/grasscutter/utils/objects/HandbookBody.java
index 1b83683aa..b5d93739e 100644
--- a/src/main/java/emu/grasscutter/utils/objects/HandbookBody.java
+++ b/src/main/java/emu/grasscutter/utils/objects/HandbookBody.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.utils.objects;
 
-import lombok.Builder;
-import lombok.Getter;
+import lombok.*;
 
 /** HTTP request object for handbook controls. */
 @SuppressWarnings("FieldMayBeFinal")
diff --git a/src/main/java/emu/grasscutter/utils/objects/JLineLogbackAppender.java b/src/main/java/emu/grasscutter/utils/objects/JLineLogbackAppender.java
index c56f81e3f..715faadbd 100644
--- a/src/main/java/emu/grasscutter/utils/objects/JLineLogbackAppender.java
+++ b/src/main/java/emu/grasscutter/utils/objects/JLineLogbackAppender.java
@@ -3,6 +3,7 @@ package emu.grasscutter.utils.objects;
 import ch.qos.logback.classic.spi.ILoggingEvent;
 import ch.qos.logback.core.ConsoleAppender;
 import emu.grasscutter.Grasscutter;
+
 import java.util.Arrays;
 
 public final class JLineLogbackAppender extends ConsoleAppender {
diff --git a/src/main/java/emu/grasscutter/utils/objects/JObject.java b/src/main/java/emu/grasscutter/utils/objects/JObject.java
index 5e88a9b20..34a331b7d 100644
--- a/src/main/java/emu/grasscutter/utils/objects/JObject.java
+++ b/src/main/java/emu/grasscutter/utils/objects/JObject.java
@@ -2,9 +2,9 @@ package emu.grasscutter.utils.objects;
 
 import com.google.gson.*;
 import com.google.gson.internal.LinkedTreeMap;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
+import com.google.gson.stream.*;
 import emu.grasscutter.utils.JsonUtils;
+
 import java.io.IOException;
 
 /* Replica of JsonObject. Includes chaining. */
diff --git a/src/main/java/emu/grasscutter/utils/objects/KahnsSort.java b/src/main/java/emu/grasscutter/utils/objects/KahnsSort.java
index 299fab0f5..57c22d7b0 100644
--- a/src/main/java/emu/grasscutter/utils/objects/KahnsSort.java
+++ b/src/main/java/emu/grasscutter/utils/objects/KahnsSort.java
@@ -1,10 +1,6 @@
 package emu.grasscutter.utils.objects;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Stack;
+import java.util.*;
 
 public class KahnsSort {
     public static class Node {
diff --git a/src/main/java/emu/grasscutter/utils/objects/ServerLogEventAppender.java b/src/main/java/emu/grasscutter/utils/objects/ServerLogEventAppender.java
index 05a89f170..2de8051fc 100644
--- a/src/main/java/emu/grasscutter/utils/objects/ServerLogEventAppender.java
+++ b/src/main/java/emu/grasscutter/utils/objects/ServerLogEventAppender.java
@@ -4,6 +4,7 @@ import ch.qos.logback.classic.spi.ILoggingEvent;
 import ch.qos.logback.core.AppenderBase;
 import ch.qos.logback.core.encoder.Encoder;
 import emu.grasscutter.server.event.internal.ServerLogEvent;
+
 import java.nio.charset.StandardCharsets;
 
 public final class ServerLogEventAppender extends AppenderBase {
diff --git a/src/main/java/emu/grasscutter/utils/objects/SparseSet.java b/src/main/java/emu/grasscutter/utils/objects/SparseSet.java
index 9f116cd73..47a12d89e 100644
--- a/src/main/java/emu/grasscutter/utils/objects/SparseSet.java
+++ b/src/main/java/emu/grasscutter/utils/objects/SparseSet.java
@@ -1,9 +1,6 @@
 package emu.grasscutter.utils.objects;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-import java.util.TreeSet;
+import java.util.*;
 
 public final class SparseSet {
     private final List rangeEntries;
diff --git a/src/main/java/emu/grasscutter/utils/objects/WeightedList.java b/src/main/java/emu/grasscutter/utils/objects/WeightedList.java
index f52fa5af0..bc9ac658e 100644
--- a/src/main/java/emu/grasscutter/utils/objects/WeightedList.java
+++ b/src/main/java/emu/grasscutter/utils/objects/WeightedList.java
@@ -1,7 +1,6 @@
 package emu.grasscutter.utils.objects;
 
-import java.util.NavigableMap;
-import java.util.TreeMap;
+import java.util.*;
 import java.util.concurrent.ThreadLocalRandom;
 
 public class WeightedList {
diff --git a/src/main/java/emu/grasscutter/utils/objects/text/Style.java b/src/main/java/emu/grasscutter/utils/objects/text/Style.java
index 452a9e883..3754e2e15 100644
--- a/src/main/java/emu/grasscutter/utils/objects/text/Style.java
+++ b/src/main/java/emu/grasscutter/utils/objects/text/Style.java
@@ -1,10 +1,9 @@
 package emu.grasscutter.utils.objects.text;
 
+import lombok.*;
+
 import java.awt.*;
-import java.util.HashMap;
-import java.util.Map;
-import lombok.Builder;
-import lombok.Data;
+import java.util.*;
 
 /* Text style container. */
 @Builder
diff --git a/src/main/java/emu/grasscutter/utils/objects/text/Text.java b/src/main/java/emu/grasscutter/utils/objects/text/Text.java
index 09d97491a..2ac900e35 100644
--- a/src/main/java/emu/grasscutter/utils/objects/text/Text.java
+++ b/src/main/java/emu/grasscutter/utils/objects/text/Text.java
@@ -1,8 +1,8 @@
 package emu.grasscutter.utils.objects.text;
 
+import lombok.*;
+
 import java.awt.*;
-import lombok.Getter;
-import lombok.Setter;
 
 /* An instance of text. */
 public final class Text {