From 70a420a6b19124b2832dc0420f323b09b116d371 Mon Sep 17 00:00:00 2001 From: Melledy <121644117+Melledy@users.noreply.github.com> Date: Mon, 5 Feb 2024 18:14:43 -0800 Subject: [PATCH] Update to support game version `2.0.0` --- .../proto/AKKLFHFHPFNOuterClass.java | 418 ---- .../ActivateFarmElementCsReqOuterClass.java | 128 +- .../ActivateFarmElementScRspOuterClass.java | 142 +- .../proto/ActivityScheduleInfoOuterClass.java | 252 +- .../proto/ApplyFriendCsReqOuterClass.java | 30 +- .../proto/ArchiveDataOuterClass.java | 354 ++- ...s.java => AssistSimpleInfoOuterClass.java} | 246 +- .../proto/AvatarExpUpCsReqOuterClass.java | 32 +- .../proto/AvatarExpUpScRspOuterClass.java | 34 +- .../emu/lunarcore/proto/AvatarOuterClass.java | 520 ++-- .../lunarcore/proto/AvatarSyncOuterClass.java | 18 +- .../proto/BELMNIPGEDNOuterClass.java | 498 ---- .../proto/BattleAvatarOuterClass.java | 24 - .../BattleEventBattleInfoOuterClass.java | 119 +- .../proto/BattleMechanismBarOuterClass.java | 339 --- .../proto/BattleRelicOuterClass.java | 255 +- .../proto/BoardDataSyncOuterClass.java | 20 +- .../lunarcore/proto/BuffInfoOuterClass.java | 298 +-- .../proto/BuyGoodsCsReqOuterClass.java | 146 +- .../proto/BuyGoodsScRspOuterClass.java | 214 +- .../proto/ChallengeInfoOuterClass.java | 346 +-- .../ChallengeLineupNotifyOuterClass.java | 14 +- .../lunarcore/proto/ChallengeOuterClass.java | 285 +-- .../proto/ChallengeRewardOuterClass.java | 30 +- .../ChallengeSettleNotifyOuterClass.java | 286 +-- .../ChallengeStoryBuffInfoOuterClass.java | 20 +- .../proto/ChallengeStoryInfoOuterClass.java | 16 +- .../ChangeLineupLeaderCsReqOuterClass.java | 14 +- .../ChangeLineupLeaderScRspOuterClass.java | 124 +- .../proto/ChargerInfoOuterClass.java | 340 +++ .../emu/lunarcore/proto/ChatOuterClass.java | 84 +- .../ChessRogueNousQueryInfoOuterClass.java | 514 +--- .../proto/ChessRoguePhaseOuterClass.java | 130 - .../proto/ChessRogueQueryInfoOuterClass.java | 686 ------ .../proto/ChessRogueQueryOuterClass.java | 970 -------- .../proto/ChessRogueQueryScRspOuterClass.java | 597 ----- .../lunarcore/proto/ClientMailOuterClass.java | 322 +-- .../proto/CommonRogueQueryOuterClass.java | 383 --- .../CommonRogueQueryScRspOuterClass.java | 362 --- .../proto/ComposeItemCsReqOuterClass.java | 142 +- .../proto/ComposeItemScRspOuterClass.java | 158 +- .../ComposeSelectedRelicCsReqOuterClass.java | 226 +- .../ComposeSelectedRelicScRspOuterClass.java | 142 +- .../DailyActiveInfoNotifyOuterClass.java | 56 +- .../proto/DailyActivityInfoOuterClass.java | 62 +- .../DeactivateFarmElementCsReqOuterClass.java | 260 ++ .../DeactivateFarmElementScRspOuterClass.java | 340 +++ .../proto/DelMailCsReqOuterClass.java | 20 +- .../proto/DelMailScRspOuterClass.java | 36 +- .../proto/DeleteFriendCsReqOuterClass.java | 14 +- ...java => DeployRotaterCsReqOuterClass.java} | 152 +- .../proto/DeployRotaterScRspOuterClass.java | 789 ++++++ .../proto/DisplayAvatarOuterClass.java | 126 +- .../proto/DisplayAvatarVecOuterClass.java | 34 +- .../proto/DoGachaCsReqOuterClass.java | 206 +- .../DoGachaInRollShopCsReqOuterClass.java | 340 +++ .../DoGachaInRollShopScRspOuterClass.java | 601 +++++ .../proto/DoGachaScRspOuterClass.java | 254 +- .../proto/DressAvatarCsReqOuterClass.java | 128 +- .../DressRelicAvatarCsReqOuterClass.java | 34 +- ...nterMapRotationRegionCsReqOuterClass.java} | 152 +- ...EnterMapRotationRegionScRspOuterClass.java | 442 ++++ .../EnterSceneByServerScNotifyOuterClass.java | 50 +- .../proto/EnterSceneCsReqOuterClass.java | 122 +- .../proto/EnteredSceneInfoOuterClass.java | 128 +- .../proto/EntityBuffChangeInfoOuterClass.java | 144 +- .../proto/EntityBuffInfoOuterClass.java | 34 +- .../proto/EntityMotionOuterClass.java | 144 +- .../lunarcore/proto/EquipRelicOuterClass.java | 30 +- .../lunarcore/proto/EquipmentOuterClass.java | 422 ++-- .../ExchangeGachaCeilingCsReqOuterClass.java | 30 +- .../ExchangeGachaCeilingScRspOuterClass.java | 286 +-- .../proto/ExchangeHcoinCsReqOuterClass.java | 14 +- .../proto/ExchangeHcoinScRspOuterClass.java | 124 +- .../proto/ExpUpEquipmentCsReqOuterClass.java | 32 +- .../proto/ExpUpEquipmentScRspOuterClass.java | 34 +- .../proto/ExpUpRelicCsReqOuterClass.java | 32 +- .../proto/ExpUpRelicScRspOuterClass.java | 34 +- .../proto/FriendApplyInfoOuterClass.java | 16 +- .../proto/FriendListInfoOuterClass.java | 16 +- .../proto/FriendRecommendInfoOuterClass.java | 16 +- .../proto/GachaCeilingAvatarOuterClass.java | 16 +- .../proto/GachaCeilingOuterClass.java | 30 +- .../lunarcore/proto/GachaInfoOuterClass.java | 412 ++-- .../lunarcore/proto/GachaItemOuterClass.java | 174 +- .../lunarcore/proto/GateserverOuterClass.java | 996 ++++---- ...ActivityScheduleConfigScRspOuterClass.java | 34 +- .../GetAllLineupDataScRspOuterClass.java | 144 +- .../proto/GetArchiveDataScRspOuterClass.java | 18 +- .../proto/GetAvatarDataCsReqOuterClass.java | 14 +- .../proto/GetAvatarDataScRspOuterClass.java | 50 +- .../proto/GetBagScRspOuterClass.java | 244 +- .../proto/GetBasicInfoScRspOuterClass.java | 410 ++-- .../proto/GetChallengeScRspOuterClass.java | 184 +- .../proto/GetCurChallengeScRspOuterClass.java | 32 +- .../GetCurLineupDataScRspOuterClass.java | 32 +- .../proto/GetCurSceneInfoScRspOuterClass.java | 32 +- .../GetDailyActiveInfoScRspOuterClass.java | 30 +- .../proto/GetEnteredSceneScRspOuterClass.java | 34 +- ...stTalkByPerformanceNpcCsReqOuterClass.java | 20 +- ...stTalkByPerformanceNpcScRspOuterClass.java | 34 +- ...GetFriendApplyListInfoScRspOuterClass.java | 34 +- .../GetFriendListInfoScRspOuterClass.java | 163 +- .../GetFriendLoginInfoScRspOuterClass.java | 127 +- ...riendRecommendListInfoScRspOuterClass.java | 34 +- .../proto/GetGachaCeilingCsReqOuterClass.java | 14 +- .../proto/GetGachaCeilingScRspOuterClass.java | 120 +- .../proto/GetGachaInfoScRspOuterClass.java | 34 +- .../GetHeroBasicTypeInfoScRspOuterClass.java | 198 +- .../proto/GetJukeboxDataScRspOuterClass.java | 144 +- .../proto/GetMailScRspOuterClass.java | 212 +- .../GetMissionStatusCsReqOuterClass.java | 42 +- .../GetMissionStatusScRspOuterClass.java | 244 +- .../GetNpcTakenRewardCsReqOuterClass.java | 14 +- .../GetNpcTakenRewardScRspOuterClass.java | 126 +- .../proto/GetPhoneDataScRspOuterClass.java | 350 +-- .../GetPlayerBoardDataScRspOuterClass.java | 90 +- .../GetPlayerDetailInfoCsReqOuterClass.java | 14 +- .../GetPlayerDetailInfoScRspOuterClass.java | 32 +- .../GetPrivateChatHistoryCsReqOuterClass.java | 128 +- .../GetPrivateChatHistoryScRspOuterClass.java | 194 +- .../proto/GetQuestDataScRspOuterClass.java | 50 +- .../proto/GetRollShopInfoCsReqOuterClass.java | 260 ++ .../proto/GetRollShopInfoScRspOuterClass.java | 541 ++++ .../proto/GetSceneMapInfoCsReqOuterClass.java | 36 +- .../proto/GetSceneMapInfoScRspOuterClass.java | 512 ++-- .../proto/GetShopListCsReqOuterClass.java | 14 +- .../proto/GetShopListScRspOuterClass.java | 144 +- .../GetUnlockTeleportCsReqOuterClass.java | 20 +- .../GetUnlockTeleportScRspOuterClass.java | 36 +- .../emu/lunarcore/proto/GoodsOuterClass.java | 306 +-- .../GroupStateChangeCsReqOuterClass.java | 16 +- .../GroupStateChangeScNotifyOuterClass.java | 16 +- .../GroupStateChangeScRspOuterClass.java | 14 +- .../proto/GroupStateInfoOuterClass.java | 164 +- .../proto/HandleFriendCsReqOuterClass.java | 30 +- .../proto/HandleFriendScRspOuterClass.java | 156 +- .../lunarcore/proto/HeadIconOuterClass.java | 14 +- .../proto/HeroBasicTypeInfoOuterClass.java | 50 +- ...va => InteractChargerCsReqOuterClass.java} | 144 +- .../proto/InteractChargerScRspOuterClass.java | 810 ++++++ .../proto/InteractPropCsReqOuterClass.java | 122 +- .../proto/InteractPropScRspOuterClass.java | 142 +- .../proto/ItemCostListOuterClass.java | 18 +- .../lunarcore/proto/ItemCostOuterClass.java | 472 +--- .../lunarcore/proto/ItemListOuterClass.java | 18 +- .../emu/lunarcore/proto/ItemOuterClass.java | 370 +-- .../proto/JHAHJFNNGHIOuterClass.java | 600 ----- .../proto/JoinLineupCsReqOuterClass.java | 376 +-- .../proto/KDHBAHABJMPOuterClass.java | 598 ----- .../proto/LineupAvatarOuterClass.java | 238 +- .../lunarcore/proto/LineupInfoOuterClass.java | 300 +-- .../proto/LineupSlotDataOuterClass.java | 30 +- .../proto/LockEquipmentCsReqOuterClass.java | 30 +- .../proto/LockEquipmentScRspOuterClass.java | 120 +- .../proto/LockRelicCsReqOuterClass.java | 30 +- .../proto/LockRelicScRspOuterClass.java | 126 +- .../proto/MECNPEEJJDEOuterClass.java | 10 +- .../proto/MEMPJPLINCNOuterClass.java | 480 ---- .../proto/MarkReadMailCsReqOuterClass.java | 14 +- .../proto/MarkReadMailScRspOuterClass.java | 14 +- .../lunarcore/proto/MaterialOuterClass.java | 124 +- .../proto/MazeMapDataOuterClass.java | 536 ++-- .../lunarcore/proto/MazePropOuterClass.java | 182 +- .../lunarcore/proto/MissionOuterClass.java | 46 +- .../proto/MonsterArchiveOuterClass.java | 30 +- .../lunarcore/proto/MotionInfoOuterClass.java | 18 +- .../proto/NewMailScNotifyOuterClass.java | 20 +- .../proto/NpcExtraInfoOuterClass.java | 16 +- .../proto/NpcTalkInfoOuterClass.java | 14 +- .../proto/OONJMMOMFHLOuterClass.java | 292 --- .../proto/PVEBattleResultCsReqOuterClass.java | 238 +- .../proto/PVEBattleResultScRspOuterClass.java | 594 ++--- .../lunarcore/proto/PileItemOuterClass.java | 30 +- .../PlayBackGroundMusicCsReqOuterClass.java | 14 +- .../PlayBackGroundMusicScRspOuterClass.java | 46 +- .../proto/PlayerGetTokenCsReqOuterClass.java | 58 +- .../proto/PlayerGetTokenScRspOuterClass.java | 178 +- .../proto/PlayerHeartbeatCsReqOuterClass.java | 14 +- .../proto/PlayerHeartbeatScRspOuterClass.java | 66 +- .../proto/PlayerLoginScRspOuterClass.java | 188 +- .../proto/PlayerSyncScNotifyOuterClass.java | 424 ++-- .../proto/PromoteAvatarCsReqOuterClass.java | 34 +- .../PromoteEquipmentCsReqOuterClass.java | 32 +- .../proto/PropExtraInfoOuterClass.java | 154 +- .../emu/lunarcore/proto/QuestOuterClass.java | 229 +- .../proto/QuitLineupCsReqOuterClass.java | 196 +- .../proto/RankUpAvatarCsReqOuterClass.java | 30 +- .../proto/RankUpEquipmentCsReqOuterClass.java | 32 +- ...eEnterLastElementStageCsReqOuterClass.java | 14 +- ...eEnterLastElementStageScRspOuterClass.java | 138 +- ...RefreshTriggerByClientCsReqOuterClass.java | 58 +- ...reshTriggerByClientScNotifyOuterClass.java | 58 +- ...RefreshTriggerByClientScRspOuterClass.java | 162 +- .../proto/RelicArchiveOuterClass.java | 16 +- .../emu/lunarcore/proto/RelicOuterClass.java | 416 ++-- .../lunarcore/proto/RelicParamOuterClass.java | 30 +- .../proto/ReplaceLineupCsReqOuterClass.java | 216 +- ...ReserveStaminaExchangeCsReqOuterClass.java | 14 +- ...ReserveStaminaExchangeScRspOuterClass.java | 30 +- .../proto/RevcMsgScNotifyOuterClass.java | 186 +- .../proto/RogueAeonInfoOuterClass.java | 121 +- .../lunarcore/proto/RogueAeonOuterClass.java | 187 +- .../RogueCommonPendingActionOuterClass.java | 81 +- .../proto/RogueDialogueEventOuterClass.java | 61 +- .../proto/RogueRoomInfoOuterClass.java | 494 ---- .../proto/RogueUpdateOuterClass.java | 421 ---- .../proto/RotateMapCsReqOuterClass.java | 1395 +++++++++++ .../proto/RotateMapScRspOuterClass.java | 441 ++++ .../proto/RotaterDataOuterClass.java | 420 ++++ .../proto/SceneActorInfoOuterClass.java | 196 +- .../proto/SceneBattleInfoOuterClass.java | 969 +++----- .../proto/SceneCastSkillCsReqOuterClass.java | 244 +- ...neCastSkillMpUpdateScNotifyOuterClass.java | 30 +- .../proto/SceneCastSkillScRspOuterClass.java | 48 +- .../proto/SceneEntityGroupInfoOuterClass.java | 50 +- .../proto/SceneEntityInfoOuterClass.java | 578 ++--- .../proto/SceneEntityMoveCsReqOuterClass.java | 34 +- .../SceneEntityMoveScNotifyOuterClass.java | 168 +- .../SceneEntityRefreshInfoOuterClass.java | 14 +- .../SceneEntityTeleportCsReqOuterClass.java | 363 +++ .../SceneEntityTeleportScRspOuterClass.java | 443 ++++ .../SceneGroupRefreshInfoOuterClass.java | 144 +- .../SceneGroupRefreshScNotifyOuterClass.java | 18 +- .../proto/SceneGroupStateOuterClass.java | 140 +- .../lunarcore/proto/SceneInfoOuterClass.java | 530 ++-- .../proto/SceneMonsterOuterClass.java | 150 +- .../proto/SceneMonsterWaveOuterClass.java | 178 +- .../SceneMonsterWaveParamOuterClass.java | 252 +- .../proto/SceneNpcInfoOuterClass.java | 32 +- .../proto/SceneNpcMonsterInfoOuterClass.java | 184 +- .../ScenePlaneEventScNotifyOuterClass.java | 16 +- .../proto/ScenePropInfoOuterClass.java | 210 +- .../proto/SceneSummonUnitInfoOuterClass.java | 180 +- .../proto/SearchPlayerCsReqOuterClass.java | 20 +- .../proto/SearchPlayerScRspOuterClass.java | 34 +- .../SelectChatBubbleCsReqOuterClass.java | 14 +- .../SelectChatBubbleScRspOuterClass.java | 126 +- .../SelectPhoneThemeCsReqOuterClass.java | 14 +- .../SelectPhoneThemeScRspOuterClass.java | 30 +- .../proto/SellItemCsReqOuterClass.java | 16 +- .../proto/SellItemScRspOuterClass.java | 32 +- .../proto/SendMsgCsReqOuterClass.java | 208 +- .../proto/SetClientPausedCsReqOuterClass.java | 14 +- .../proto/SetClientPausedScRspOuterClass.java | 30 +- .../proto/SetFriendMarkCsReqOuterClass.java | 340 +++ .../proto/SetFriendMarkScRspOuterClass.java | 420 ++++ .../SetGameplayBirthdayScRspOuterClass.java | 124 +- .../proto/SetHeadIconCsReqOuterClass.java | 14 +- .../proto/SetHeadIconScRspOuterClass.java | 30 +- .../SetHeroBasicTypeCsReqOuterClass.java | 14 +- .../SetHeroBasicTypeScRspOuterClass.java | 30 +- .../proto/SetLineupNameCsReqOuterClass.java | 36 +- .../proto/SetLineupNameScRspOuterClass.java | 52 +- .../proto/SetNicknameCsReqOuterClass.java | 20 +- .../proto/SetSignatureCsReqOuterClass.java | 20 +- .../proto/SetSignatureScRspOuterClass.java | 36 +- .../emu/lunarcore/proto/ShopOuterClass.java | 250 +- .../lunarcore/proto/SimpleInfoOuterClass.java | 448 ++-- .../proto/StaminaInfoScNotifyOuterClass.java | 46 +- .../proto/StartChallengeCsReqOuterClass.java | 32 +- .../proto/StartChallengeScRspOuterClass.java | 68 +- ...StartChallengeStoryBuffInfoOuterClass.java | 30 +- .../StartChallengeStoryInfoOuterClass.java | 16 +- .../StartCocoonStageCsReqOuterClass.java | 244 +- .../StartCocoonStageScRspOuterClass.java | 168 +- .../proto/SwapLineupCsReqOuterClass.java | 266 +- .../SwitchLineupIndexCsReqOuterClass.java | 14 +- .../SwitchLineupIndexScRspOuterClass.java | 30 +- .../SyncApplyFriendScNotifyOuterClass.java | 16 +- .../SyncClientResVersionScRspOuterClass.java | 126 +- .../SyncDeleteFriendScNotifyOuterClass.java | 14 +- ...ntityBuffChangeListScNotifyOuterClass.java | 18 +- .../SyncHandleFriendScNotifyOuterClass.java | 48 +- .../proto/SyncLineupNotifyOuterClass.java | 38 +- ...eCommonActionResultScNotifyOuterClass.java | 71 +- ...CommonPendingActionScNotifyOuterClass.java | 81 +- .../TakeChallengeRewardCsReqOuterClass.java | 128 +- .../TakeChallengeRewardScRspOuterClass.java | 192 +- .../TakeMailAttachmentScRspOuterClass.java | 54 +- .../TakeOffEquipmentCsReqOuterClass.java | 14 +- .../proto/TakeOffRelicCsReqOuterClass.java | 36 +- .../TakePromotionRewardCsReqOuterClass.java | 30 +- .../TakePromotionRewardScRspOuterClass.java | 32 +- .../proto/TextJoinQueryCsReqOuterClass.java | 20 +- .../proto/TextJoinQueryScRspOuterClass.java | 34 +- .../UnlockBackGroundMusicCsReqOuterClass.java | 20 +- .../UnlockBackGroundMusicScRspOuterClass.java | 42 +- .../UnlockPhoneThemeScNotifyOuterClass.java | 14 +- .../proto/UnlockSkilltreeCsReqOuterClass.java | 50 +- .../proto/UnlockSkilltreeScRspOuterClass.java | 234 +- .../proto/UnlockedMusicOuterClass.java | 160 +- .../proto/UpdateEnergyScNotifyOuterClass.java | 607 +++++ .../proto/UseItemCsReqOuterClass.java | 270 +- .../proto/UseItemScRspOuterClass.java | 152 +- .../emu/lunarcore/proto/VectorOuterClass.java | 138 +- src/main/java/emu/lunarcore/Config.java | 2 - .../java/emu/lunarcore/GameConstants.java | 4 +- .../java/emu/lunarcore/data/GameDepot.java | 3 +- .../emu/lunarcore/data/ResourceLoader.java | 5 +- .../emu/lunarcore/data/config/FloorInfo.java | 2 + .../emu/lunarcore/data/config/PropInfo.java | 1 + .../data/config/SkillAbilityInfo.java | 2 +- .../ActivityScheduleData.java} | 6 +- .../data/excel/RogueBuffGroupExcel.java | 4 +- .../emu/lunarcore/game/player/Player.java | 21 +- .../game/rogue/RogueBuffSelectMenu.java | 2 +- .../lunarcore/game/rogue/RogueInstance.java | 6 +- .../lunarcore/game/rogue/RogueManager.java | 2 +- .../emu/lunarcore/server/packet/CmdId.java | 2168 +++++++++-------- .../send/PacketGetArchiveDataScRsp.java | 4 + .../send/PacketGetFriendListInfoScRsp.java | 4 +- .../PacketGetRogueBuffEnhanceInfoScRsp.java | 2 +- .../PacketSelectRogueDialogueEventScRsp.java | 2 +- .../send/PacketStaminaInfoScNotify.java | 2 +- ...etSyncRogueCommonActionResultScNotify.java | 4 +- ...tSyncRogueCommonPendingActionScNotify.java | 6 +- ...ketSyncRogueDialogueEventDataScNotify.java | 2 +- 318 files changed, 25596 insertions(+), 25275 deletions(-) delete mode 100644 src/generated/main/emu/lunarcore/proto/AKKLFHFHPFNOuterClass.java rename src/generated/main/emu/lunarcore/proto/{SimpleAvatarInfoOuterClass.java => AssistSimpleInfoOuterClass.java} (61%) delete mode 100644 src/generated/main/emu/lunarcore/proto/BELMNIPGEDNOuterClass.java delete mode 100644 src/generated/main/emu/lunarcore/proto/BattleMechanismBarOuterClass.java create mode 100644 src/generated/main/emu/lunarcore/proto/ChargerInfoOuterClass.java delete mode 100644 src/generated/main/emu/lunarcore/proto/ChessRoguePhaseOuterClass.java delete mode 100644 src/generated/main/emu/lunarcore/proto/ChessRogueQueryInfoOuterClass.java delete mode 100644 src/generated/main/emu/lunarcore/proto/ChessRogueQueryOuterClass.java delete mode 100644 src/generated/main/emu/lunarcore/proto/ChessRogueQueryScRspOuterClass.java delete mode 100644 src/generated/main/emu/lunarcore/proto/CommonRogueQueryOuterClass.java delete mode 100644 src/generated/main/emu/lunarcore/proto/CommonRogueQueryScRspOuterClass.java create mode 100644 src/generated/main/emu/lunarcore/proto/DeactivateFarmElementCsReqOuterClass.java create mode 100644 src/generated/main/emu/lunarcore/proto/DeactivateFarmElementScRspOuterClass.java rename src/generated/main/emu/lunarcore/proto/{OFHBFINPHAGOuterClass.java => DeployRotaterCsReqOuterClass.java} (50%) create mode 100644 src/generated/main/emu/lunarcore/proto/DeployRotaterScRspOuterClass.java create mode 100644 src/generated/main/emu/lunarcore/proto/DoGachaInRollShopCsReqOuterClass.java create mode 100644 src/generated/main/emu/lunarcore/proto/DoGachaInRollShopScRspOuterClass.java rename src/generated/main/emu/lunarcore/proto/{RogueQueryOuterClass.java => EnterMapRotationRegionCsReqOuterClass.java} (51%) create mode 100644 src/generated/main/emu/lunarcore/proto/EnterMapRotationRegionScRspOuterClass.java create mode 100644 src/generated/main/emu/lunarcore/proto/GetRollShopInfoCsReqOuterClass.java create mode 100644 src/generated/main/emu/lunarcore/proto/GetRollShopInfoScRspOuterClass.java rename src/generated/main/emu/lunarcore/proto/{CommonRogueUpdateScNotifyOuterClass.java => InteractChargerCsReqOuterClass.java} (50%) create mode 100644 src/generated/main/emu/lunarcore/proto/InteractChargerScRspOuterClass.java delete mode 100644 src/generated/main/emu/lunarcore/proto/JHAHJFNNGHIOuterClass.java delete mode 100644 src/generated/main/emu/lunarcore/proto/KDHBAHABJMPOuterClass.java delete mode 100644 src/generated/main/emu/lunarcore/proto/MEMPJPLINCNOuterClass.java delete mode 100644 src/generated/main/emu/lunarcore/proto/OONJMMOMFHLOuterClass.java delete mode 100644 src/generated/main/emu/lunarcore/proto/RogueRoomInfoOuterClass.java delete mode 100644 src/generated/main/emu/lunarcore/proto/RogueUpdateOuterClass.java create mode 100644 src/generated/main/emu/lunarcore/proto/RotateMapCsReqOuterClass.java create mode 100644 src/generated/main/emu/lunarcore/proto/RotateMapScRspOuterClass.java create mode 100644 src/generated/main/emu/lunarcore/proto/RotaterDataOuterClass.java create mode 100644 src/generated/main/emu/lunarcore/proto/SceneEntityTeleportCsReqOuterClass.java create mode 100644 src/generated/main/emu/lunarcore/proto/SceneEntityTeleportScRspOuterClass.java create mode 100644 src/generated/main/emu/lunarcore/proto/SetFriendMarkCsReqOuterClass.java create mode 100644 src/generated/main/emu/lunarcore/proto/SetFriendMarkScRspOuterClass.java create mode 100644 src/generated/main/emu/lunarcore/proto/UpdateEnergyScNotifyOuterClass.java rename src/main/java/emu/lunarcore/data/{excel/ActivitySchedulingExcel.java => custom/ActivityScheduleData.java} (59%) diff --git a/src/generated/main/emu/lunarcore/proto/AKKLFHFHPFNOuterClass.java b/src/generated/main/emu/lunarcore/proto/AKKLFHFHPFNOuterClass.java deleted file mode 100644 index 035175762..000000000 --- a/src/generated/main/emu/lunarcore/proto/AKKLFHFHPFNOuterClass.java +++ /dev/null @@ -1,418 +0,0 @@ -// Code generated by protocol buffer compiler. Do not edit! -package emu.lunarcore.proto; - -import java.io.IOException; -import us.hebi.quickbuf.FieldName; -import us.hebi.quickbuf.InvalidProtocolBufferException; -import us.hebi.quickbuf.JsonSink; -import us.hebi.quickbuf.JsonSource; -import us.hebi.quickbuf.MessageFactory; -import us.hebi.quickbuf.ProtoMessage; -import us.hebi.quickbuf.ProtoSink; -import us.hebi.quickbuf.ProtoSource; - -public final class AKKLFHFHPFNOuterClass { - /** - * Protobuf type {@code AKKLFHFHPFN} - */ - public static final class AKKLFHFHPFN extends ProtoMessage implements Cloneable { - private static final long serialVersionUID = 0L; - - /** - * optional uint32 JPEBPGIEGPO = 7; - */ - private int jPEBPGIEGPO; - - /** - * optional uint32 OFBCBEIEAEC = 10; - */ - private int oFBCBEIEAEC; - - /** - * optional bool CGAFFPHCNEA = 12; - */ - private boolean cGAFFPHCNEA; - - private AKKLFHFHPFN() { - } - - /** - * @return a new empty instance of {@code AKKLFHFHPFN} - */ - public static AKKLFHFHPFN newInstance() { - return new AKKLFHFHPFN(); - } - - /** - * optional uint32 JPEBPGIEGPO = 7; - * @return whether the jPEBPGIEGPO field is set - */ - public boolean hasJPEBPGIEGPO() { - return (bitField0_ & 0x00000001) != 0; - } - - /** - * optional uint32 JPEBPGIEGPO = 7; - * @return this - */ - public AKKLFHFHPFN clearJPEBPGIEGPO() { - bitField0_ &= ~0x00000001; - jPEBPGIEGPO = 0; - return this; - } - - /** - * optional uint32 JPEBPGIEGPO = 7; - * @return the jPEBPGIEGPO - */ - public int getJPEBPGIEGPO() { - return jPEBPGIEGPO; - } - - /** - * optional uint32 JPEBPGIEGPO = 7; - * @param value the jPEBPGIEGPO to set - * @return this - */ - public AKKLFHFHPFN setJPEBPGIEGPO(final int value) { - bitField0_ |= 0x00000001; - jPEBPGIEGPO = value; - return this; - } - - /** - * optional uint32 OFBCBEIEAEC = 10; - * @return whether the oFBCBEIEAEC field is set - */ - public boolean hasOFBCBEIEAEC() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 OFBCBEIEAEC = 10; - * @return this - */ - public AKKLFHFHPFN clearOFBCBEIEAEC() { - bitField0_ &= ~0x00000002; - oFBCBEIEAEC = 0; - return this; - } - - /** - * optional uint32 OFBCBEIEAEC = 10; - * @return the oFBCBEIEAEC - */ - public int getOFBCBEIEAEC() { - return oFBCBEIEAEC; - } - - /** - * optional uint32 OFBCBEIEAEC = 10; - * @param value the oFBCBEIEAEC to set - * @return this - */ - public AKKLFHFHPFN setOFBCBEIEAEC(final int value) { - bitField0_ |= 0x00000002; - oFBCBEIEAEC = value; - return this; - } - - /** - * optional bool CGAFFPHCNEA = 12; - * @return whether the cGAFFPHCNEA field is set - */ - public boolean hasCGAFFPHCNEA() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional bool CGAFFPHCNEA = 12; - * @return this - */ - public AKKLFHFHPFN clearCGAFFPHCNEA() { - bitField0_ &= ~0x00000004; - cGAFFPHCNEA = false; - return this; - } - - /** - * optional bool CGAFFPHCNEA = 12; - * @return the cGAFFPHCNEA - */ - public boolean getCGAFFPHCNEA() { - return cGAFFPHCNEA; - } - - /** - * optional bool CGAFFPHCNEA = 12; - * @param value the cGAFFPHCNEA to set - * @return this - */ - public AKKLFHFHPFN setCGAFFPHCNEA(final boolean value) { - bitField0_ |= 0x00000004; - cGAFFPHCNEA = value; - return this; - } - - @Override - public AKKLFHFHPFN copyFrom(final AKKLFHFHPFN other) { - cachedSize = other.cachedSize; - if ((bitField0_ | other.bitField0_) != 0) { - bitField0_ = other.bitField0_; - jPEBPGIEGPO = other.jPEBPGIEGPO; - oFBCBEIEAEC = other.oFBCBEIEAEC; - cGAFFPHCNEA = other.cGAFFPHCNEA; - } - return this; - } - - @Override - public AKKLFHFHPFN mergeFrom(final AKKLFHFHPFN other) { - if (other.isEmpty()) { - return this; - } - cachedSize = -1; - if (other.hasJPEBPGIEGPO()) { - setJPEBPGIEGPO(other.jPEBPGIEGPO); - } - if (other.hasOFBCBEIEAEC()) { - setOFBCBEIEAEC(other.oFBCBEIEAEC); - } - if (other.hasCGAFFPHCNEA()) { - setCGAFFPHCNEA(other.cGAFFPHCNEA); - } - return this; - } - - @Override - public AKKLFHFHPFN clear() { - if (isEmpty()) { - return this; - } - cachedSize = -1; - bitField0_ = 0; - jPEBPGIEGPO = 0; - oFBCBEIEAEC = 0; - cGAFFPHCNEA = false; - return this; - } - - @Override - public AKKLFHFHPFN clearQuick() { - if (isEmpty()) { - return this; - } - cachedSize = -1; - bitField0_ = 0; - return this; - } - - @Override - public boolean equals(Object o) { - if (o == this) { - return true; - } - if (!(o instanceof AKKLFHFHPFN)) { - return false; - } - AKKLFHFHPFN other = (AKKLFHFHPFN) o; - return bitField0_ == other.bitField0_ - && (!hasJPEBPGIEGPO() || jPEBPGIEGPO == other.jPEBPGIEGPO) - && (!hasOFBCBEIEAEC() || oFBCBEIEAEC == other.oFBCBEIEAEC) - && (!hasCGAFFPHCNEA() || cGAFFPHCNEA == other.cGAFFPHCNEA); - } - - @Override - public void writeTo(final ProtoSink output) throws IOException { - if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 56); - output.writeUInt32NoTag(jPEBPGIEGPO); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 80); - output.writeUInt32NoTag(oFBCBEIEAEC); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 96); - output.writeBoolNoTag(cGAFFPHCNEA); - } - } - - @Override - protected int computeSerializedSize() { - int size = 0; - if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(jPEBPGIEGPO); - } - if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(oFBCBEIEAEC); - } - if ((bitField0_ & 0x00000004) != 0) { - size += 2; - } - return size; - } - - @Override - @SuppressWarnings("fallthrough") - public AKKLFHFHPFN mergeFrom(final ProtoSource input) throws IOException { - // Enabled Fall-Through Optimization (QuickBuffers) - int tag = input.readTag(); - while (true) { - switch (tag) { - case 56: { - // jPEBPGIEGPO - jPEBPGIEGPO = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 80) { - break; - } - } - case 80: { - // oFBCBEIEAEC - oFBCBEIEAEC = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 96) { - break; - } - } - case 96: { - // cGAFFPHCNEA - cGAFFPHCNEA = input.readBool(); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 0) { - break; - } - } - case 0: { - return this; - } - default: { - if (!input.skipField(tag)) { - return this; - } - tag = input.readTag(); - break; - } - } - } - } - - @Override - public void writeTo(final JsonSink output) throws IOException { - output.beginObject(); - if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.jPEBPGIEGPO, jPEBPGIEGPO); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.oFBCBEIEAEC, oFBCBEIEAEC); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeBool(FieldNames.cGAFFPHCNEA, cGAFFPHCNEA); - } - output.endObject(); - } - - @Override - public AKKLFHFHPFN mergeFrom(final JsonSource input) throws IOException { - if (!input.beginObject()) { - return this; - } - while (!input.isAtEnd()) { - switch (input.readFieldHash()) { - case 617496720: { - if (input.isAtField(FieldNames.jPEBPGIEGPO)) { - if (!input.trySkipNullValue()) { - jPEBPGIEGPO = input.readUInt32(); - bitField0_ |= 0x00000001; - } - } else { - input.skipUnknownField(); - } - break; - } - case 1165634632: { - if (input.isAtField(FieldNames.oFBCBEIEAEC)) { - if (!input.trySkipNullValue()) { - oFBCBEIEAEC = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } - case -927350692: { - if (input.isAtField(FieldNames.cGAFFPHCNEA)) { - if (!input.trySkipNullValue()) { - cGAFFPHCNEA = input.readBool(); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } - default: { - input.skipUnknownField(); - break; - } - } - } - input.endObject(); - return this; - } - - @Override - public AKKLFHFHPFN clone() { - return new AKKLFHFHPFN().copyFrom(this); - } - - @Override - public boolean isEmpty() { - return ((bitField0_) == 0); - } - - public static AKKLFHFHPFN parseFrom(final byte[] data) throws InvalidProtocolBufferException { - return ProtoMessage.mergeFrom(new AKKLFHFHPFN(), data).checkInitialized(); - } - - public static AKKLFHFHPFN parseFrom(final ProtoSource input) throws IOException { - return ProtoMessage.mergeFrom(new AKKLFHFHPFN(), input).checkInitialized(); - } - - public static AKKLFHFHPFN parseFrom(final JsonSource input) throws IOException { - return ProtoMessage.mergeFrom(new AKKLFHFHPFN(), input).checkInitialized(); - } - - /** - * @return factory for creating AKKLFHFHPFN messages - */ - public static MessageFactory getFactory() { - return AKKLFHFHPFNFactory.INSTANCE; - } - - private enum AKKLFHFHPFNFactory implements MessageFactory { - INSTANCE; - - @Override - public AKKLFHFHPFN create() { - return AKKLFHFHPFN.newInstance(); - } - } - - /** - * Contains name constants used for serializing JSON - */ - static class FieldNames { - static final FieldName jPEBPGIEGPO = FieldName.forField("JPEBPGIEGPO"); - - static final FieldName oFBCBEIEAEC = FieldName.forField("OFBCBEIEAEC"); - - static final FieldName cGAFFPHCNEA = FieldName.forField("CGAFFPHCNEA"); - } - } -} diff --git a/src/generated/main/emu/lunarcore/proto/ActivateFarmElementCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/ActivateFarmElementCsReqOuterClass.java index 9a445fd0d..6cdb15f2b 100644 --- a/src/generated/main/emu/lunarcore/proto/ActivateFarmElementCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ActivateFarmElementCsReqOuterClass.java @@ -19,14 +19,14 @@ public static final class ActivateFarmElementCsReq extends ProtoMessageoptional uint32 world_level = 4; + * optional uint32 entity_id = 3; */ - private int worldLevel; + private int entityId; /** - * optional uint32 entity_id = 6; + * optional uint32 world_level = 5; */ - private int entityId; + private int worldLevel; private ActivateFarmElementCsReq() { } @@ -39,76 +39,76 @@ public static ActivateFarmElementCsReq newInstance() { } /** - * optional uint32 world_level = 4; - * @return whether the worldLevel field is set + * optional uint32 entity_id = 3; + * @return whether the entityId field is set */ - public boolean hasWorldLevel() { + public boolean hasEntityId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 world_level = 4; + * optional uint32 entity_id = 3; * @return this */ - public ActivateFarmElementCsReq clearWorldLevel() { + public ActivateFarmElementCsReq clearEntityId() { bitField0_ &= ~0x00000001; - worldLevel = 0; + entityId = 0; return this; } /** - * optional uint32 world_level = 4; - * @return the worldLevel + * optional uint32 entity_id = 3; + * @return the entityId */ - public int getWorldLevel() { - return worldLevel; + public int getEntityId() { + return entityId; } /** - * optional uint32 world_level = 4; - * @param value the worldLevel to set + * optional uint32 entity_id = 3; + * @param value the entityId to set * @return this */ - public ActivateFarmElementCsReq setWorldLevel(final int value) { + public ActivateFarmElementCsReq setEntityId(final int value) { bitField0_ |= 0x00000001; - worldLevel = value; + entityId = value; return this; } /** - * optional uint32 entity_id = 6; - * @return whether the entityId field is set + * optional uint32 world_level = 5; + * @return whether the worldLevel field is set */ - public boolean hasEntityId() { + public boolean hasWorldLevel() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 entity_id = 6; + * optional uint32 world_level = 5; * @return this */ - public ActivateFarmElementCsReq clearEntityId() { + public ActivateFarmElementCsReq clearWorldLevel() { bitField0_ &= ~0x00000002; - entityId = 0; + worldLevel = 0; return this; } /** - * optional uint32 entity_id = 6; - * @return the entityId + * optional uint32 world_level = 5; + * @return the worldLevel */ - public int getEntityId() { - return entityId; + public int getWorldLevel() { + return worldLevel; } /** - * optional uint32 entity_id = 6; - * @param value the entityId to set + * optional uint32 world_level = 5; + * @param value the worldLevel to set * @return this */ - public ActivateFarmElementCsReq setEntityId(final int value) { + public ActivateFarmElementCsReq setWorldLevel(final int value) { bitField0_ |= 0x00000002; - entityId = value; + worldLevel = value; return this; } @@ -117,8 +117,8 @@ public ActivateFarmElementCsReq copyFrom(final ActivateFarmElementCsReq other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - worldLevel = other.worldLevel; entityId = other.entityId; + worldLevel = other.worldLevel; } return this; } @@ -129,12 +129,12 @@ public ActivateFarmElementCsReq mergeFrom(final ActivateFarmElementCsReq other) return this; } cachedSize = -1; - if (other.hasWorldLevel()) { - setWorldLevel(other.worldLevel); - } if (other.hasEntityId()) { setEntityId(other.entityId); } + if (other.hasWorldLevel()) { + setWorldLevel(other.worldLevel); + } return this; } @@ -145,8 +145,8 @@ public ActivateFarmElementCsReq clear() { } cachedSize = -1; bitField0_ = 0; - worldLevel = 0; entityId = 0; + worldLevel = 0; return this; } @@ -170,19 +170,19 @@ public boolean equals(Object o) { } ActivateFarmElementCsReq other = (ActivateFarmElementCsReq) o; return bitField0_ == other.bitField0_ - && (!hasWorldLevel() || worldLevel == other.worldLevel) - && (!hasEntityId() || entityId == other.entityId); + && (!hasEntityId() || entityId == other.entityId) + && (!hasWorldLevel() || worldLevel == other.worldLevel); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); - output.writeUInt32NoTag(worldLevel); + output.writeRawByte((byte) 24); + output.writeUInt32NoTag(entityId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 48); - output.writeUInt32NoTag(entityId); + output.writeRawByte((byte) 40); + output.writeUInt32NoTag(worldLevel); } } @@ -190,10 +190,10 @@ public void writeTo(final ProtoSink output) throws IOException { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(worldLevel); + size += 1 + ProtoSink.computeUInt32SizeNoTag(entityId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(entityId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(worldLevel); } return size; } @@ -205,18 +205,18 @@ public ActivateFarmElementCsReq mergeFrom(final ProtoSource input) throws IOExce int tag = input.readTag(); while (true) { switch (tag) { - case 32: { - // worldLevel - worldLevel = input.readUInt32(); + case 24: { + // entityId + entityId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 48) { + if (tag != 40) { break; } } - case 48: { - // entityId - entityId = input.readUInt32(); + case 40: { + // worldLevel + worldLevel = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -241,10 +241,10 @@ public ActivateFarmElementCsReq mergeFrom(final ProtoSource input) throws IOExce public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.worldLevel, worldLevel); + output.writeUInt32(FieldNames.entityId, entityId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.entityId, entityId); + output.writeUInt32(FieldNames.worldLevel, worldLevel); } output.endObject(); } @@ -256,11 +256,11 @@ public ActivateFarmElementCsReq mergeFrom(final JsonSource input) throws IOExcep } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 440007442: - case 1305257111: { - if (input.isAtField(FieldNames.worldLevel)) { + case -2102099874: + case -740565257: { + if (input.isAtField(FieldNames.entityId)) { if (!input.trySkipNullValue()) { - worldLevel = input.readUInt32(); + entityId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -268,11 +268,11 @@ public ActivateFarmElementCsReq mergeFrom(final JsonSource input) throws IOExcep } break; } - case -2102099874: - case -740565257: { - if (input.isAtField(FieldNames.entityId)) { + case 440007442: + case 1305257111: { + if (input.isAtField(FieldNames.worldLevel)) { if (!input.trySkipNullValue()) { - entityId = input.readUInt32(); + worldLevel = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -333,9 +333,9 @@ public ActivateFarmElementCsReq create() { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName worldLevel = FieldName.forField("worldLevel", "world_level"); - static final FieldName entityId = FieldName.forField("entityId", "entity_id"); + + static final FieldName worldLevel = FieldName.forField("worldLevel", "world_level"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/ActivateFarmElementScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/ActivateFarmElementScRspOuterClass.java index 859febdf7..08308d9ec 100644 --- a/src/generated/main/emu/lunarcore/proto/ActivateFarmElementScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ActivateFarmElementScRspOuterClass.java @@ -19,17 +19,17 @@ public static final class ActivateFarmElementScRsp extends ProtoMessageoptional uint32 entity_id = 6; + * optional uint32 world_level = 1; */ - private int entityId; + private int worldLevel; /** - * optional uint32 world_level = 13; + * optional uint32 entity_id = 4; */ - private int worldLevel; + private int entityId; /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 5; */ private int retcode; @@ -44,81 +44,81 @@ public static ActivateFarmElementScRsp newInstance() { } /** - * optional uint32 entity_id = 6; - * @return whether the entityId field is set + * optional uint32 world_level = 1; + * @return whether the worldLevel field is set */ - public boolean hasEntityId() { + public boolean hasWorldLevel() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 entity_id = 6; + * optional uint32 world_level = 1; * @return this */ - public ActivateFarmElementScRsp clearEntityId() { + public ActivateFarmElementScRsp clearWorldLevel() { bitField0_ &= ~0x00000001; - entityId = 0; + worldLevel = 0; return this; } /** - * optional uint32 entity_id = 6; - * @return the entityId + * optional uint32 world_level = 1; + * @return the worldLevel */ - public int getEntityId() { - return entityId; + public int getWorldLevel() { + return worldLevel; } /** - * optional uint32 entity_id = 6; - * @param value the entityId to set + * optional uint32 world_level = 1; + * @param value the worldLevel to set * @return this */ - public ActivateFarmElementScRsp setEntityId(final int value) { + public ActivateFarmElementScRsp setWorldLevel(final int value) { bitField0_ |= 0x00000001; - entityId = value; + worldLevel = value; return this; } /** - * optional uint32 world_level = 13; - * @return whether the worldLevel field is set + * optional uint32 entity_id = 4; + * @return whether the entityId field is set */ - public boolean hasWorldLevel() { + public boolean hasEntityId() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 world_level = 13; + * optional uint32 entity_id = 4; * @return this */ - public ActivateFarmElementScRsp clearWorldLevel() { + public ActivateFarmElementScRsp clearEntityId() { bitField0_ &= ~0x00000002; - worldLevel = 0; + entityId = 0; return this; } /** - * optional uint32 world_level = 13; - * @return the worldLevel + * optional uint32 entity_id = 4; + * @return the entityId */ - public int getWorldLevel() { - return worldLevel; + public int getEntityId() { + return entityId; } /** - * optional uint32 world_level = 13; - * @param value the worldLevel to set + * optional uint32 entity_id = 4; + * @param value the entityId to set * @return this */ - public ActivateFarmElementScRsp setWorldLevel(final int value) { + public ActivateFarmElementScRsp setEntityId(final int value) { bitField0_ |= 0x00000002; - worldLevel = value; + entityId = value; return this; } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 5; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -126,7 +126,7 @@ public boolean hasRetcode() { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 5; * @return this */ public ActivateFarmElementScRsp clearRetcode() { @@ -136,7 +136,7 @@ public ActivateFarmElementScRsp clearRetcode() { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 5; * @return the retcode */ public int getRetcode() { @@ -144,7 +144,7 @@ public int getRetcode() { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 5; * @param value the retcode to set * @return this */ @@ -159,8 +159,8 @@ public ActivateFarmElementScRsp copyFrom(final ActivateFarmElementScRsp other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - entityId = other.entityId; worldLevel = other.worldLevel; + entityId = other.entityId; retcode = other.retcode; } return this; @@ -172,12 +172,12 @@ public ActivateFarmElementScRsp mergeFrom(final ActivateFarmElementScRsp other) return this; } cachedSize = -1; - if (other.hasEntityId()) { - setEntityId(other.entityId); - } if (other.hasWorldLevel()) { setWorldLevel(other.worldLevel); } + if (other.hasEntityId()) { + setEntityId(other.entityId); + } if (other.hasRetcode()) { setRetcode(other.retcode); } @@ -191,8 +191,8 @@ public ActivateFarmElementScRsp clear() { } cachedSize = -1; bitField0_ = 0; - entityId = 0; worldLevel = 0; + entityId = 0; retcode = 0; return this; } @@ -217,23 +217,23 @@ public boolean equals(Object o) { } ActivateFarmElementScRsp other = (ActivateFarmElementScRsp) o; return bitField0_ == other.bitField0_ - && (!hasEntityId() || entityId == other.entityId) && (!hasWorldLevel() || worldLevel == other.worldLevel) + && (!hasEntityId() || entityId == other.entityId) && (!hasRetcode() || retcode == other.retcode); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 48); - output.writeUInt32NoTag(entityId); + output.writeRawByte((byte) 8); + output.writeUInt32NoTag(worldLevel); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 104); - output.writeUInt32NoTag(worldLevel); + output.writeRawByte((byte) 32); + output.writeUInt32NoTag(entityId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(retcode); } } @@ -242,10 +242,10 @@ public void writeTo(final ProtoSink output) throws IOException { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(entityId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(worldLevel); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(worldLevel); + size += 1 + ProtoSink.computeUInt32SizeNoTag(entityId); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); @@ -260,25 +260,25 @@ public ActivateFarmElementScRsp mergeFrom(final ProtoSource input) throws IOExce int tag = input.readTag(); while (true) { switch (tag) { - case 48: { - // entityId - entityId = input.readUInt32(); + case 8: { + // worldLevel + worldLevel = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 104) { + if (tag != 32) { break; } } - case 104: { - // worldLevel - worldLevel = input.readUInt32(); + case 32: { + // entityId + entityId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 120) { + if (tag != 40) { break; } } - case 120: { + case 40: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000004; @@ -305,10 +305,10 @@ public ActivateFarmElementScRsp mergeFrom(final ProtoSource input) throws IOExce public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.entityId, entityId); + output.writeUInt32(FieldNames.worldLevel, worldLevel); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.worldLevel, worldLevel); + output.writeUInt32(FieldNames.entityId, entityId); } if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.retcode, retcode); @@ -323,11 +323,11 @@ public ActivateFarmElementScRsp mergeFrom(final JsonSource input) throws IOExcep } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -2102099874: - case -740565257: { - if (input.isAtField(FieldNames.entityId)) { + case 440007442: + case 1305257111: { + if (input.isAtField(FieldNames.worldLevel)) { if (!input.trySkipNullValue()) { - entityId = input.readUInt32(); + worldLevel = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -335,11 +335,11 @@ public ActivateFarmElementScRsp mergeFrom(final JsonSource input) throws IOExcep } break; } - case 440007442: - case 1305257111: { - if (input.isAtField(FieldNames.worldLevel)) { + case -2102099874: + case -740565257: { + if (input.isAtField(FieldNames.entityId)) { if (!input.trySkipNullValue()) { - worldLevel = input.readUInt32(); + entityId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -411,10 +411,10 @@ public ActivateFarmElementScRsp create() { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName entityId = FieldName.forField("entityId", "entity_id"); - static final FieldName worldLevel = FieldName.forField("worldLevel", "world_level"); + static final FieldName entityId = FieldName.forField("entityId", "entity_id"); + static final FieldName retcode = FieldName.forField("retcode"); } } diff --git a/src/generated/main/emu/lunarcore/proto/ActivityScheduleInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/ActivityScheduleInfoOuterClass.java index 66cd6eca8..430827a06 100644 --- a/src/generated/main/emu/lunarcore/proto/ActivityScheduleInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ActivityScheduleInfoOuterClass.java @@ -19,25 +19,25 @@ public static final class ActivityScheduleInfo extends ProtoMessageoptional int64 end_time = 3; - */ - private long endTime; - - /** - * optional int64 begin_time = 8; + * optional int64 begin_time = 6; */ private long beginTime; /** - * optional uint32 activity_id = 1; + * optional int64 end_time = 7; */ - private int activityId; + private long endTime; /** * optional uint32 module_id = 5; */ private int moduleId; + /** + * optional uint32 activity_id = 12; + */ + private int activityId; + private ActivityScheduleInfo() { } @@ -49,150 +49,150 @@ public static ActivityScheduleInfo newInstance() { } /** - * optional int64 end_time = 3; - * @return whether the endTime field is set + * optional int64 begin_time = 6; + * @return whether the beginTime field is set */ - public boolean hasEndTime() { + public boolean hasBeginTime() { return (bitField0_ & 0x00000001) != 0; } /** - * optional int64 end_time = 3; + * optional int64 begin_time = 6; * @return this */ - public ActivityScheduleInfo clearEndTime() { + public ActivityScheduleInfo clearBeginTime() { bitField0_ &= ~0x00000001; - endTime = 0L; + beginTime = 0L; return this; } /** - * optional int64 end_time = 3; - * @return the endTime + * optional int64 begin_time = 6; + * @return the beginTime */ - public long getEndTime() { - return endTime; + public long getBeginTime() { + return beginTime; } /** - * optional int64 end_time = 3; - * @param value the endTime to set + * optional int64 begin_time = 6; + * @param value the beginTime to set * @return this */ - public ActivityScheduleInfo setEndTime(final long value) { + public ActivityScheduleInfo setBeginTime(final long value) { bitField0_ |= 0x00000001; - endTime = value; + beginTime = value; return this; } /** - * optional int64 begin_time = 8; - * @return whether the beginTime field is set + * optional int64 end_time = 7; + * @return whether the endTime field is set */ - public boolean hasBeginTime() { + public boolean hasEndTime() { return (bitField0_ & 0x00000002) != 0; } /** - * optional int64 begin_time = 8; + * optional int64 end_time = 7; * @return this */ - public ActivityScheduleInfo clearBeginTime() { + public ActivityScheduleInfo clearEndTime() { bitField0_ &= ~0x00000002; - beginTime = 0L; + endTime = 0L; return this; } /** - * optional int64 begin_time = 8; - * @return the beginTime + * optional int64 end_time = 7; + * @return the endTime */ - public long getBeginTime() { - return beginTime; + public long getEndTime() { + return endTime; } /** - * optional int64 begin_time = 8; - * @param value the beginTime to set + * optional int64 end_time = 7; + * @param value the endTime to set * @return this */ - public ActivityScheduleInfo setBeginTime(final long value) { + public ActivityScheduleInfo setEndTime(final long value) { bitField0_ |= 0x00000002; - beginTime = value; + endTime = value; return this; } /** - * optional uint32 activity_id = 1; - * @return whether the activityId field is set + * optional uint32 module_id = 5; + * @return whether the moduleId field is set */ - public boolean hasActivityId() { + public boolean hasModuleId() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 activity_id = 1; + * optional uint32 module_id = 5; * @return this */ - public ActivityScheduleInfo clearActivityId() { + public ActivityScheduleInfo clearModuleId() { bitField0_ &= ~0x00000004; - activityId = 0; + moduleId = 0; return this; } /** - * optional uint32 activity_id = 1; - * @return the activityId + * optional uint32 module_id = 5; + * @return the moduleId */ - public int getActivityId() { - return activityId; + public int getModuleId() { + return moduleId; } /** - * optional uint32 activity_id = 1; - * @param value the activityId to set + * optional uint32 module_id = 5; + * @param value the moduleId to set * @return this */ - public ActivityScheduleInfo setActivityId(final int value) { + public ActivityScheduleInfo setModuleId(final int value) { bitField0_ |= 0x00000004; - activityId = value; + moduleId = value; return this; } /** - * optional uint32 module_id = 5; - * @return whether the moduleId field is set + * optional uint32 activity_id = 12; + * @return whether the activityId field is set */ - public boolean hasModuleId() { + public boolean hasActivityId() { return (bitField0_ & 0x00000008) != 0; } /** - * optional uint32 module_id = 5; + * optional uint32 activity_id = 12; * @return this */ - public ActivityScheduleInfo clearModuleId() { + public ActivityScheduleInfo clearActivityId() { bitField0_ &= ~0x00000008; - moduleId = 0; + activityId = 0; return this; } /** - * optional uint32 module_id = 5; - * @return the moduleId + * optional uint32 activity_id = 12; + * @return the activityId */ - public int getModuleId() { - return moduleId; + public int getActivityId() { + return activityId; } /** - * optional uint32 module_id = 5; - * @param value the moduleId to set + * optional uint32 activity_id = 12; + * @param value the activityId to set * @return this */ - public ActivityScheduleInfo setModuleId(final int value) { + public ActivityScheduleInfo setActivityId(final int value) { bitField0_ |= 0x00000008; - moduleId = value; + activityId = value; return this; } @@ -201,10 +201,10 @@ public ActivityScheduleInfo copyFrom(final ActivityScheduleInfo other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - endTime = other.endTime; beginTime = other.beginTime; - activityId = other.activityId; + endTime = other.endTime; moduleId = other.moduleId; + activityId = other.activityId; } return this; } @@ -215,18 +215,18 @@ public ActivityScheduleInfo mergeFrom(final ActivityScheduleInfo other) { return this; } cachedSize = -1; - if (other.hasEndTime()) { - setEndTime(other.endTime); - } if (other.hasBeginTime()) { setBeginTime(other.beginTime); } - if (other.hasActivityId()) { - setActivityId(other.activityId); + if (other.hasEndTime()) { + setEndTime(other.endTime); } if (other.hasModuleId()) { setModuleId(other.moduleId); } + if (other.hasActivityId()) { + setActivityId(other.activityId); + } return this; } @@ -237,10 +237,10 @@ public ActivityScheduleInfo clear() { } cachedSize = -1; bitField0_ = 0; - endTime = 0L; beginTime = 0L; - activityId = 0; + endTime = 0L; moduleId = 0; + activityId = 0; return this; } @@ -264,46 +264,46 @@ public boolean equals(Object o) { } ActivityScheduleInfo other = (ActivityScheduleInfo) o; return bitField0_ == other.bitField0_ - && (!hasEndTime() || endTime == other.endTime) && (!hasBeginTime() || beginTime == other.beginTime) - && (!hasActivityId() || activityId == other.activityId) - && (!hasModuleId() || moduleId == other.moduleId); + && (!hasEndTime() || endTime == other.endTime) + && (!hasModuleId() || moduleId == other.moduleId) + && (!hasActivityId() || activityId == other.activityId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); - output.writeInt64NoTag(endTime); + output.writeRawByte((byte) 48); + output.writeInt64NoTag(beginTime); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 64); - output.writeInt64NoTag(beginTime); + output.writeRawByte((byte) 56); + output.writeInt64NoTag(endTime); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 8); - output.writeUInt32NoTag(activityId); - } - if ((bitField0_ & 0x00000008) != 0) { output.writeRawByte((byte) 40); output.writeUInt32NoTag(moduleId); } + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 96); + output.writeUInt32NoTag(activityId); + } } @Override protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeInt64SizeNoTag(endTime); + size += 1 + ProtoSink.computeInt64SizeNoTag(beginTime); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeInt64SizeNoTag(beginTime); + size += 1 + ProtoSink.computeInt64SizeNoTag(endTime); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(activityId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(moduleId); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(moduleId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(activityId); } return size; } @@ -315,36 +315,36 @@ public ActivityScheduleInfo mergeFrom(final ProtoSource input) throws IOExceptio int tag = input.readTag(); while (true) { switch (tag) { - case 24: { - // endTime - endTime = input.readInt64(); + case 48: { + // beginTime + beginTime = input.readInt64(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 64) { + if (tag != 56) { break; } } - case 64: { - // beginTime - beginTime = input.readInt64(); + case 56: { + // endTime + endTime = input.readInt64(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 8) { + if (tag != 40) { break; } } - case 8: { - // activityId - activityId = input.readUInt32(); + case 40: { + // moduleId + moduleId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 40) { + if (tag != 96) { break; } } - case 40: { - // moduleId - moduleId = input.readUInt32(); + case 96: { + // activityId + activityId = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); if (tag != 0) { @@ -369,16 +369,16 @@ public ActivityScheduleInfo mergeFrom(final ProtoSource input) throws IOExceptio public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeInt64(FieldNames.endTime, endTime); + output.writeInt64(FieldNames.beginTime, beginTime); } if ((bitField0_ & 0x00000002) != 0) { - output.writeInt64(FieldNames.beginTime, beginTime); + output.writeInt64(FieldNames.endTime, endTime); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.activityId, activityId); + output.writeUInt32(FieldNames.moduleId, moduleId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.moduleId, moduleId); + output.writeUInt32(FieldNames.activityId, activityId); } output.endObject(); } @@ -390,11 +390,11 @@ public ActivityScheduleInfo mergeFrom(final JsonSource input) throws IOException } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1607243192: - case 1725551537: { - if (input.isAtField(FieldNames.endTime)) { + case -1072839914: + case 1112183971: { + if (input.isAtField(FieldNames.beginTime)) { if (!input.trySkipNullValue()) { - endTime = input.readInt64(); + beginTime = input.readInt64(); bitField0_ |= 0x00000001; } } else { @@ -402,11 +402,11 @@ public ActivityScheduleInfo mergeFrom(final JsonSource input) throws IOException } break; } - case -1072839914: - case 1112183971: { - if (input.isAtField(FieldNames.beginTime)) { + case -1607243192: + case 1725551537: { + if (input.isAtField(FieldNames.endTime)) { if (!input.trySkipNullValue()) { - beginTime = input.readInt64(); + endTime = input.readInt64(); bitField0_ |= 0x00000002; } } else { @@ -414,11 +414,11 @@ public ActivityScheduleInfo mergeFrom(final JsonSource input) throws IOException } break; } - case 2048619658: - case -917278645: { - if (input.isAtField(FieldNames.activityId)) { + case -604257113: + case -1552079922: { + if (input.isAtField(FieldNames.moduleId)) { if (!input.trySkipNullValue()) { - activityId = input.readUInt32(); + moduleId = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -426,11 +426,11 @@ public ActivityScheduleInfo mergeFrom(final JsonSource input) throws IOException } break; } - case -604257113: - case -1552079922: { - if (input.isAtField(FieldNames.moduleId)) { + case 2048619658: + case -917278645: { + if (input.isAtField(FieldNames.activityId)) { if (!input.trySkipNullValue()) { - moduleId = input.readUInt32(); + activityId = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -491,13 +491,13 @@ public ActivityScheduleInfo create() { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName endTime = FieldName.forField("endTime", "end_time"); - static final FieldName beginTime = FieldName.forField("beginTime", "begin_time"); - static final FieldName activityId = FieldName.forField("activityId", "activity_id"); + static final FieldName endTime = FieldName.forField("endTime", "end_time"); static final FieldName moduleId = FieldName.forField("moduleId", "module_id"); + + static final FieldName activityId = FieldName.forField("activityId", "activity_id"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/ApplyFriendCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/ApplyFriendCsReqOuterClass.java index 5379d6cd6..40def8742 100644 --- a/src/generated/main/emu/lunarcore/proto/ApplyFriendCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ApplyFriendCsReqOuterClass.java @@ -19,12 +19,12 @@ public static final class ApplyFriendCsReq extends ProtoMessageoptional uint32 uid = 11; + * optional uint32 uid = 5; */ private int uid; /** - * optional .FriendApplySource source = 12; + * optional .FriendApplySource source = 14; */ private int source; @@ -39,7 +39,7 @@ public static ApplyFriendCsReq newInstance() { } /** - * optional uint32 uid = 11; + * optional uint32 uid = 5; * @return whether the uid field is set */ public boolean hasUid() { @@ -47,7 +47,7 @@ public boolean hasUid() { } /** - * optional uint32 uid = 11; + * optional uint32 uid = 5; * @return this */ public ApplyFriendCsReq clearUid() { @@ -57,7 +57,7 @@ public ApplyFriendCsReq clearUid() { } /** - * optional uint32 uid = 11; + * optional uint32 uid = 5; * @return the uid */ public int getUid() { @@ -65,7 +65,7 @@ public int getUid() { } /** - * optional uint32 uid = 11; + * optional uint32 uid = 5; * @param value the uid to set * @return this */ @@ -76,7 +76,7 @@ public ApplyFriendCsReq setUid(final int value) { } /** - * optional .FriendApplySource source = 12; + * optional .FriendApplySource source = 14; * @return whether the source field is set */ public boolean hasSource() { @@ -84,7 +84,7 @@ public boolean hasSource() { } /** - * optional .FriendApplySource source = 12; + * optional .FriendApplySource source = 14; * @return this */ public ApplyFriendCsReq clearSource() { @@ -94,7 +94,7 @@ public ApplyFriendCsReq clearSource() { } /** - * optional .FriendApplySource source = 12; + * optional .FriendApplySource source = 14; * @return the source */ public FriendApplySourceOuterClass.FriendApplySource getSource() { @@ -127,7 +127,7 @@ public ApplyFriendCsReq setSourceValue(final int value) { } /** - * optional .FriendApplySource source = 12; + * optional .FriendApplySource source = 14; * @param value the source to set * @return this */ @@ -202,11 +202,11 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(uid); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 112); output.writeEnumNoTag(source); } } @@ -230,16 +230,16 @@ public ApplyFriendCsReq mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 88: { + case 40: { // uid uid = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 96) { + if (tag != 112) { break; } } - case 96: { + case 112: { // source final int value = input.readInt32(); if (FriendApplySourceOuterClass.FriendApplySource.forNumber(value) != null) { diff --git a/src/generated/main/emu/lunarcore/proto/ArchiveDataOuterClass.java b/src/generated/main/emu/lunarcore/proto/ArchiveDataOuterClass.java index 049a1c0bc..123f0f146 100644 --- a/src/generated/main/emu/lunarcore/proto/ArchiveDataOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ArchiveDataOuterClass.java @@ -21,17 +21,22 @@ public static final class ArchiveData extends ProtoMessage implemen private static final long serialVersionUID = 0L; /** - * repeated uint32 archive_avatar_id_list = 7; + * repeated uint32 OJJBNFPBCKK = 4; */ - private final RepeatedInt archiveAvatarIdList = RepeatedInt.newEmptyInstance(); + private final RepeatedInt oJJBNFPBCKK = RepeatedInt.newEmptyInstance(); /** - * repeated uint32 archive_equipment_id_list = 10; + * repeated uint32 CMDMBOMOGIB = 7; */ - private final RepeatedInt archiveEquipmentIdList = RepeatedInt.newEmptyInstance(); + private final RepeatedInt cMDMBOMOGIB = RepeatedInt.newEmptyInstance(); /** - * repeated .RelicArchive relic_list = 3; + * repeated uint32 ALFCBHACGFO = 11; + */ + private final RepeatedInt aLFCBHACGFO = RepeatedInt.newEmptyInstance(); + + /** + * repeated .RelicArchive relic_list = 1; */ private final RepeatedMessage relicList = RepeatedMessage.newEmptyInstance(RelicArchiveOuterClass.RelicArchive.getFactory()); @@ -51,39 +56,39 @@ public static ArchiveData newInstance() { } /** - * repeated uint32 archive_avatar_id_list = 7; - * @return whether the archiveAvatarIdList field is set + * repeated uint32 OJJBNFPBCKK = 4; + * @return whether the oJJBNFPBCKK field is set */ - public boolean hasArchiveAvatarIdList() { + public boolean hasOJJBNFPBCKK() { return (bitField0_ & 0x00000001) != 0; } /** - * repeated uint32 archive_avatar_id_list = 7; + * repeated uint32 OJJBNFPBCKK = 4; * @return this */ - public ArchiveData clearArchiveAvatarIdList() { + public ArchiveData clearOJJBNFPBCKK() { bitField0_ &= ~0x00000001; - archiveAvatarIdList.clear(); + oJJBNFPBCKK.clear(); return this; } /** - * repeated uint32 archive_avatar_id_list = 7; + * repeated uint32 OJJBNFPBCKK = 4; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. * - * Use {@link #getMutableArchiveAvatarIdList()} if you want to modify it. + * Use {@link #getMutableOJJBNFPBCKK()} if you want to modify it. * * @return internal storage object for reading */ - public RepeatedInt getArchiveAvatarIdList() { - return archiveAvatarIdList; + public RepeatedInt getOJJBNFPBCKK() { + return oJJBNFPBCKK; } /** - * repeated uint32 archive_avatar_id_list = 7; + * repeated uint32 OJJBNFPBCKK = 4; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -91,67 +96,67 @@ public RepeatedInt getArchiveAvatarIdList() { * * @return internal storage object for modifications */ - public RepeatedInt getMutableArchiveAvatarIdList() { + public RepeatedInt getMutableOJJBNFPBCKK() { bitField0_ |= 0x00000001; - return archiveAvatarIdList; + return oJJBNFPBCKK; } /** - * repeated uint32 archive_avatar_id_list = 7; - * @param value the archiveAvatarIdList to add + * repeated uint32 OJJBNFPBCKK = 4; + * @param value the oJJBNFPBCKK to add * @return this */ - public ArchiveData addArchiveAvatarIdList(final int value) { + public ArchiveData addOJJBNFPBCKK(final int value) { bitField0_ |= 0x00000001; - archiveAvatarIdList.add(value); + oJJBNFPBCKK.add(value); return this; } /** - * repeated uint32 archive_avatar_id_list = 7; - * @param values the archiveAvatarIdList to add + * repeated uint32 OJJBNFPBCKK = 4; + * @param values the oJJBNFPBCKK to add * @return this */ - public ArchiveData addAllArchiveAvatarIdList(final int... values) { + public ArchiveData addAllOJJBNFPBCKK(final int... values) { bitField0_ |= 0x00000001; - archiveAvatarIdList.addAll(values); + oJJBNFPBCKK.addAll(values); return this; } /** - * repeated uint32 archive_equipment_id_list = 10; - * @return whether the archiveEquipmentIdList field is set + * repeated uint32 CMDMBOMOGIB = 7; + * @return whether the cMDMBOMOGIB field is set */ - public boolean hasArchiveEquipmentIdList() { + public boolean hasCMDMBOMOGIB() { return (bitField0_ & 0x00000002) != 0; } /** - * repeated uint32 archive_equipment_id_list = 10; + * repeated uint32 CMDMBOMOGIB = 7; * @return this */ - public ArchiveData clearArchiveEquipmentIdList() { + public ArchiveData clearCMDMBOMOGIB() { bitField0_ &= ~0x00000002; - archiveEquipmentIdList.clear(); + cMDMBOMOGIB.clear(); return this; } /** - * repeated uint32 archive_equipment_id_list = 10; + * repeated uint32 CMDMBOMOGIB = 7; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. * - * Use {@link #getMutableArchiveEquipmentIdList()} if you want to modify it. + * Use {@link #getMutableCMDMBOMOGIB()} if you want to modify it. * * @return internal storage object for reading */ - public RepeatedInt getArchiveEquipmentIdList() { - return archiveEquipmentIdList; + public RepeatedInt getCMDMBOMOGIB() { + return cMDMBOMOGIB; } /** - * repeated uint32 archive_equipment_id_list = 10; + * repeated uint32 CMDMBOMOGIB = 7; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -159,53 +164,121 @@ public RepeatedInt getArchiveEquipmentIdList() { * * @return internal storage object for modifications */ - public RepeatedInt getMutableArchiveEquipmentIdList() { + public RepeatedInt getMutableCMDMBOMOGIB() { bitField0_ |= 0x00000002; - return archiveEquipmentIdList; + return cMDMBOMOGIB; } /** - * repeated uint32 archive_equipment_id_list = 10; - * @param value the archiveEquipmentIdList to add + * repeated uint32 CMDMBOMOGIB = 7; + * @param value the cMDMBOMOGIB to add * @return this */ - public ArchiveData addArchiveEquipmentIdList(final int value) { + public ArchiveData addCMDMBOMOGIB(final int value) { bitField0_ |= 0x00000002; - archiveEquipmentIdList.add(value); + cMDMBOMOGIB.add(value); return this; } /** - * repeated uint32 archive_equipment_id_list = 10; - * @param values the archiveEquipmentIdList to add + * repeated uint32 CMDMBOMOGIB = 7; + * @param values the cMDMBOMOGIB to add * @return this */ - public ArchiveData addAllArchiveEquipmentIdList(final int... values) { + public ArchiveData addAllCMDMBOMOGIB(final int... values) { bitField0_ |= 0x00000002; - archiveEquipmentIdList.addAll(values); + cMDMBOMOGIB.addAll(values); return this; } /** - * repeated .RelicArchive relic_list = 3; + * repeated uint32 ALFCBHACGFO = 11; + * @return whether the aLFCBHACGFO field is set + */ + public boolean hasALFCBHACGFO() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * repeated uint32 ALFCBHACGFO = 11; + * @return this + */ + public ArchiveData clearALFCBHACGFO() { + bitField0_ &= ~0x00000004; + aLFCBHACGFO.clear(); + return this; + } + + /** + * repeated uint32 ALFCBHACGFO = 11; + * + * This method returns the internal storage object without modifying any has state. + * The returned object should not be modified and be treated as read-only. + * + * Use {@link #getMutableALFCBHACGFO()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedInt getALFCBHACGFO() { + return aLFCBHACGFO; + } + + /** + * repeated uint32 ALFCBHACGFO = 11; + * + * This method returns the internal storage object and sets the corresponding + * has state. The returned object will become part of this message and its + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public RepeatedInt getMutableALFCBHACGFO() { + bitField0_ |= 0x00000004; + return aLFCBHACGFO; + } + + /** + * repeated uint32 ALFCBHACGFO = 11; + * @param value the aLFCBHACGFO to add + * @return this + */ + public ArchiveData addALFCBHACGFO(final int value) { + bitField0_ |= 0x00000004; + aLFCBHACGFO.add(value); + return this; + } + + /** + * repeated uint32 ALFCBHACGFO = 11; + * @param values the aLFCBHACGFO to add + * @return this + */ + public ArchiveData addAllALFCBHACGFO(final int... values) { + bitField0_ |= 0x00000004; + aLFCBHACGFO.addAll(values); + return this; + } + + /** + * repeated .RelicArchive relic_list = 1; * @return whether the relicList field is set */ public boolean hasRelicList() { - return (bitField0_ & 0x00000004) != 0; + return (bitField0_ & 0x00000008) != 0; } /** - * repeated .RelicArchive relic_list = 3; + * repeated .RelicArchive relic_list = 1; * @return this */ public ArchiveData clearRelicList() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000008; relicList.clear(); return this; } /** - * repeated .RelicArchive relic_list = 3; + * repeated .RelicArchive relic_list = 1; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -219,7 +292,7 @@ public RepeatedMessage getRelicList() { } /** - * repeated .RelicArchive relic_list = 3; + * repeated .RelicArchive relic_list = 1; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -228,28 +301,28 @@ public RepeatedMessage getRelicList() { * @return internal storage object for modifications */ public RepeatedMessage getMutableRelicList() { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; return relicList; } /** - * repeated .RelicArchive relic_list = 3; + * repeated .RelicArchive relic_list = 1; * @param value the relicList to add * @return this */ public ArchiveData addRelicList(final RelicArchiveOuterClass.RelicArchive value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; relicList.add(value); return this; } /** - * repeated .RelicArchive relic_list = 3; + * repeated .RelicArchive relic_list = 1; * @param values the relicList to add * @return this */ public ArchiveData addAllRelicList(final RelicArchiveOuterClass.RelicArchive... values) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; relicList.addAll(values); return this; } @@ -259,7 +332,7 @@ public ArchiveData addAllRelicList(final RelicArchiveOuterClass.RelicArchive... * @return whether the archiveMonsterIdList field is set */ public boolean hasArchiveMonsterIdList() { - return (bitField0_ & 0x00000008) != 0; + return (bitField0_ & 0x00000010) != 0; } /** @@ -267,7 +340,7 @@ public boolean hasArchiveMonsterIdList() { * @return this */ public ArchiveData clearArchiveMonsterIdList() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000010; archiveMonsterIdList.clear(); return this; } @@ -297,7 +370,7 @@ public RepeatedMessage getArchiveMonste */ public RepeatedMessage getMutableArchiveMonsterIdList( ) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000010; return archiveMonsterIdList; } @@ -308,7 +381,7 @@ public RepeatedMessage getMutableArchiv */ public ArchiveData addArchiveMonsterIdList( final MonsterArchiveOuterClass.MonsterArchive value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000010; archiveMonsterIdList.add(value); return this; } @@ -320,7 +393,7 @@ public ArchiveData addArchiveMonsterIdList( */ public ArchiveData addAllArchiveMonsterIdList( final MonsterArchiveOuterClass.MonsterArchive... values) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000010; archiveMonsterIdList.addAll(values); return this; } @@ -330,8 +403,9 @@ public ArchiveData copyFrom(final ArchiveData other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - archiveAvatarIdList.copyFrom(other.archiveAvatarIdList); - archiveEquipmentIdList.copyFrom(other.archiveEquipmentIdList); + oJJBNFPBCKK.copyFrom(other.oJJBNFPBCKK); + cMDMBOMOGIB.copyFrom(other.cMDMBOMOGIB); + aLFCBHACGFO.copyFrom(other.aLFCBHACGFO); relicList.copyFrom(other.relicList); archiveMonsterIdList.copyFrom(other.archiveMonsterIdList); } @@ -344,11 +418,14 @@ public ArchiveData mergeFrom(final ArchiveData other) { return this; } cachedSize = -1; - if (other.hasArchiveAvatarIdList()) { - getMutableArchiveAvatarIdList().addAll(other.archiveAvatarIdList); + if (other.hasOJJBNFPBCKK()) { + getMutableOJJBNFPBCKK().addAll(other.oJJBNFPBCKK); + } + if (other.hasCMDMBOMOGIB()) { + getMutableCMDMBOMOGIB().addAll(other.cMDMBOMOGIB); } - if (other.hasArchiveEquipmentIdList()) { - getMutableArchiveEquipmentIdList().addAll(other.archiveEquipmentIdList); + if (other.hasALFCBHACGFO()) { + getMutableALFCBHACGFO().addAll(other.aLFCBHACGFO); } if (other.hasRelicList()) { getMutableRelicList().addAll(other.relicList); @@ -366,8 +443,9 @@ public ArchiveData clear() { } cachedSize = -1; bitField0_ = 0; - archiveAvatarIdList.clear(); - archiveEquipmentIdList.clear(); + oJJBNFPBCKK.clear(); + cMDMBOMOGIB.clear(); + aLFCBHACGFO.clear(); relicList.clear(); archiveMonsterIdList.clear(); return this; @@ -380,8 +458,9 @@ public ArchiveData clearQuick() { } cachedSize = -1; bitField0_ = 0; - archiveAvatarIdList.clear(); - archiveEquipmentIdList.clear(); + oJJBNFPBCKK.clear(); + cMDMBOMOGIB.clear(); + aLFCBHACGFO.clear(); relicList.clearQuick(); archiveMonsterIdList.clearQuick(); return this; @@ -397,8 +476,9 @@ public boolean equals(Object o) { } ArchiveData other = (ArchiveData) o; return bitField0_ == other.bitField0_ - && (!hasArchiveAvatarIdList() || archiveAvatarIdList.equals(other.archiveAvatarIdList)) - && (!hasArchiveEquipmentIdList() || archiveEquipmentIdList.equals(other.archiveEquipmentIdList)) + && (!hasOJJBNFPBCKK() || oJJBNFPBCKK.equals(other.oJJBNFPBCKK)) + && (!hasCMDMBOMOGIB() || cMDMBOMOGIB.equals(other.cMDMBOMOGIB)) + && (!hasALFCBHACGFO() || aLFCBHACGFO.equals(other.aLFCBHACGFO)) && (!hasRelicList() || relicList.equals(other.relicList)) && (!hasArchiveMonsterIdList() || archiveMonsterIdList.equals(other.archiveMonsterIdList)); } @@ -406,24 +486,30 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - for (int i = 0; i < archiveAvatarIdList.length(); i++) { - output.writeRawByte((byte) 56); - output.writeUInt32NoTag(archiveAvatarIdList.array()[i]); + for (int i = 0; i < oJJBNFPBCKK.length(); i++) { + output.writeRawByte((byte) 32); + output.writeUInt32NoTag(oJJBNFPBCKK.array()[i]); } } if ((bitField0_ & 0x00000002) != 0) { - for (int i = 0; i < archiveEquipmentIdList.length(); i++) { - output.writeRawByte((byte) 80); - output.writeUInt32NoTag(archiveEquipmentIdList.array()[i]); + for (int i = 0; i < cMDMBOMOGIB.length(); i++) { + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(cMDMBOMOGIB.array()[i]); } } if ((bitField0_ & 0x00000004) != 0) { + for (int i = 0; i < aLFCBHACGFO.length(); i++) { + output.writeRawByte((byte) 88); + output.writeUInt32NoTag(aLFCBHACGFO.array()[i]); + } + } + if ((bitField0_ & 0x00000008) != 0) { for (int i = 0; i < relicList.length(); i++) { - output.writeRawByte((byte) 26); + output.writeRawByte((byte) 10); output.writeMessageNoTag(relicList.get(i)); } } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000010) != 0) { for (int i = 0; i < archiveMonsterIdList.length(); i++) { output.writeRawByte((byte) 114); output.writeMessageNoTag(archiveMonsterIdList.get(i)); @@ -435,15 +521,18 @@ public void writeTo(final ProtoSink output) throws IOException { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += (1 * archiveAvatarIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(archiveAvatarIdList); + size += (1 * oJJBNFPBCKK.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(oJJBNFPBCKK); } if ((bitField0_ & 0x00000002) != 0) { - size += (1 * archiveEquipmentIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(archiveEquipmentIdList); + size += (1 * cMDMBOMOGIB.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(cMDMBOMOGIB); } if ((bitField0_ & 0x00000004) != 0) { - size += (1 * relicList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(relicList); + size += (1 * aLFCBHACGFO.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(aLFCBHACGFO); } if ((bitField0_ & 0x00000008) != 0) { + size += (1 * relicList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(relicList); + } + if ((bitField0_ & 0x00000010) != 0) { size += (1 * archiveMonsterIdList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(archiveMonsterIdList); } return size; @@ -456,28 +545,37 @@ public ArchiveData mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 58: { - // archiveAvatarIdList [packed=true] - input.readPackedUInt32(archiveAvatarIdList, tag); + case 34: { + // oJJBNFPBCKK [packed=true] + input.readPackedUInt32(oJJBNFPBCKK, tag); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 82) { + if (tag != 58) { break; } } - case 82: { - // archiveEquipmentIdList [packed=true] - input.readPackedUInt32(archiveEquipmentIdList, tag); + case 58: { + // cMDMBOMOGIB [packed=true] + input.readPackedUInt32(cMDMBOMOGIB, tag); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 26) { + if (tag != 90) { + break; + } + } + case 90: { + // aLFCBHACGFO [packed=true] + input.readPackedUInt32(aLFCBHACGFO, tag); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 10) { break; } } - case 26: { + case 10: { // relicList tag = input.readRepeatedMessage(relicList, tag); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; if (tag != 114) { break; } @@ -485,7 +583,7 @@ public ArchiveData mergeFrom(final ProtoSource input) throws IOException { case 114: { // archiveMonsterIdList tag = input.readRepeatedMessage(archiveMonsterIdList, tag); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000010; if (tag != 0) { break; } @@ -500,18 +598,24 @@ public ArchiveData mergeFrom(final ProtoSource input) throws IOException { tag = input.readTag(); break; } - case 56: { - // archiveAvatarIdList [packed=false] - tag = input.readRepeatedUInt32(archiveAvatarIdList, tag); + case 32: { + // oJJBNFPBCKK [packed=false] + tag = input.readRepeatedUInt32(oJJBNFPBCKK, tag); bitField0_ |= 0x00000001; break; } - case 80: { - // archiveEquipmentIdList [packed=false] - tag = input.readRepeatedUInt32(archiveEquipmentIdList, tag); + case 56: { + // cMDMBOMOGIB [packed=false] + tag = input.readRepeatedUInt32(cMDMBOMOGIB, tag); bitField0_ |= 0x00000002; break; } + case 88: { + // aLFCBHACGFO [packed=false] + tag = input.readRepeatedUInt32(aLFCBHACGFO, tag); + bitField0_ |= 0x00000004; + break; + } } } } @@ -520,15 +624,18 @@ public ArchiveData mergeFrom(final ProtoSource input) throws IOException { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeRepeatedUInt32(FieldNames.archiveAvatarIdList, archiveAvatarIdList); + output.writeRepeatedUInt32(FieldNames.oJJBNFPBCKK, oJJBNFPBCKK); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRepeatedUInt32(FieldNames.archiveEquipmentIdList, archiveEquipmentIdList); + output.writeRepeatedUInt32(FieldNames.cMDMBOMOGIB, cMDMBOMOGIB); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRepeatedMessage(FieldNames.relicList, relicList); + output.writeRepeatedUInt32(FieldNames.aLFCBHACGFO, aLFCBHACGFO); } if ((bitField0_ & 0x00000008) != 0) { + output.writeRepeatedMessage(FieldNames.relicList, relicList); + } + if ((bitField0_ & 0x00000010) != 0) { output.writeRepeatedMessage(FieldNames.archiveMonsterIdList, archiveMonsterIdList); } output.endObject(); @@ -541,11 +648,10 @@ public ArchiveData mergeFrom(final JsonSource input) throws IOException { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 500094196: - case 1198392697: { - if (input.isAtField(FieldNames.archiveAvatarIdList)) { + case -842847418: { + if (input.isAtField(FieldNames.oJJBNFPBCKK)) { if (!input.trySkipNullValue()) { - input.readRepeatedUInt32(archiveAvatarIdList); + input.readRepeatedUInt32(oJJBNFPBCKK); bitField0_ |= 0x00000001; } } else { @@ -553,11 +659,10 @@ public ArchiveData mergeFrom(final JsonSource input) throws IOException { } break; } - case 1521227365: - case 967463252: { - if (input.isAtField(FieldNames.archiveEquipmentIdList)) { + case 1097201854: { + if (input.isAtField(FieldNames.cMDMBOMOGIB)) { if (!input.trySkipNullValue()) { - input.readRepeatedUInt32(archiveEquipmentIdList); + input.readRepeatedUInt32(cMDMBOMOGIB); bitField0_ |= 0x00000002; } } else { @@ -565,12 +670,23 @@ public ArchiveData mergeFrom(final JsonSource input) throws IOException { } break; } + case 812631104: { + if (input.isAtField(FieldNames.aLFCBHACGFO)) { + if (!input.trySkipNullValue()) { + input.readRepeatedUInt32(aLFCBHACGFO); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } case 204814001: case 2071893482: { if (input.isAtField(FieldNames.relicList)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(relicList); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; } } else { input.skipUnknownField(); @@ -582,7 +698,7 @@ public ArchiveData mergeFrom(final JsonSource input) throws IOException { if (input.isAtField(FieldNames.archiveMonsterIdList)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(archiveMonsterIdList); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000010; } } else { input.skipUnknownField(); @@ -641,9 +757,11 @@ public ArchiveData create() { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName archiveAvatarIdList = FieldName.forField("archiveAvatarIdList", "archive_avatar_id_list"); + static final FieldName oJJBNFPBCKK = FieldName.forField("OJJBNFPBCKK"); + + static final FieldName cMDMBOMOGIB = FieldName.forField("CMDMBOMOGIB"); - static final FieldName archiveEquipmentIdList = FieldName.forField("archiveEquipmentIdList", "archive_equipment_id_list"); + static final FieldName aLFCBHACGFO = FieldName.forField("ALFCBHACGFO"); static final FieldName relicList = FieldName.forField("relicList", "relic_list"); diff --git a/src/generated/main/emu/lunarcore/proto/SimpleAvatarInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/AssistSimpleInfoOuterClass.java similarity index 61% rename from src/generated/main/emu/lunarcore/proto/SimpleAvatarInfoOuterClass.java rename to src/generated/main/emu/lunarcore/proto/AssistSimpleInfoOuterClass.java index 755f8501a..bad243d8d 100644 --- a/src/generated/main/emu/lunarcore/proto/SimpleAvatarInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/AssistSimpleInfoOuterClass.java @@ -11,77 +11,82 @@ import us.hebi.quickbuf.ProtoSink; import us.hebi.quickbuf.ProtoSource; -public final class SimpleAvatarInfoOuterClass { +public final class AssistSimpleInfoOuterClass { /** - * Protobuf type {@code SimpleAvatarInfo} + * Protobuf type {@code AssistSimpleInfo} */ - public static final class SimpleAvatarInfo extends ProtoMessage implements Cloneable { + public static final class AssistSimpleInfo extends ProtoMessage implements Cloneable { private static final long serialVersionUID = 0L; /** - * optional uint32 dressed_skin_id = 2; + * optional uint32 pos = 4; */ - private int dressedSkinId; + private int pos; /** - * optional uint32 avatar_id = 5; + * optional uint32 avatar_id = 7; */ private int avatarId; /** - * optional uint32 level = 10; + * optional uint32 level = 8; */ private int level; - private SimpleAvatarInfo() { + /** + * optional uint32 dressed_skin_id = 11; + */ + private int dressedSkinId; + + private AssistSimpleInfo() { } /** - * @return a new empty instance of {@code SimpleAvatarInfo} + * @return a new empty instance of {@code AssistSimpleInfo} */ - public static SimpleAvatarInfo newInstance() { - return new SimpleAvatarInfo(); + public static AssistSimpleInfo newInstance() { + return new AssistSimpleInfo(); } /** - * optional uint32 dressed_skin_id = 2; - * @return whether the dressedSkinId field is set + * optional uint32 pos = 4; + * @return whether the pos field is set */ - public boolean hasDressedSkinId() { + public boolean hasPos() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 dressed_skin_id = 2; + * optional uint32 pos = 4; * @return this */ - public SimpleAvatarInfo clearDressedSkinId() { + public AssistSimpleInfo clearPos() { bitField0_ &= ~0x00000001; - dressedSkinId = 0; + pos = 0; return this; } /** - * optional uint32 dressed_skin_id = 2; - * @return the dressedSkinId + * optional uint32 pos = 4; + * @return the pos */ - public int getDressedSkinId() { - return dressedSkinId; + public int getPos() { + return pos; } /** - * optional uint32 dressed_skin_id = 2; - * @param value the dressedSkinId to set + * optional uint32 pos = 4; + * @param value the pos to set * @return this */ - public SimpleAvatarInfo setDressedSkinId(final int value) { + public AssistSimpleInfo setPos(final int value) { bitField0_ |= 0x00000001; - dressedSkinId = value; + pos = value; return this; } /** - * optional uint32 avatar_id = 5; + * optional uint32 avatar_id = 7; * @return whether the avatarId field is set */ public boolean hasAvatarId() { @@ -89,17 +94,17 @@ public boolean hasAvatarId() { } /** - * optional uint32 avatar_id = 5; + * optional uint32 avatar_id = 7; * @return this */ - public SimpleAvatarInfo clearAvatarId() { + public AssistSimpleInfo clearAvatarId() { bitField0_ &= ~0x00000002; avatarId = 0; return this; } /** - * optional uint32 avatar_id = 5; + * optional uint32 avatar_id = 7; * @return the avatarId */ public int getAvatarId() { @@ -107,18 +112,18 @@ public int getAvatarId() { } /** - * optional uint32 avatar_id = 5; + * optional uint32 avatar_id = 7; * @param value the avatarId to set * @return this */ - public SimpleAvatarInfo setAvatarId(final int value) { + public AssistSimpleInfo setAvatarId(final int value) { bitField0_ |= 0x00000002; avatarId = value; return this; } /** - * optional uint32 level = 10; + * optional uint32 level = 8; * @return whether the level field is set */ public boolean hasLevel() { @@ -126,17 +131,17 @@ public boolean hasLevel() { } /** - * optional uint32 level = 10; + * optional uint32 level = 8; * @return this */ - public SimpleAvatarInfo clearLevel() { + public AssistSimpleInfo clearLevel() { bitField0_ &= ~0x00000004; level = 0; return this; } /** - * optional uint32 level = 10; + * optional uint32 level = 8; * @return the level */ public int getLevel() { @@ -144,36 +149,74 @@ public int getLevel() { } /** - * optional uint32 level = 10; + * optional uint32 level = 8; * @param value the level to set * @return this */ - public SimpleAvatarInfo setLevel(final int value) { + public AssistSimpleInfo setLevel(final int value) { bitField0_ |= 0x00000004; level = value; return this; } + /** + * optional uint32 dressed_skin_id = 11; + * @return whether the dressedSkinId field is set + */ + public boolean hasDressedSkinId() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 dressed_skin_id = 11; + * @return this + */ + public AssistSimpleInfo clearDressedSkinId() { + bitField0_ &= ~0x00000008; + dressedSkinId = 0; + return this; + } + + /** + * optional uint32 dressed_skin_id = 11; + * @return the dressedSkinId + */ + public int getDressedSkinId() { + return dressedSkinId; + } + + /** + * optional uint32 dressed_skin_id = 11; + * @param value the dressedSkinId to set + * @return this + */ + public AssistSimpleInfo setDressedSkinId(final int value) { + bitField0_ |= 0x00000008; + dressedSkinId = value; + return this; + } + @Override - public SimpleAvatarInfo copyFrom(final SimpleAvatarInfo other) { + public AssistSimpleInfo copyFrom(final AssistSimpleInfo other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - dressedSkinId = other.dressedSkinId; + pos = other.pos; avatarId = other.avatarId; level = other.level; + dressedSkinId = other.dressedSkinId; } return this; } @Override - public SimpleAvatarInfo mergeFrom(final SimpleAvatarInfo other) { + public AssistSimpleInfo mergeFrom(final AssistSimpleInfo other) { if (other.isEmpty()) { return this; } cachedSize = -1; - if (other.hasDressedSkinId()) { - setDressedSkinId(other.dressedSkinId); + if (other.hasPos()) { + setPos(other.pos); } if (other.hasAvatarId()) { setAvatarId(other.avatarId); @@ -181,24 +224,28 @@ public SimpleAvatarInfo mergeFrom(final SimpleAvatarInfo other) { if (other.hasLevel()) { setLevel(other.level); } + if (other.hasDressedSkinId()) { + setDressedSkinId(other.dressedSkinId); + } return this; } @Override - public SimpleAvatarInfo clear() { + public AssistSimpleInfo clear() { if (isEmpty()) { return this; } cachedSize = -1; bitField0_ = 0; - dressedSkinId = 0; + pos = 0; avatarId = 0; level = 0; + dressedSkinId = 0; return this; } @Override - public SimpleAvatarInfo clearQuick() { + public AssistSimpleInfo clearQuick() { if (isEmpty()) { return this; } @@ -212,37 +259,42 @@ public boolean equals(Object o) { if (o == this) { return true; } - if (!(o instanceof SimpleAvatarInfo)) { + if (!(o instanceof AssistSimpleInfo)) { return false; } - SimpleAvatarInfo other = (SimpleAvatarInfo) o; + AssistSimpleInfo other = (AssistSimpleInfo) o; return bitField0_ == other.bitField0_ - && (!hasDressedSkinId() || dressedSkinId == other.dressedSkinId) + && (!hasPos() || pos == other.pos) && (!hasAvatarId() || avatarId == other.avatarId) - && (!hasLevel() || level == other.level); + && (!hasLevel() || level == other.level) + && (!hasDressedSkinId() || dressedSkinId == other.dressedSkinId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); - output.writeUInt32NoTag(dressedSkinId); + output.writeRawByte((byte) 32); + output.writeUInt32NoTag(pos); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(avatarId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(level); } + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 88); + output.writeUInt32NoTag(dressedSkinId); + } } @Override protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(dressedSkinId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(pos); } if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(avatarId); @@ -250,39 +302,51 @@ protected int computeSerializedSize() { if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(level); } + if ((bitField0_ & 0x00000008) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(dressedSkinId); + } return size; } @Override @SuppressWarnings("fallthrough") - public SimpleAvatarInfo mergeFrom(final ProtoSource input) throws IOException { + public AssistSimpleInfo mergeFrom(final ProtoSource input) throws IOException { // Enabled Fall-Through Optimization (QuickBuffers) int tag = input.readTag(); while (true) { switch (tag) { - case 16: { - // dressedSkinId - dressedSkinId = input.readUInt32(); + case 32: { + // pos + pos = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 40) { + if (tag != 56) { break; } } - case 40: { + case 56: { // avatarId avatarId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 80) { + if (tag != 64) { break; } } - case 80: { + case 64: { // level level = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); + if (tag != 88) { + break; + } + } + case 88: { + // dressedSkinId + dressedSkinId = input.readUInt32(); + bitField0_ |= 0x00000008; + tag = input.readTag(); if (tag != 0) { break; } @@ -305,7 +369,7 @@ public SimpleAvatarInfo mergeFrom(final ProtoSource input) throws IOException { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.dressedSkinId, dressedSkinId); + output.writeUInt32(FieldNames.pos, pos); } if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.avatarId, avatarId); @@ -313,21 +377,23 @@ public void writeTo(final JsonSink output) throws IOException { if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.level, level); } + if ((bitField0_ & 0x00000008) != 0) { + output.writeUInt32(FieldNames.dressedSkinId, dressedSkinId); + } output.endObject(); } @Override - public SimpleAvatarInfo mergeFrom(final JsonSource input) throws IOException { + public AssistSimpleInfo mergeFrom(final JsonSource input) throws IOException { if (!input.beginObject()) { return this; } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -407000018: - case 2012697844: { - if (input.isAtField(FieldNames.dressedSkinId)) { + case 111188: { + if (input.isAtField(FieldNames.pos)) { if (!input.trySkipNullValue()) { - dressedSkinId = input.readUInt32(); + pos = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -358,6 +424,18 @@ public SimpleAvatarInfo mergeFrom(final JsonSource input) throws IOException { } break; } + case -407000018: + case 2012697844: { + if (input.isAtField(FieldNames.dressedSkinId)) { + if (!input.trySkipNullValue()) { + dressedSkinId = input.readUInt32(); + bitField0_ |= 0x00000008; + } + } else { + input.skipUnknownField(); + } + break; + } default: { input.skipUnknownField(); break; @@ -369,8 +447,8 @@ public SimpleAvatarInfo mergeFrom(final JsonSource input) throws IOException { } @Override - public SimpleAvatarInfo clone() { - return new SimpleAvatarInfo().copyFrom(this); + public AssistSimpleInfo clone() { + return new AssistSimpleInfo().copyFrom(this); } @Override @@ -378,32 +456,32 @@ public boolean isEmpty() { return ((bitField0_) == 0); } - public static SimpleAvatarInfo parseFrom(final byte[] data) throws + public static AssistSimpleInfo parseFrom(final byte[] data) throws InvalidProtocolBufferException { - return ProtoMessage.mergeFrom(new SimpleAvatarInfo(), data).checkInitialized(); + return ProtoMessage.mergeFrom(new AssistSimpleInfo(), data).checkInitialized(); } - public static SimpleAvatarInfo parseFrom(final ProtoSource input) throws IOException { - return ProtoMessage.mergeFrom(new SimpleAvatarInfo(), input).checkInitialized(); + public static AssistSimpleInfo parseFrom(final ProtoSource input) throws IOException { + return ProtoMessage.mergeFrom(new AssistSimpleInfo(), input).checkInitialized(); } - public static SimpleAvatarInfo parseFrom(final JsonSource input) throws IOException { - return ProtoMessage.mergeFrom(new SimpleAvatarInfo(), input).checkInitialized(); + public static AssistSimpleInfo parseFrom(final JsonSource input) throws IOException { + return ProtoMessage.mergeFrom(new AssistSimpleInfo(), input).checkInitialized(); } /** - * @return factory for creating SimpleAvatarInfo messages + * @return factory for creating AssistSimpleInfo messages */ - public static MessageFactory getFactory() { - return SimpleAvatarInfoFactory.INSTANCE; + public static MessageFactory getFactory() { + return AssistSimpleInfoFactory.INSTANCE; } - private enum SimpleAvatarInfoFactory implements MessageFactory { + private enum AssistSimpleInfoFactory implements MessageFactory { INSTANCE; @Override - public SimpleAvatarInfo create() { - return SimpleAvatarInfo.newInstance(); + public AssistSimpleInfo create() { + return AssistSimpleInfo.newInstance(); } } @@ -411,11 +489,13 @@ public SimpleAvatarInfo create() { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName dressedSkinId = FieldName.forField("dressedSkinId", "dressed_skin_id"); + static final FieldName pos = FieldName.forField("pos"); static final FieldName avatarId = FieldName.forField("avatarId", "avatar_id"); static final FieldName level = FieldName.forField("level"); + + static final FieldName dressedSkinId = FieldName.forField("dressedSkinId", "dressed_skin_id"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/AvatarExpUpCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/AvatarExpUpCsReqOuterClass.java index 0ae25b900..1a05f7e6e 100644 --- a/src/generated/main/emu/lunarcore/proto/AvatarExpUpCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/AvatarExpUpCsReqOuterClass.java @@ -19,12 +19,12 @@ public static final class AvatarExpUpCsReq extends ProtoMessageoptional uint32 base_avatar_id = 8; + * optional uint32 base_avatar_id = 9; */ private int baseAvatarId; /** - * optional .ItemCostList item_cost_list = 7; + * optional .ItemCostList item_cost_list = 3; */ private final ItemCostListOuterClass.ItemCostList itemCostList = ItemCostListOuterClass.ItemCostList.newInstance(); @@ -39,7 +39,7 @@ public static AvatarExpUpCsReq newInstance() { } /** - * optional uint32 base_avatar_id = 8; + * optional uint32 base_avatar_id = 9; * @return whether the baseAvatarId field is set */ public boolean hasBaseAvatarId() { @@ -47,7 +47,7 @@ public boolean hasBaseAvatarId() { } /** - * optional uint32 base_avatar_id = 8; + * optional uint32 base_avatar_id = 9; * @return this */ public AvatarExpUpCsReq clearBaseAvatarId() { @@ -57,7 +57,7 @@ public AvatarExpUpCsReq clearBaseAvatarId() { } /** - * optional uint32 base_avatar_id = 8; + * optional uint32 base_avatar_id = 9; * @return the baseAvatarId */ public int getBaseAvatarId() { @@ -65,7 +65,7 @@ public int getBaseAvatarId() { } /** - * optional uint32 base_avatar_id = 8; + * optional uint32 base_avatar_id = 9; * @param value the baseAvatarId to set * @return this */ @@ -76,7 +76,7 @@ public AvatarExpUpCsReq setBaseAvatarId(final int value) { } /** - * optional .ItemCostList item_cost_list = 7; + * optional .ItemCostList item_cost_list = 3; * @return whether the itemCostList field is set */ public boolean hasItemCostList() { @@ -84,7 +84,7 @@ public boolean hasItemCostList() { } /** - * optional .ItemCostList item_cost_list = 7; + * optional .ItemCostList item_cost_list = 3; * @return this */ public AvatarExpUpCsReq clearItemCostList() { @@ -94,7 +94,7 @@ public AvatarExpUpCsReq clearItemCostList() { } /** - * optional .ItemCostList item_cost_list = 7; + * optional .ItemCostList item_cost_list = 3; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -108,7 +108,7 @@ public ItemCostListOuterClass.ItemCostList getItemCostList() { } /** - * optional .ItemCostList item_cost_list = 7; + * optional .ItemCostList item_cost_list = 3; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -122,7 +122,7 @@ public ItemCostListOuterClass.ItemCostList getMutableItemCostList() { } /** - * optional .ItemCostList item_cost_list = 7; + * optional .ItemCostList item_cost_list = 3; * @param value the itemCostList to set * @return this */ @@ -198,11 +198,11 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(baseAvatarId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 58); + output.writeRawByte((byte) 26); output.writeMessageNoTag(itemCostList); } } @@ -226,16 +226,16 @@ public AvatarExpUpCsReq mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { + case 72: { // baseAvatarId baseAvatarId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 58) { + if (tag != 26) { break; } } - case 58: { + case 26: { // itemCostList input.readMessage(itemCostList); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/AvatarExpUpScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/AvatarExpUpScRspOuterClass.java index a1ce56759..962282da0 100644 --- a/src/generated/main/emu/lunarcore/proto/AvatarExpUpScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/AvatarExpUpScRspOuterClass.java @@ -20,12 +20,12 @@ public static final class AvatarExpUpScRsp extends ProtoMessageoptional uint32 retcode = 12; + * optional uint32 retcode = 13; */ private int retcode; /** - * repeated .PileItem return_item_list = 4; + * repeated .PileItem return_item_list = 10; */ private final RepeatedMessage returnItemList = RepeatedMessage.newEmptyInstance(PileItemOuterClass.PileItem.getFactory()); @@ -40,7 +40,7 @@ public static AvatarExpUpScRsp newInstance() { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 13; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -48,7 +48,7 @@ public boolean hasRetcode() { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 13; * @return this */ public AvatarExpUpScRsp clearRetcode() { @@ -58,7 +58,7 @@ public AvatarExpUpScRsp clearRetcode() { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 13; * @return the retcode */ public int getRetcode() { @@ -66,7 +66,7 @@ public int getRetcode() { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 13; * @param value the retcode to set * @return this */ @@ -77,7 +77,7 @@ public AvatarExpUpScRsp setRetcode(final int value) { } /** - * repeated .PileItem return_item_list = 4; + * repeated .PileItem return_item_list = 10; * @return whether the returnItemList field is set */ public boolean hasReturnItemList() { @@ -85,7 +85,7 @@ public boolean hasReturnItemList() { } /** - * repeated .PileItem return_item_list = 4; + * repeated .PileItem return_item_list = 10; * @return this */ public AvatarExpUpScRsp clearReturnItemList() { @@ -95,7 +95,7 @@ public AvatarExpUpScRsp clearReturnItemList() { } /** - * repeated .PileItem return_item_list = 4; + * repeated .PileItem return_item_list = 10; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -109,7 +109,7 @@ public RepeatedMessage getReturnItemList() { } /** - * repeated .PileItem return_item_list = 4; + * repeated .PileItem return_item_list = 10; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -123,7 +123,7 @@ public RepeatedMessage getMutableReturnItemList() { } /** - * repeated .PileItem return_item_list = 4; + * repeated .PileItem return_item_list = 10; * @param value the returnItemList to add * @return this */ @@ -134,7 +134,7 @@ public AvatarExpUpScRsp addReturnItemList(final PileItemOuterClass.PileItem valu } /** - * repeated .PileItem return_item_list = 4; + * repeated .PileItem return_item_list = 10; * @param values the returnItemList to add * @return this */ @@ -210,12 +210,12 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < returnItemList.length(); i++) { - output.writeRawByte((byte) 34); + output.writeRawByte((byte) 82); output.writeMessageNoTag(returnItemList.get(i)); } } @@ -240,16 +240,16 @@ public AvatarExpUpScRsp mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 96: { + case 104: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 34) { + if (tag != 82) { break; } } - case 34: { + case 82: { // returnItemList tag = input.readRepeatedMessage(returnItemList, tag); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/AvatarOuterClass.java b/src/generated/main/emu/lunarcore/proto/AvatarOuterClass.java index e1ab2dd79..2bbac3860 100644 --- a/src/generated/main/emu/lunarcore/proto/AvatarOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/AvatarOuterClass.java @@ -21,19 +21,19 @@ public static final class Avatar extends ProtoMessage implements Cloneab private static final long serialVersionUID = 0L; /** - * optional uint64 first_met_timestamp = 15; + * optional uint64 first_met_timestamp = 6; */ private long firstMetTimestamp; /** - * optional uint32 dressed_skin_id = 1; + * optional uint32 promotion = 1; */ - private int dressedSkinId; + private int promotion; /** - * optional uint32 promotion = 3; + * optional uint32 exp = 2; */ - private int promotion; + private int exp; /** * optional uint32 base_avatar_id = 5; @@ -41,39 +41,39 @@ public static final class Avatar extends ProtoMessage implements Cloneab private int baseAvatarId; /** - * optional uint32 rank = 7; + * optional uint32 level = 7; */ - private int rank; + private int level; /** - * optional uint32 level = 9; + * optional uint32 dressed_skin_id = 8; */ - private int level; + private int dressedSkinId; /** - * optional uint32 exp = 11; + * optional uint32 rank = 12; */ - private int exp; + private int rank; /** - * optional uint32 equipment_unique_id = 12; + * optional uint32 equipment_unique_id = 15; */ private int equipmentUniqueId; /** - * repeated uint32 taken_rewards = 13; + * repeated uint32 taken_rewards = 10; */ private final RepeatedInt takenRewards = RepeatedInt.newEmptyInstance(); /** - * repeated .AvatarSkillTree skilltree_list = 4; + * repeated .EquipRelic equip_relic_list = 9; */ - private final RepeatedMessage skilltreeList = RepeatedMessage.newEmptyInstance(AvatarSkillTreeOuterClass.AvatarSkillTree.getFactory()); + private final RepeatedMessage equipRelicList = RepeatedMessage.newEmptyInstance(EquipRelicOuterClass.EquipRelic.getFactory()); /** - * repeated .EquipRelic equip_relic_list = 8; + * repeated .AvatarSkillTree skilltree_list = 11; */ - private final RepeatedMessage equipRelicList = RepeatedMessage.newEmptyInstance(EquipRelicOuterClass.EquipRelic.getFactory()); + private final RepeatedMessage skilltreeList = RepeatedMessage.newEmptyInstance(AvatarSkillTreeOuterClass.AvatarSkillTree.getFactory()); private Avatar() { } @@ -86,7 +86,7 @@ public static Avatar newInstance() { } /** - * optional uint64 first_met_timestamp = 15; + * optional uint64 first_met_timestamp = 6; * @return whether the firstMetTimestamp field is set */ public boolean hasFirstMetTimestamp() { @@ -94,7 +94,7 @@ public boolean hasFirstMetTimestamp() { } /** - * optional uint64 first_met_timestamp = 15; + * optional uint64 first_met_timestamp = 6; * @return this */ public Avatar clearFirstMetTimestamp() { @@ -104,7 +104,7 @@ public Avatar clearFirstMetTimestamp() { } /** - * optional uint64 first_met_timestamp = 15; + * optional uint64 first_met_timestamp = 6; * @return the firstMetTimestamp */ public long getFirstMetTimestamp() { @@ -112,7 +112,7 @@ public long getFirstMetTimestamp() { } /** - * optional uint64 first_met_timestamp = 15; + * optional uint64 first_met_timestamp = 6; * @param value the firstMetTimestamp to set * @return this */ @@ -123,76 +123,76 @@ public Avatar setFirstMetTimestamp(final long value) { } /** - * optional uint32 dressed_skin_id = 1; - * @return whether the dressedSkinId field is set + * optional uint32 promotion = 1; + * @return whether the promotion field is set */ - public boolean hasDressedSkinId() { + public boolean hasPromotion() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 dressed_skin_id = 1; + * optional uint32 promotion = 1; * @return this */ - public Avatar clearDressedSkinId() { + public Avatar clearPromotion() { bitField0_ &= ~0x00000002; - dressedSkinId = 0; + promotion = 0; return this; } /** - * optional uint32 dressed_skin_id = 1; - * @return the dressedSkinId + * optional uint32 promotion = 1; + * @return the promotion */ - public int getDressedSkinId() { - return dressedSkinId; + public int getPromotion() { + return promotion; } /** - * optional uint32 dressed_skin_id = 1; - * @param value the dressedSkinId to set + * optional uint32 promotion = 1; + * @param value the promotion to set * @return this */ - public Avatar setDressedSkinId(final int value) { + public Avatar setPromotion(final int value) { bitField0_ |= 0x00000002; - dressedSkinId = value; + promotion = value; return this; } /** - * optional uint32 promotion = 3; - * @return whether the promotion field is set + * optional uint32 exp = 2; + * @return whether the exp field is set */ - public boolean hasPromotion() { + public boolean hasExp() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 promotion = 3; + * optional uint32 exp = 2; * @return this */ - public Avatar clearPromotion() { + public Avatar clearExp() { bitField0_ &= ~0x00000004; - promotion = 0; + exp = 0; return this; } /** - * optional uint32 promotion = 3; - * @return the promotion + * optional uint32 exp = 2; + * @return the exp */ - public int getPromotion() { - return promotion; + public int getExp() { + return exp; } /** - * optional uint32 promotion = 3; - * @param value the promotion to set + * optional uint32 exp = 2; + * @param value the exp to set * @return this */ - public Avatar setPromotion(final int value) { + public Avatar setExp(final int value) { bitField0_ |= 0x00000004; - promotion = value; + exp = value; return this; } @@ -234,118 +234,118 @@ public Avatar setBaseAvatarId(final int value) { } /** - * optional uint32 rank = 7; - * @return whether the rank field is set + * optional uint32 level = 7; + * @return whether the level field is set */ - public boolean hasRank() { + public boolean hasLevel() { return (bitField0_ & 0x00000010) != 0; } /** - * optional uint32 rank = 7; + * optional uint32 level = 7; * @return this */ - public Avatar clearRank() { + public Avatar clearLevel() { bitField0_ &= ~0x00000010; - rank = 0; + level = 0; return this; } /** - * optional uint32 rank = 7; - * @return the rank + * optional uint32 level = 7; + * @return the level */ - public int getRank() { - return rank; + public int getLevel() { + return level; } /** - * optional uint32 rank = 7; - * @param value the rank to set + * optional uint32 level = 7; + * @param value the level to set * @return this */ - public Avatar setRank(final int value) { + public Avatar setLevel(final int value) { bitField0_ |= 0x00000010; - rank = value; + level = value; return this; } /** - * optional uint32 level = 9; - * @return whether the level field is set + * optional uint32 dressed_skin_id = 8; + * @return whether the dressedSkinId field is set */ - public boolean hasLevel() { + public boolean hasDressedSkinId() { return (bitField0_ & 0x00000020) != 0; } /** - * optional uint32 level = 9; + * optional uint32 dressed_skin_id = 8; * @return this */ - public Avatar clearLevel() { + public Avatar clearDressedSkinId() { bitField0_ &= ~0x00000020; - level = 0; + dressedSkinId = 0; return this; } /** - * optional uint32 level = 9; - * @return the level + * optional uint32 dressed_skin_id = 8; + * @return the dressedSkinId */ - public int getLevel() { - return level; + public int getDressedSkinId() { + return dressedSkinId; } /** - * optional uint32 level = 9; - * @param value the level to set + * optional uint32 dressed_skin_id = 8; + * @param value the dressedSkinId to set * @return this */ - public Avatar setLevel(final int value) { + public Avatar setDressedSkinId(final int value) { bitField0_ |= 0x00000020; - level = value; + dressedSkinId = value; return this; } /** - * optional uint32 exp = 11; - * @return whether the exp field is set + * optional uint32 rank = 12; + * @return whether the rank field is set */ - public boolean hasExp() { + public boolean hasRank() { return (bitField0_ & 0x00000040) != 0; } /** - * optional uint32 exp = 11; + * optional uint32 rank = 12; * @return this */ - public Avatar clearExp() { + public Avatar clearRank() { bitField0_ &= ~0x00000040; - exp = 0; + rank = 0; return this; } /** - * optional uint32 exp = 11; - * @return the exp + * optional uint32 rank = 12; + * @return the rank */ - public int getExp() { - return exp; + public int getRank() { + return rank; } /** - * optional uint32 exp = 11; - * @param value the exp to set + * optional uint32 rank = 12; + * @param value the rank to set * @return this */ - public Avatar setExp(final int value) { + public Avatar setRank(final int value) { bitField0_ |= 0x00000040; - exp = value; + rank = value; return this; } /** - * optional uint32 equipment_unique_id = 12; + * optional uint32 equipment_unique_id = 15; * @return whether the equipmentUniqueId field is set */ public boolean hasEquipmentUniqueId() { @@ -353,7 +353,7 @@ public boolean hasEquipmentUniqueId() { } /** - * optional uint32 equipment_unique_id = 12; + * optional uint32 equipment_unique_id = 15; * @return this */ public Avatar clearEquipmentUniqueId() { @@ -363,7 +363,7 @@ public Avatar clearEquipmentUniqueId() { } /** - * optional uint32 equipment_unique_id = 12; + * optional uint32 equipment_unique_id = 15; * @return the equipmentUniqueId */ public int getEquipmentUniqueId() { @@ -371,7 +371,7 @@ public int getEquipmentUniqueId() { } /** - * optional uint32 equipment_unique_id = 12; + * optional uint32 equipment_unique_id = 15; * @param value the equipmentUniqueId to set * @return this */ @@ -382,7 +382,7 @@ public Avatar setEquipmentUniqueId(final int value) { } /** - * repeated uint32 taken_rewards = 13; + * repeated uint32 taken_rewards = 10; * @return whether the takenRewards field is set */ public boolean hasTakenRewards() { @@ -390,7 +390,7 @@ public boolean hasTakenRewards() { } /** - * repeated uint32 taken_rewards = 13; + * repeated uint32 taken_rewards = 10; * @return this */ public Avatar clearTakenRewards() { @@ -400,7 +400,7 @@ public Avatar clearTakenRewards() { } /** - * repeated uint32 taken_rewards = 13; + * repeated uint32 taken_rewards = 10; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -414,7 +414,7 @@ public RepeatedInt getTakenRewards() { } /** - * repeated uint32 taken_rewards = 13; + * repeated uint32 taken_rewards = 10; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -428,7 +428,7 @@ public RepeatedInt getMutableTakenRewards() { } /** - * repeated uint32 taken_rewards = 13; + * repeated uint32 taken_rewards = 10; * @param value the takenRewards to add * @return this */ @@ -439,7 +439,7 @@ public Avatar addTakenRewards(final int value) { } /** - * repeated uint32 taken_rewards = 13; + * repeated uint32 taken_rewards = 10; * @param values the takenRewards to add * @return this */ @@ -450,39 +450,39 @@ public Avatar addAllTakenRewards(final int... values) { } /** - * repeated .AvatarSkillTree skilltree_list = 4; - * @return whether the skilltreeList field is set + * repeated .EquipRelic equip_relic_list = 9; + * @return whether the equipRelicList field is set */ - public boolean hasSkilltreeList() { + public boolean hasEquipRelicList() { return (bitField0_ & 0x00000200) != 0; } /** - * repeated .AvatarSkillTree skilltree_list = 4; + * repeated .EquipRelic equip_relic_list = 9; * @return this */ - public Avatar clearSkilltreeList() { + public Avatar clearEquipRelicList() { bitField0_ &= ~0x00000200; - skilltreeList.clear(); + equipRelicList.clear(); return this; } /** - * repeated .AvatarSkillTree skilltree_list = 4; + * repeated .EquipRelic equip_relic_list = 9; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. * - * Use {@link #getMutableSkilltreeList()} if you want to modify it. + * Use {@link #getMutableEquipRelicList()} if you want to modify it. * * @return internal storage object for reading */ - public RepeatedMessage getSkilltreeList() { - return skilltreeList; + public RepeatedMessage getEquipRelicList() { + return equipRelicList; } /** - * repeated .AvatarSkillTree skilltree_list = 4; + * repeated .EquipRelic equip_relic_list = 9; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -490,67 +490,67 @@ public RepeatedMessage getSkilltreeLi * * @return internal storage object for modifications */ - public RepeatedMessage getMutableSkilltreeList() { + public RepeatedMessage getMutableEquipRelicList() { bitField0_ |= 0x00000200; - return skilltreeList; + return equipRelicList; } /** - * repeated .AvatarSkillTree skilltree_list = 4; - * @param value the skilltreeList to add + * repeated .EquipRelic equip_relic_list = 9; + * @param value the equipRelicList to add * @return this */ - public Avatar addSkilltreeList(final AvatarSkillTreeOuterClass.AvatarSkillTree value) { + public Avatar addEquipRelicList(final EquipRelicOuterClass.EquipRelic value) { bitField0_ |= 0x00000200; - skilltreeList.add(value); + equipRelicList.add(value); return this; } /** - * repeated .AvatarSkillTree skilltree_list = 4; - * @param values the skilltreeList to add + * repeated .EquipRelic equip_relic_list = 9; + * @param values the equipRelicList to add * @return this */ - public Avatar addAllSkilltreeList(final AvatarSkillTreeOuterClass.AvatarSkillTree... values) { + public Avatar addAllEquipRelicList(final EquipRelicOuterClass.EquipRelic... values) { bitField0_ |= 0x00000200; - skilltreeList.addAll(values); + equipRelicList.addAll(values); return this; } /** - * repeated .EquipRelic equip_relic_list = 8; - * @return whether the equipRelicList field is set + * repeated .AvatarSkillTree skilltree_list = 11; + * @return whether the skilltreeList field is set */ - public boolean hasEquipRelicList() { + public boolean hasSkilltreeList() { return (bitField0_ & 0x00000400) != 0; } /** - * repeated .EquipRelic equip_relic_list = 8; + * repeated .AvatarSkillTree skilltree_list = 11; * @return this */ - public Avatar clearEquipRelicList() { + public Avatar clearSkilltreeList() { bitField0_ &= ~0x00000400; - equipRelicList.clear(); + skilltreeList.clear(); return this; } /** - * repeated .EquipRelic equip_relic_list = 8; + * repeated .AvatarSkillTree skilltree_list = 11; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. * - * Use {@link #getMutableEquipRelicList()} if you want to modify it. + * Use {@link #getMutableSkilltreeList()} if you want to modify it. * * @return internal storage object for reading */ - public RepeatedMessage getEquipRelicList() { - return equipRelicList; + public RepeatedMessage getSkilltreeList() { + return skilltreeList; } /** - * repeated .EquipRelic equip_relic_list = 8; + * repeated .AvatarSkillTree skilltree_list = 11; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -558,30 +558,30 @@ public RepeatedMessage getEquipRelicList() { * * @return internal storage object for modifications */ - public RepeatedMessage getMutableEquipRelicList() { + public RepeatedMessage getMutableSkilltreeList() { bitField0_ |= 0x00000400; - return equipRelicList; + return skilltreeList; } /** - * repeated .EquipRelic equip_relic_list = 8; - * @param value the equipRelicList to add + * repeated .AvatarSkillTree skilltree_list = 11; + * @param value the skilltreeList to add * @return this */ - public Avatar addEquipRelicList(final EquipRelicOuterClass.EquipRelic value) { + public Avatar addSkilltreeList(final AvatarSkillTreeOuterClass.AvatarSkillTree value) { bitField0_ |= 0x00000400; - equipRelicList.add(value); + skilltreeList.add(value); return this; } /** - * repeated .EquipRelic equip_relic_list = 8; - * @param values the equipRelicList to add + * repeated .AvatarSkillTree skilltree_list = 11; + * @param values the skilltreeList to add * @return this */ - public Avatar addAllEquipRelicList(final EquipRelicOuterClass.EquipRelic... values) { + public Avatar addAllSkilltreeList(final AvatarSkillTreeOuterClass.AvatarSkillTree... values) { bitField0_ |= 0x00000400; - equipRelicList.addAll(values); + skilltreeList.addAll(values); return this; } @@ -591,16 +591,16 @@ public Avatar copyFrom(final Avatar other) { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; firstMetTimestamp = other.firstMetTimestamp; - dressedSkinId = other.dressedSkinId; promotion = other.promotion; + exp = other.exp; baseAvatarId = other.baseAvatarId; - rank = other.rank; level = other.level; - exp = other.exp; + dressedSkinId = other.dressedSkinId; + rank = other.rank; equipmentUniqueId = other.equipmentUniqueId; takenRewards.copyFrom(other.takenRewards); - skilltreeList.copyFrom(other.skilltreeList); equipRelicList.copyFrom(other.equipRelicList); + skilltreeList.copyFrom(other.skilltreeList); } return this; } @@ -614,23 +614,23 @@ public Avatar mergeFrom(final Avatar other) { if (other.hasFirstMetTimestamp()) { setFirstMetTimestamp(other.firstMetTimestamp); } - if (other.hasDressedSkinId()) { - setDressedSkinId(other.dressedSkinId); - } if (other.hasPromotion()) { setPromotion(other.promotion); } + if (other.hasExp()) { + setExp(other.exp); + } if (other.hasBaseAvatarId()) { setBaseAvatarId(other.baseAvatarId); } - if (other.hasRank()) { - setRank(other.rank); - } if (other.hasLevel()) { setLevel(other.level); } - if (other.hasExp()) { - setExp(other.exp); + if (other.hasDressedSkinId()) { + setDressedSkinId(other.dressedSkinId); + } + if (other.hasRank()) { + setRank(other.rank); } if (other.hasEquipmentUniqueId()) { setEquipmentUniqueId(other.equipmentUniqueId); @@ -638,12 +638,12 @@ public Avatar mergeFrom(final Avatar other) { if (other.hasTakenRewards()) { getMutableTakenRewards().addAll(other.takenRewards); } - if (other.hasSkilltreeList()) { - getMutableSkilltreeList().addAll(other.skilltreeList); - } if (other.hasEquipRelicList()) { getMutableEquipRelicList().addAll(other.equipRelicList); } + if (other.hasSkilltreeList()) { + getMutableSkilltreeList().addAll(other.skilltreeList); + } return this; } @@ -655,16 +655,16 @@ public Avatar clear() { cachedSize = -1; bitField0_ = 0; firstMetTimestamp = 0L; - dressedSkinId = 0; promotion = 0; + exp = 0; baseAvatarId = 0; - rank = 0; level = 0; - exp = 0; + dressedSkinId = 0; + rank = 0; equipmentUniqueId = 0; takenRewards.clear(); - skilltreeList.clear(); equipRelicList.clear(); + skilltreeList.clear(); return this; } @@ -676,8 +676,8 @@ public Avatar clearQuick() { cachedSize = -1; bitField0_ = 0; takenRewards.clear(); - skilltreeList.clearQuick(); equipRelicList.clearQuick(); + skilltreeList.clearQuick(); return this; } @@ -692,31 +692,31 @@ public boolean equals(Object o) { Avatar other = (Avatar) o; return bitField0_ == other.bitField0_ && (!hasFirstMetTimestamp() || firstMetTimestamp == other.firstMetTimestamp) - && (!hasDressedSkinId() || dressedSkinId == other.dressedSkinId) && (!hasPromotion() || promotion == other.promotion) + && (!hasExp() || exp == other.exp) && (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId) - && (!hasRank() || rank == other.rank) && (!hasLevel() || level == other.level) - && (!hasExp() || exp == other.exp) + && (!hasDressedSkinId() || dressedSkinId == other.dressedSkinId) + && (!hasRank() || rank == other.rank) && (!hasEquipmentUniqueId() || equipmentUniqueId == other.equipmentUniqueId) && (!hasTakenRewards() || takenRewards.equals(other.takenRewards)) - && (!hasSkilltreeList() || skilltreeList.equals(other.skilltreeList)) - && (!hasEquipRelicList() || equipRelicList.equals(other.equipRelicList)); + && (!hasEquipRelicList() || equipRelicList.equals(other.equipRelicList)) + && (!hasSkilltreeList() || skilltreeList.equals(other.skilltreeList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 48); output.writeUInt64NoTag(firstMetTimestamp); } if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 8); - output.writeUInt32NoTag(dressedSkinId); + output.writeUInt32NoTag(promotion); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 24); - output.writeUInt32NoTag(promotion); + output.writeRawByte((byte) 16); + output.writeUInt32NoTag(exp); } if ((bitField0_ & 0x00000008) != 0) { output.writeRawByte((byte) 40); @@ -724,36 +724,36 @@ public void writeTo(final ProtoSink output) throws IOException { } if ((bitField0_ & 0x00000010) != 0) { output.writeRawByte((byte) 56); - output.writeUInt32NoTag(rank); + output.writeUInt32NoTag(level); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 72); - output.writeUInt32NoTag(level); + output.writeRawByte((byte) 64); + output.writeUInt32NoTag(dressedSkinId); } if ((bitField0_ & 0x00000040) != 0) { - output.writeRawByte((byte) 88); - output.writeUInt32NoTag(exp); + output.writeRawByte((byte) 96); + output.writeUInt32NoTag(rank); } if ((bitField0_ & 0x00000080) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(equipmentUniqueId); } if ((bitField0_ & 0x00000100) != 0) { for (int i = 0; i < takenRewards.length(); i++) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(takenRewards.array()[i]); } } if ((bitField0_ & 0x00000200) != 0) { - for (int i = 0; i < skilltreeList.length(); i++) { - output.writeRawByte((byte) 34); - output.writeMessageNoTag(skilltreeList.get(i)); + for (int i = 0; i < equipRelicList.length(); i++) { + output.writeRawByte((byte) 74); + output.writeMessageNoTag(equipRelicList.get(i)); } } if ((bitField0_ & 0x00000400) != 0) { - for (int i = 0; i < equipRelicList.length(); i++) { - output.writeRawByte((byte) 66); - output.writeMessageNoTag(equipRelicList.get(i)); + for (int i = 0; i < skilltreeList.length(); i++) { + output.writeRawByte((byte) 90); + output.writeMessageNoTag(skilltreeList.get(i)); } } } @@ -765,22 +765,22 @@ protected int computeSerializedSize() { size += 1 + ProtoSink.computeUInt64SizeNoTag(firstMetTimestamp); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(dressedSkinId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(promotion); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(promotion); + size += 1 + ProtoSink.computeUInt32SizeNoTag(exp); } if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId); } if ((bitField0_ & 0x00000010) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(rank); + size += 1 + ProtoSink.computeUInt32SizeNoTag(level); } if ((bitField0_ & 0x00000020) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(level); + size += 1 + ProtoSink.computeUInt32SizeNoTag(dressedSkinId); } if ((bitField0_ & 0x00000040) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(exp); + size += 1 + ProtoSink.computeUInt32SizeNoTag(rank); } if ((bitField0_ & 0x00000080) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(equipmentUniqueId); @@ -789,10 +789,10 @@ protected int computeSerializedSize() { size += (1 * takenRewards.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(takenRewards); } if ((bitField0_ & 0x00000200) != 0) { - size += (1 * skilltreeList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(skilltreeList); + size += (1 * equipRelicList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(equipRelicList); } if ((bitField0_ & 0x00000400) != 0) { - size += (1 * equipRelicList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(equipRelicList); + size += (1 * skilltreeList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(skilltreeList); } return size; } @@ -804,7 +804,7 @@ public Avatar mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 120: { + case 48: { // firstMetTimestamp firstMetTimestamp = input.readUInt64(); bitField0_ |= 0x00000001; @@ -814,17 +814,17 @@ public Avatar mergeFrom(final ProtoSource input) throws IOException { } } case 8: { - // dressedSkinId - dressedSkinId = input.readUInt32(); + // promotion + promotion = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 24) { + if (tag != 16) { break; } } - case 24: { - // promotion - promotion = input.readUInt32(); + case 16: { + // exp + exp = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 40) { @@ -841,61 +841,61 @@ public Avatar mergeFrom(final ProtoSource input) throws IOException { } } case 56: { - // rank - rank = input.readUInt32(); + // level + level = input.readUInt32(); bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 72) { + if (tag != 64) { break; } } - case 72: { - // level - level = input.readUInt32(); + case 64: { + // dressedSkinId + dressedSkinId = input.readUInt32(); bitField0_ |= 0x00000020; tag = input.readTag(); - if (tag != 88) { + if (tag != 96) { break; } } - case 88: { - // exp - exp = input.readUInt32(); + case 96: { + // rank + rank = input.readUInt32(); bitField0_ |= 0x00000040; tag = input.readTag(); - if (tag != 96) { + if (tag != 120) { break; } } - case 96: { + case 120: { // equipmentUniqueId equipmentUniqueId = input.readUInt32(); bitField0_ |= 0x00000080; tag = input.readTag(); - if (tag != 106) { + if (tag != 82) { break; } } - case 106: { + case 82: { // takenRewards [packed=true] input.readPackedUInt32(takenRewards, tag); bitField0_ |= 0x00000100; tag = input.readTag(); - if (tag != 34) { + if (tag != 74) { break; } } - case 34: { - // skilltreeList - tag = input.readRepeatedMessage(skilltreeList, tag); + case 74: { + // equipRelicList + tag = input.readRepeatedMessage(equipRelicList, tag); bitField0_ |= 0x00000200; - if (tag != 66) { + if (tag != 90) { break; } } - case 66: { - // equipRelicList - tag = input.readRepeatedMessage(equipRelicList, tag); + case 90: { + // skilltreeList + tag = input.readRepeatedMessage(skilltreeList, tag); bitField0_ |= 0x00000400; if (tag != 0) { break; @@ -911,7 +911,7 @@ public Avatar mergeFrom(final ProtoSource input) throws IOException { tag = input.readTag(); break; } - case 104: { + case 80: { // takenRewards [packed=false] tag = input.readRepeatedUInt32(takenRewards, tag); bitField0_ |= 0x00000100; @@ -928,22 +928,22 @@ public void writeTo(final JsonSink output) throws IOException { output.writeUInt64(FieldNames.firstMetTimestamp, firstMetTimestamp); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.dressedSkinId, dressedSkinId); + output.writeUInt32(FieldNames.promotion, promotion); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.promotion, promotion); + output.writeUInt32(FieldNames.exp, exp); } if ((bitField0_ & 0x00000008) != 0) { output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId); } if ((bitField0_ & 0x00000010) != 0) { - output.writeUInt32(FieldNames.rank, rank); + output.writeUInt32(FieldNames.level, level); } if ((bitField0_ & 0x00000020) != 0) { - output.writeUInt32(FieldNames.level, level); + output.writeUInt32(FieldNames.dressedSkinId, dressedSkinId); } if ((bitField0_ & 0x00000040) != 0) { - output.writeUInt32(FieldNames.exp, exp); + output.writeUInt32(FieldNames.rank, rank); } if ((bitField0_ & 0x00000080) != 0) { output.writeUInt32(FieldNames.equipmentUniqueId, equipmentUniqueId); @@ -952,10 +952,10 @@ public void writeTo(final JsonSink output) throws IOException { output.writeRepeatedUInt32(FieldNames.takenRewards, takenRewards); } if ((bitField0_ & 0x00000200) != 0) { - output.writeRepeatedMessage(FieldNames.skilltreeList, skilltreeList); + output.writeRepeatedMessage(FieldNames.equipRelicList, equipRelicList); } if ((bitField0_ & 0x00000400) != 0) { - output.writeRepeatedMessage(FieldNames.equipRelicList, equipRelicList); + output.writeRepeatedMessage(FieldNames.skilltreeList, skilltreeList); } output.endObject(); } @@ -979,11 +979,10 @@ public Avatar mergeFrom(final JsonSource input) throws IOException { } break; } - case -407000018: - case 2012697844: { - if (input.isAtField(FieldNames.dressedSkinId)) { + case -799212381: { + if (input.isAtField(FieldNames.promotion)) { if (!input.trySkipNullValue()) { - dressedSkinId = input.readUInt32(); + promotion = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -991,10 +990,10 @@ public Avatar mergeFrom(final JsonSource input) throws IOException { } break; } - case -799212381: { - if (input.isAtField(FieldNames.promotion)) { + case 100893: { + if (input.isAtField(FieldNames.exp)) { if (!input.trySkipNullValue()) { - promotion = input.readUInt32(); + exp = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -1014,10 +1013,10 @@ public Avatar mergeFrom(final JsonSource input) throws IOException { } break; } - case 3492908: { - if (input.isAtField(FieldNames.rank)) { + case 102865796: { + if (input.isAtField(FieldNames.level)) { if (!input.trySkipNullValue()) { - rank = input.readUInt32(); + level = input.readUInt32(); bitField0_ |= 0x00000010; } } else { @@ -1025,10 +1024,11 @@ public Avatar mergeFrom(final JsonSource input) throws IOException { } break; } - case 102865796: { - if (input.isAtField(FieldNames.level)) { + case -407000018: + case 2012697844: { + if (input.isAtField(FieldNames.dressedSkinId)) { if (!input.trySkipNullValue()) { - level = input.readUInt32(); + dressedSkinId = input.readUInt32(); bitField0_ |= 0x00000020; } } else { @@ -1036,10 +1036,10 @@ public Avatar mergeFrom(final JsonSource input) throws IOException { } break; } - case 100893: { - if (input.isAtField(FieldNames.exp)) { + case 3492908: { + if (input.isAtField(FieldNames.rank)) { if (!input.trySkipNullValue()) { - exp = input.readUInt32(); + rank = input.readUInt32(); bitField0_ |= 0x00000040; } } else { @@ -1071,11 +1071,11 @@ public Avatar mergeFrom(final JsonSource input) throws IOException { } break; } - case 1549763245: - case 815647086: { - if (input.isAtField(FieldNames.skilltreeList)) { + case 1578968161: + case -795441831: { + if (input.isAtField(FieldNames.equipRelicList)) { if (!input.trySkipNullValue()) { - input.readRepeatedMessage(skilltreeList); + input.readRepeatedMessage(equipRelicList); bitField0_ |= 0x00000200; } } else { @@ -1083,11 +1083,11 @@ public Avatar mergeFrom(final JsonSource input) throws IOException { } break; } - case 1578968161: - case -795441831: { - if (input.isAtField(FieldNames.equipRelicList)) { + case 1549763245: + case 815647086: { + if (input.isAtField(FieldNames.skilltreeList)) { if (!input.trySkipNullValue()) { - input.readRepeatedMessage(equipRelicList); + input.readRepeatedMessage(skilltreeList); bitField0_ |= 0x00000400; } } else { @@ -1149,25 +1149,25 @@ public Avatar create() { static class FieldNames { static final FieldName firstMetTimestamp = FieldName.forField("firstMetTimestamp", "first_met_timestamp"); - static final FieldName dressedSkinId = FieldName.forField("dressedSkinId", "dressed_skin_id"); - static final FieldName promotion = FieldName.forField("promotion"); - static final FieldName baseAvatarId = FieldName.forField("baseAvatarId", "base_avatar_id"); + static final FieldName exp = FieldName.forField("exp"); - static final FieldName rank = FieldName.forField("rank"); + static final FieldName baseAvatarId = FieldName.forField("baseAvatarId", "base_avatar_id"); static final FieldName level = FieldName.forField("level"); - static final FieldName exp = FieldName.forField("exp"); + static final FieldName dressedSkinId = FieldName.forField("dressedSkinId", "dressed_skin_id"); + + static final FieldName rank = FieldName.forField("rank"); static final FieldName equipmentUniqueId = FieldName.forField("equipmentUniqueId", "equipment_unique_id"); static final FieldName takenRewards = FieldName.forField("takenRewards", "taken_rewards"); - static final FieldName skilltreeList = FieldName.forField("skilltreeList", "skilltree_list"); - static final FieldName equipRelicList = FieldName.forField("equipRelicList", "equip_relic_list"); + + static final FieldName skilltreeList = FieldName.forField("skilltreeList", "skilltree_list"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/AvatarSyncOuterClass.java b/src/generated/main/emu/lunarcore/proto/AvatarSyncOuterClass.java index 138cc2713..b1c06ded2 100644 --- a/src/generated/main/emu/lunarcore/proto/AvatarSyncOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/AvatarSyncOuterClass.java @@ -20,7 +20,7 @@ public static final class AvatarSync extends ProtoMessage implements private static final long serialVersionUID = 0L; /** - * repeated .Avatar avatar_list = 1; + * repeated .Avatar avatar_list = 9; */ private final RepeatedMessage avatarList = RepeatedMessage.newEmptyInstance(AvatarOuterClass.Avatar.getFactory()); @@ -35,7 +35,7 @@ public static AvatarSync newInstance() { } /** - * repeated .Avatar avatar_list = 1; + * repeated .Avatar avatar_list = 9; * @return whether the avatarList field is set */ public boolean hasAvatarList() { @@ -43,7 +43,7 @@ public boolean hasAvatarList() { } /** - * repeated .Avatar avatar_list = 1; + * repeated .Avatar avatar_list = 9; * @return this */ public AvatarSync clearAvatarList() { @@ -53,7 +53,7 @@ public AvatarSync clearAvatarList() { } /** - * repeated .Avatar avatar_list = 1; + * repeated .Avatar avatar_list = 9; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -67,7 +67,7 @@ public RepeatedMessage getAvatarList() { } /** - * repeated .Avatar avatar_list = 1; + * repeated .Avatar avatar_list = 9; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -81,7 +81,7 @@ public RepeatedMessage getMutableAvatarList() { } /** - * repeated .Avatar avatar_list = 1; + * repeated .Avatar avatar_list = 9; * @param value the avatarList to add * @return this */ @@ -92,7 +92,7 @@ public AvatarSync addAvatarList(final AvatarOuterClass.Avatar value) { } /** - * repeated .Avatar avatar_list = 1; + * repeated .Avatar avatar_list = 9; * @param values the avatarList to add * @return this */ @@ -163,7 +163,7 @@ public boolean equals(Object o) { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { for (int i = 0; i < avatarList.length(); i++) { - output.writeRawByte((byte) 10); + output.writeRawByte((byte) 74); output.writeMessageNoTag(avatarList.get(i)); } } @@ -185,7 +185,7 @@ public AvatarSync mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 10: { + case 74: { // avatarList tag = input.readRepeatedMessage(avatarList, tag); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/BELMNIPGEDNOuterClass.java b/src/generated/main/emu/lunarcore/proto/BELMNIPGEDNOuterClass.java deleted file mode 100644 index a65851497..000000000 --- a/src/generated/main/emu/lunarcore/proto/BELMNIPGEDNOuterClass.java +++ /dev/null @@ -1,498 +0,0 @@ -// Code generated by protocol buffer compiler. Do not edit! -package emu.lunarcore.proto; - -import java.io.IOException; -import us.hebi.quickbuf.FieldName; -import us.hebi.quickbuf.InvalidProtocolBufferException; -import us.hebi.quickbuf.JsonSink; -import us.hebi.quickbuf.JsonSource; -import us.hebi.quickbuf.MessageFactory; -import us.hebi.quickbuf.ProtoMessage; -import us.hebi.quickbuf.ProtoSink; -import us.hebi.quickbuf.ProtoSource; - -public final class BELMNIPGEDNOuterClass { - /** - * Protobuf type {@code BELMNIPGEDN} - */ - public static final class BELMNIPGEDN extends ProtoMessage implements Cloneable { - private static final long serialVersionUID = 0L; - - /** - * optional uint32 MFOPPKIBGNJ = 8; - */ - private int mFOPPKIBGNJ; - - /** - * optional uint32 DDOPHIJMILL = 9; - */ - private int dDOPHIJMILL; - - /** - * optional uint32 ACJKANLIGBM = 10; - */ - private int aCJKANLIGBM; - - /** - * optional uint32 INGFJNPHCDL = 15; - */ - private int iNGFJNPHCDL; - - private BELMNIPGEDN() { - } - - /** - * @return a new empty instance of {@code BELMNIPGEDN} - */ - public static BELMNIPGEDN newInstance() { - return new BELMNIPGEDN(); - } - - /** - * optional uint32 MFOPPKIBGNJ = 8; - * @return whether the mFOPPKIBGNJ field is set - */ - public boolean hasMFOPPKIBGNJ() { - return (bitField0_ & 0x00000001) != 0; - } - - /** - * optional uint32 MFOPPKIBGNJ = 8; - * @return this - */ - public BELMNIPGEDN clearMFOPPKIBGNJ() { - bitField0_ &= ~0x00000001; - mFOPPKIBGNJ = 0; - return this; - } - - /** - * optional uint32 MFOPPKIBGNJ = 8; - * @return the mFOPPKIBGNJ - */ - public int getMFOPPKIBGNJ() { - return mFOPPKIBGNJ; - } - - /** - * optional uint32 MFOPPKIBGNJ = 8; - * @param value the mFOPPKIBGNJ to set - * @return this - */ - public BELMNIPGEDN setMFOPPKIBGNJ(final int value) { - bitField0_ |= 0x00000001; - mFOPPKIBGNJ = value; - return this; - } - - /** - * optional uint32 DDOPHIJMILL = 9; - * @return whether the dDOPHIJMILL field is set - */ - public boolean hasDDOPHIJMILL() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 DDOPHIJMILL = 9; - * @return this - */ - public BELMNIPGEDN clearDDOPHIJMILL() { - bitField0_ &= ~0x00000002; - dDOPHIJMILL = 0; - return this; - } - - /** - * optional uint32 DDOPHIJMILL = 9; - * @return the dDOPHIJMILL - */ - public int getDDOPHIJMILL() { - return dDOPHIJMILL; - } - - /** - * optional uint32 DDOPHIJMILL = 9; - * @param value the dDOPHIJMILL to set - * @return this - */ - public BELMNIPGEDN setDDOPHIJMILL(final int value) { - bitField0_ |= 0x00000002; - dDOPHIJMILL = value; - return this; - } - - /** - * optional uint32 ACJKANLIGBM = 10; - * @return whether the aCJKANLIGBM field is set - */ - public boolean hasACJKANLIGBM() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 ACJKANLIGBM = 10; - * @return this - */ - public BELMNIPGEDN clearACJKANLIGBM() { - bitField0_ &= ~0x00000004; - aCJKANLIGBM = 0; - return this; - } - - /** - * optional uint32 ACJKANLIGBM = 10; - * @return the aCJKANLIGBM - */ - public int getACJKANLIGBM() { - return aCJKANLIGBM; - } - - /** - * optional uint32 ACJKANLIGBM = 10; - * @param value the aCJKANLIGBM to set - * @return this - */ - public BELMNIPGEDN setACJKANLIGBM(final int value) { - bitField0_ |= 0x00000004; - aCJKANLIGBM = value; - return this; - } - - /** - * optional uint32 INGFJNPHCDL = 15; - * @return whether the iNGFJNPHCDL field is set - */ - public boolean hasINGFJNPHCDL() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 INGFJNPHCDL = 15; - * @return this - */ - public BELMNIPGEDN clearINGFJNPHCDL() { - bitField0_ &= ~0x00000008; - iNGFJNPHCDL = 0; - return this; - } - - /** - * optional uint32 INGFJNPHCDL = 15; - * @return the iNGFJNPHCDL - */ - public int getINGFJNPHCDL() { - return iNGFJNPHCDL; - } - - /** - * optional uint32 INGFJNPHCDL = 15; - * @param value the iNGFJNPHCDL to set - * @return this - */ - public BELMNIPGEDN setINGFJNPHCDL(final int value) { - bitField0_ |= 0x00000008; - iNGFJNPHCDL = value; - return this; - } - - @Override - public BELMNIPGEDN copyFrom(final BELMNIPGEDN other) { - cachedSize = other.cachedSize; - if ((bitField0_ | other.bitField0_) != 0) { - bitField0_ = other.bitField0_; - mFOPPKIBGNJ = other.mFOPPKIBGNJ; - dDOPHIJMILL = other.dDOPHIJMILL; - aCJKANLIGBM = other.aCJKANLIGBM; - iNGFJNPHCDL = other.iNGFJNPHCDL; - } - return this; - } - - @Override - public BELMNIPGEDN mergeFrom(final BELMNIPGEDN other) { - if (other.isEmpty()) { - return this; - } - cachedSize = -1; - if (other.hasMFOPPKIBGNJ()) { - setMFOPPKIBGNJ(other.mFOPPKIBGNJ); - } - if (other.hasDDOPHIJMILL()) { - setDDOPHIJMILL(other.dDOPHIJMILL); - } - if (other.hasACJKANLIGBM()) { - setACJKANLIGBM(other.aCJKANLIGBM); - } - if (other.hasINGFJNPHCDL()) { - setINGFJNPHCDL(other.iNGFJNPHCDL); - } - return this; - } - - @Override - public BELMNIPGEDN clear() { - if (isEmpty()) { - return this; - } - cachedSize = -1; - bitField0_ = 0; - mFOPPKIBGNJ = 0; - dDOPHIJMILL = 0; - aCJKANLIGBM = 0; - iNGFJNPHCDL = 0; - return this; - } - - @Override - public BELMNIPGEDN clearQuick() { - if (isEmpty()) { - return this; - } - cachedSize = -1; - bitField0_ = 0; - return this; - } - - @Override - public boolean equals(Object o) { - if (o == this) { - return true; - } - if (!(o instanceof BELMNIPGEDN)) { - return false; - } - BELMNIPGEDN other = (BELMNIPGEDN) o; - return bitField0_ == other.bitField0_ - && (!hasMFOPPKIBGNJ() || mFOPPKIBGNJ == other.mFOPPKIBGNJ) - && (!hasDDOPHIJMILL() || dDOPHIJMILL == other.dDOPHIJMILL) - && (!hasACJKANLIGBM() || aCJKANLIGBM == other.aCJKANLIGBM) - && (!hasINGFJNPHCDL() || iNGFJNPHCDL == other.iNGFJNPHCDL); - } - - @Override - public void writeTo(final ProtoSink output) throws IOException { - if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 64); - output.writeUInt32NoTag(mFOPPKIBGNJ); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 72); - output.writeUInt32NoTag(dDOPHIJMILL); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 80); - output.writeUInt32NoTag(aCJKANLIGBM); - } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 120); - output.writeUInt32NoTag(iNGFJNPHCDL); - } - } - - @Override - protected int computeSerializedSize() { - int size = 0; - if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(mFOPPKIBGNJ); - } - if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(dDOPHIJMILL); - } - if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(aCJKANLIGBM); - } - if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(iNGFJNPHCDL); - } - return size; - } - - @Override - @SuppressWarnings("fallthrough") - public BELMNIPGEDN mergeFrom(final ProtoSource input) throws IOException { - // Enabled Fall-Through Optimization (QuickBuffers) - int tag = input.readTag(); - while (true) { - switch (tag) { - case 64: { - // mFOPPKIBGNJ - mFOPPKIBGNJ = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 72) { - break; - } - } - case 72: { - // dDOPHIJMILL - dDOPHIJMILL = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 80) { - break; - } - } - case 80: { - // aCJKANLIGBM - aCJKANLIGBM = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 120) { - break; - } - } - case 120: { - // iNGFJNPHCDL - iNGFJNPHCDL = input.readUInt32(); - bitField0_ |= 0x00000008; - tag = input.readTag(); - if (tag != 0) { - break; - } - } - case 0: { - return this; - } - default: { - if (!input.skipField(tag)) { - return this; - } - tag = input.readTag(); - break; - } - } - } - } - - @Override - public void writeTo(final JsonSink output) throws IOException { - output.beginObject(); - if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.mFOPPKIBGNJ, mFOPPKIBGNJ); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.dDOPHIJMILL, dDOPHIJMILL); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.aCJKANLIGBM, aCJKANLIGBM); - } - if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.iNGFJNPHCDL, iNGFJNPHCDL); - } - output.endObject(); - } - - @Override - public BELMNIPGEDN mergeFrom(final JsonSource input) throws IOException { - if (!input.beginObject()) { - return this; - } - while (!input.isAtEnd()) { - switch (input.readFieldHash()) { - case -663962379: { - if (input.isAtField(FieldNames.mFOPPKIBGNJ)) { - if (!input.trySkipNullValue()) { - mFOPPKIBGNJ = input.readUInt32(); - bitField0_ |= 0x00000001; - } - } else { - input.skipUnknownField(); - } - break; - } - case 155657604: { - if (input.isAtField(FieldNames.dDOPHIJMILL)) { - if (!input.trySkipNullValue()) { - dDOPHIJMILL = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } - case -1408539: { - if (input.isAtField(FieldNames.aCJKANLIGBM)) { - if (!input.trySkipNullValue()) { - aCJKANLIGBM = input.readUInt32(); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } - case 1045739275: { - if (input.isAtField(FieldNames.iNGFJNPHCDL)) { - if (!input.trySkipNullValue()) { - iNGFJNPHCDL = input.readUInt32(); - bitField0_ |= 0x00000008; - } - } else { - input.skipUnknownField(); - } - break; - } - default: { - input.skipUnknownField(); - break; - } - } - } - input.endObject(); - return this; - } - - @Override - public BELMNIPGEDN clone() { - return new BELMNIPGEDN().copyFrom(this); - } - - @Override - public boolean isEmpty() { - return ((bitField0_) == 0); - } - - public static BELMNIPGEDN parseFrom(final byte[] data) throws InvalidProtocolBufferException { - return ProtoMessage.mergeFrom(new BELMNIPGEDN(), data).checkInitialized(); - } - - public static BELMNIPGEDN parseFrom(final ProtoSource input) throws IOException { - return ProtoMessage.mergeFrom(new BELMNIPGEDN(), input).checkInitialized(); - } - - public static BELMNIPGEDN parseFrom(final JsonSource input) throws IOException { - return ProtoMessage.mergeFrom(new BELMNIPGEDN(), input).checkInitialized(); - } - - /** - * @return factory for creating BELMNIPGEDN messages - */ - public static MessageFactory getFactory() { - return BELMNIPGEDNFactory.INSTANCE; - } - - private enum BELMNIPGEDNFactory implements MessageFactory { - INSTANCE; - - @Override - public BELMNIPGEDN create() { - return BELMNIPGEDN.newInstance(); - } - } - - /** - * Contains name constants used for serializing JSON - */ - static class FieldNames { - static final FieldName mFOPPKIBGNJ = FieldName.forField("MFOPPKIBGNJ"); - - static final FieldName dDOPHIJMILL = FieldName.forField("DDOPHIJMILL"); - - static final FieldName aCJKANLIGBM = FieldName.forField("ACJKANLIGBM"); - - static final FieldName iNGFJNPHCDL = FieldName.forField("INGFJNPHCDL"); - } - } -} diff --git a/src/generated/main/emu/lunarcore/proto/BattleAvatarOuterClass.java b/src/generated/main/emu/lunarcore/proto/BattleAvatarOuterClass.java index 6afc06449..fc6c0e562 100644 --- a/src/generated/main/emu/lunarcore/proto/BattleAvatarOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/BattleAvatarOuterClass.java @@ -65,10 +65,6 @@ public static final class BattleAvatar extends ProtoMessage implem private int avatarType; /** - * 
-     * DGPADLEIDFM BLGGGJFHGCP = 15;
-     *
- * * optional .SpBarInfo sp_bar = 16; */ private final SpBarInfoOuterClass.SpBarInfo spBar = SpBarInfoOuterClass.SpBarInfo.newInstance(); @@ -457,10 +453,6 @@ public BattleAvatar setAvatarType(final AvatarTypeOuterClass.AvatarType value) { } /** - * 
-     * DGPADLEIDFM BLGGGJFHGCP = 15;
-     *
- * * optional .SpBarInfo sp_bar = 16; * @return whether the spBar field is set */ @@ -469,10 +461,6 @@ public boolean hasSpBar() { } /** - * 
-     * DGPADLEIDFM BLGGGJFHGCP = 15;
-     *
- * * optional .SpBarInfo sp_bar = 16; * @return this */ @@ -483,10 +471,6 @@ public BattleAvatar clearSpBar() { } /** - * 
-     * DGPADLEIDFM BLGGGJFHGCP = 15;
-     *
- * * optional .SpBarInfo sp_bar = 16; * * This method returns the internal storage object without modifying any has state. @@ -501,10 +485,6 @@ public SpBarInfoOuterClass.SpBarInfo getSpBar() { } /** - * 
-     * DGPADLEIDFM BLGGGJFHGCP = 15;
-     *
- * * optional .SpBarInfo sp_bar = 16; * * This method returns the internal storage object and sets the corresponding @@ -519,10 +499,6 @@ public SpBarInfoOuterClass.SpBarInfo getMutableSpBar() { } /** - * 
-     * DGPADLEIDFM BLGGGJFHGCP = 15;
-     *
- * * optional .SpBarInfo sp_bar = 16; * @param value the spBar to set * @return this diff --git a/src/generated/main/emu/lunarcore/proto/BattleEventBattleInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/BattleEventBattleInfoOuterClass.java index 864afb771..3688ee778 100644 --- a/src/generated/main/emu/lunarcore/proto/BattleEventBattleInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/BattleEventBattleInfoOuterClass.java @@ -10,7 +10,6 @@ import us.hebi.quickbuf.ProtoMessage; import us.hebi.quickbuf.ProtoSink; import us.hebi.quickbuf.ProtoSource; -import us.hebi.quickbuf.RepeatedMessage; public final class BattleEventBattleInfoOuterClass { /** @@ -29,11 +28,6 @@ public static final class BattleEventBattleInfo extends ProtoMessagerepeated .BattleSkillInfo skill_list = 3; - */ - private final RepeatedMessage skillList = RepeatedMessage.newEmptyInstance(BattleSkillInfoOuterClass.BattleSkillInfo.getFactory()); - private BattleEventBattleInfo() { } @@ -139,76 +133,6 @@ public BattleEventBattleInfo setStatus( return this; } - /** - * repeated .BattleSkillInfo skill_list = 3; - * @return whether the skillList field is set - */ - public boolean hasSkillList() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * repeated .BattleSkillInfo skill_list = 3; - * @return this - */ - public BattleEventBattleInfo clearSkillList() { - bitField0_ &= ~0x00000004; - skillList.clear(); - return this; - } - - /** - * repeated .BattleSkillInfo skill_list = 3; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * Use {@link #getMutableSkillList()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedMessage getSkillList() { - return skillList; - } - - /** - * repeated .BattleSkillInfo skill_list = 3; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public RepeatedMessage getMutableSkillList() { - bitField0_ |= 0x00000004; - return skillList; - } - - /** - * repeated .BattleSkillInfo skill_list = 3; - * @param value the skillList to add - * @return this - */ - public BattleEventBattleInfo addSkillList( - final BattleSkillInfoOuterClass.BattleSkillInfo value) { - bitField0_ |= 0x00000004; - skillList.add(value); - return this; - } - - /** - * repeated .BattleSkillInfo skill_list = 3; - * @param values the skillList to add - * @return this - */ - public BattleEventBattleInfo addAllSkillList( - final BattleSkillInfoOuterClass.BattleSkillInfo... values) { - bitField0_ |= 0x00000004; - skillList.addAll(values); - return this; - } - @Override public BattleEventBattleInfo copyFrom(final BattleEventBattleInfo other) { cachedSize = other.cachedSize; @@ -216,7 +140,6 @@ public BattleEventBattleInfo copyFrom(final BattleEventBattleInfo other) { bitField0_ = other.bitField0_; battleEventId = other.battleEventId; status.copyFrom(other.status); - skillList.copyFrom(other.skillList); } return this; } @@ -233,9 +156,6 @@ public BattleEventBattleInfo mergeFrom(final BattleEventBattleInfo other) { if (other.hasStatus()) { getMutableStatus().mergeFrom(other.status); } - if (other.hasSkillList()) { - getMutableSkillList().addAll(other.skillList); - } return this; } @@ -248,7 +168,6 @@ public BattleEventBattleInfo clear() { bitField0_ = 0; battleEventId = 0; status.clear(); - skillList.clear(); return this; } @@ -260,7 +179,6 @@ public BattleEventBattleInfo clearQuick() { cachedSize = -1; bitField0_ = 0; status.clearQuick(); - skillList.clearQuick(); return this; } @@ -275,8 +193,7 @@ public boolean equals(Object o) { BattleEventBattleInfo other = (BattleEventBattleInfo) o; return bitField0_ == other.bitField0_ && (!hasBattleEventId() || battleEventId == other.battleEventId) - && (!hasStatus() || status.equals(other.status)) - && (!hasSkillList() || skillList.equals(other.skillList)); + && (!hasStatus() || status.equals(other.status)); } @Override @@ -289,12 +206,6 @@ public void writeTo(final ProtoSink output) throws IOException { output.writeRawByte((byte) 18); output.writeMessageNoTag(status); } - if ((bitField0_ & 0x00000004) != 0) { - for (int i = 0; i < skillList.length(); i++) { - output.writeRawByte((byte) 26); - output.writeMessageNoTag(skillList.get(i)); - } - } } @Override @@ -306,9 +217,6 @@ protected int computeSerializedSize() { if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(status); } - if ((bitField0_ & 0x00000004) != 0) { - size += (1 * skillList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(skillList); - } return size; } @@ -333,14 +241,6 @@ public BattleEventBattleInfo mergeFrom(final ProtoSource input) throws IOExcepti input.readMessage(status); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 26) { - break; - } - } - case 26: { - // skillList - tag = input.readRepeatedMessage(skillList, tag); - bitField0_ |= 0x00000004; if (tag != 0) { break; } @@ -368,9 +268,6 @@ public void writeTo(final JsonSink output) throws IOException { if ((bitField0_ & 0x00000002) != 0) { output.writeMessage(FieldNames.status, status); } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRepeatedMessage(FieldNames.skillList, skillList); - } output.endObject(); } @@ -404,18 +301,6 @@ public BattleEventBattleInfo mergeFrom(final JsonSource input) throws IOExceptio } break; } - case 1990942351: - case 1607297484: { - if (input.isAtField(FieldNames.skillList)) { - if (!input.trySkipNullValue()) { - input.readRepeatedMessage(skillList); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } default: { input.skipUnknownField(); break; @@ -472,8 +357,6 @@ static class FieldNames { static final FieldName battleEventId = FieldName.forField("battleEventId", "battle_event_id"); static final FieldName status = FieldName.forField("status"); - - static final FieldName skillList = FieldName.forField("skillList", "skill_list"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/BattleMechanismBarOuterClass.java b/src/generated/main/emu/lunarcore/proto/BattleMechanismBarOuterClass.java deleted file mode 100644 index 82c94ed49..000000000 --- a/src/generated/main/emu/lunarcore/proto/BattleMechanismBarOuterClass.java +++ /dev/null @@ -1,339 +0,0 @@ -// Code generated by protocol buffer compiler. Do not edit! -package emu.lunarcore.proto; - -import java.io.IOException; -import us.hebi.quickbuf.FieldName; -import us.hebi.quickbuf.InvalidProtocolBufferException; -import us.hebi.quickbuf.JsonSink; -import us.hebi.quickbuf.JsonSource; -import us.hebi.quickbuf.MessageFactory; -import us.hebi.quickbuf.ProtoMessage; -import us.hebi.quickbuf.ProtoSink; -import us.hebi.quickbuf.ProtoSource; - -public final class BattleMechanismBarOuterClass { - /** - * Protobuf type {@code BattleMechanismBar} - */ - public static final class BattleMechanismBar extends ProtoMessage implements Cloneable { - private static final long serialVersionUID = 0L; - - /** - * optional uint32 OMMELBCMNNM = 1; - */ - private int oMMELBCMNNM; - - /** - * optional uint32 AMMAAKPAKAA = 2; - */ - private int aMMAAKPAKAA; - - private BattleMechanismBar() { - } - - /** - * @return a new empty instance of {@code BattleMechanismBar} - */ - public static BattleMechanismBar newInstance() { - return new BattleMechanismBar(); - } - - /** - * optional uint32 OMMELBCMNNM = 1; - * @return whether the oMMELBCMNNM field is set - */ - public boolean hasOMMELBCMNNM() { - return (bitField0_ & 0x00000001) != 0; - } - - /** - * optional uint32 OMMELBCMNNM = 1; - * @return this - */ - public BattleMechanismBar clearOMMELBCMNNM() { - bitField0_ &= ~0x00000001; - oMMELBCMNNM = 0; - return this; - } - - /** - * optional uint32 OMMELBCMNNM = 1; - * @return the oMMELBCMNNM - */ - public int getOMMELBCMNNM() { - return oMMELBCMNNM; - } - - /** - * optional uint32 OMMELBCMNNM = 1; - * @param value the oMMELBCMNNM to set - * @return this - */ - public BattleMechanismBar setOMMELBCMNNM(final int value) { - bitField0_ |= 0x00000001; - oMMELBCMNNM = value; - return this; - } - - /** - * optional uint32 AMMAAKPAKAA = 2; - * @return whether the aMMAAKPAKAA field is set - */ - public boolean hasAMMAAKPAKAA() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 AMMAAKPAKAA = 2; - * @return this - */ - public BattleMechanismBar clearAMMAAKPAKAA() { - bitField0_ &= ~0x00000002; - aMMAAKPAKAA = 0; - return this; - } - - /** - * optional uint32 AMMAAKPAKAA = 2; - * @return the aMMAAKPAKAA - */ - public int getAMMAAKPAKAA() { - return aMMAAKPAKAA; - } - - /** - * optional uint32 AMMAAKPAKAA = 2; - * @param value the aMMAAKPAKAA to set - * @return this - */ - public BattleMechanismBar setAMMAAKPAKAA(final int value) { - bitField0_ |= 0x00000002; - aMMAAKPAKAA = value; - return this; - } - - @Override - public BattleMechanismBar copyFrom(final BattleMechanismBar other) { - cachedSize = other.cachedSize; - if ((bitField0_ | other.bitField0_) != 0) { - bitField0_ = other.bitField0_; - oMMELBCMNNM = other.oMMELBCMNNM; - aMMAAKPAKAA = other.aMMAAKPAKAA; - } - return this; - } - - @Override - public BattleMechanismBar mergeFrom(final BattleMechanismBar other) { - if (other.isEmpty()) { - return this; - } - cachedSize = -1; - if (other.hasOMMELBCMNNM()) { - setOMMELBCMNNM(other.oMMELBCMNNM); - } - if (other.hasAMMAAKPAKAA()) { - setAMMAAKPAKAA(other.aMMAAKPAKAA); - } - return this; - } - - @Override - public BattleMechanismBar clear() { - if (isEmpty()) { - return this; - } - cachedSize = -1; - bitField0_ = 0; - oMMELBCMNNM = 0; - aMMAAKPAKAA = 0; - return this; - } - - @Override - public BattleMechanismBar clearQuick() { - if (isEmpty()) { - return this; - } - cachedSize = -1; - bitField0_ = 0; - return this; - } - - @Override - public boolean equals(Object o) { - if (o == this) { - return true; - } - if (!(o instanceof BattleMechanismBar)) { - return false; - } - BattleMechanismBar other = (BattleMechanismBar) o; - return bitField0_ == other.bitField0_ - && (!hasOMMELBCMNNM() || oMMELBCMNNM == other.oMMELBCMNNM) - && (!hasAMMAAKPAKAA() || aMMAAKPAKAA == other.aMMAAKPAKAA); - } - - @Override - public void writeTo(final ProtoSink output) throws IOException { - if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); - output.writeUInt32NoTag(oMMELBCMNNM); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 16); - output.writeUInt32NoTag(aMMAAKPAKAA); - } - } - - @Override - protected int computeSerializedSize() { - int size = 0; - if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(oMMELBCMNNM); - } - if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(aMMAAKPAKAA); - } - return size; - } - - @Override - @SuppressWarnings("fallthrough") - public BattleMechanismBar mergeFrom(final ProtoSource input) throws IOException { - // Enabled Fall-Through Optimization (QuickBuffers) - int tag = input.readTag(); - while (true) { - switch (tag) { - case 8: { - // oMMELBCMNNM - oMMELBCMNNM = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 16) { - break; - } - } - case 16: { - // aMMAAKPAKAA - aMMAAKPAKAA = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 0) { - break; - } - } - case 0: { - return this; - } - default: { - if (!input.skipField(tag)) { - return this; - } - tag = input.readTag(); - break; - } - } - } - } - - @Override - public void writeTo(final JsonSink output) throws IOException { - output.beginObject(); - if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.oMMELBCMNNM, oMMELBCMNNM); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.aMMAAKPAKAA, aMMAAKPAKAA); - } - output.endObject(); - } - - @Override - public BattleMechanismBar mergeFrom(final JsonSource input) throws IOException { - if (!input.beginObject()) { - return this; - } - while (!input.isAtEnd()) { - switch (input.readFieldHash()) { - case 767455607: { - if (input.isAtField(FieldNames.oMMELBCMNNM)) { - if (!input.trySkipNullValue()) { - oMMELBCMNNM = input.readUInt32(); - bitField0_ |= 0x00000001; - } - } else { - input.skipUnknownField(); - } - break; - } - case 870365552: { - if (input.isAtField(FieldNames.aMMAAKPAKAA)) { - if (!input.trySkipNullValue()) { - aMMAAKPAKAA = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } - default: { - input.skipUnknownField(); - break; - } - } - } - input.endObject(); - return this; - } - - @Override - public BattleMechanismBar clone() { - return new BattleMechanismBar().copyFrom(this); - } - - @Override - public boolean isEmpty() { - return ((bitField0_) == 0); - } - - public static BattleMechanismBar parseFrom(final byte[] data) throws - InvalidProtocolBufferException { - return ProtoMessage.mergeFrom(new BattleMechanismBar(), data).checkInitialized(); - } - - public static BattleMechanismBar parseFrom(final ProtoSource input) throws IOException { - return ProtoMessage.mergeFrom(new BattleMechanismBar(), input).checkInitialized(); - } - - public static BattleMechanismBar parseFrom(final JsonSource input) throws IOException { - return ProtoMessage.mergeFrom(new BattleMechanismBar(), input).checkInitialized(); - } - - /** - * @return factory for creating BattleMechanismBar messages - */ - public static MessageFactory getFactory() { - return BattleMechanismBarFactory.INSTANCE; - } - - private enum BattleMechanismBarFactory implements MessageFactory { - INSTANCE; - - @Override - public BattleMechanismBar create() { - return BattleMechanismBar.newInstance(); - } - } - - /** - * Contains name constants used for serializing JSON - */ - static class FieldNames { - static final FieldName oMMELBCMNNM = FieldName.forField("OMMELBCMNNM"); - - static final FieldName aMMAAKPAKAA = FieldName.forField("AMMAAKPAKAA"); - } - } -} diff --git a/src/generated/main/emu/lunarcore/proto/BattleRelicOuterClass.java b/src/generated/main/emu/lunarcore/proto/BattleRelicOuterClass.java index 63937edc3..2269655db 100644 --- a/src/generated/main/emu/lunarcore/proto/BattleRelicOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/BattleRelicOuterClass.java @@ -39,21 +39,6 @@ public static final class BattleRelic extends ProtoMessage implemen */ private int uniqueId; - /** - * optional uint32 relic_id = 6; - */ - private int relicId; - - /** - * optional uint32 slot = 7; - */ - private int slot; - - /** - * optional uint32 DCKIHBLMEGF = 8; - */ - private int dCKIHBLMEGF; - /** * repeated .RelicAffix sub_affix_list = 4; */ @@ -217,123 +202,12 @@ public BattleRelic setUniqueId(final int value) { return this; } - /** - * optional uint32 relic_id = 6; - * @return whether the relicId field is set - */ - public boolean hasRelicId() { - return (bitField0_ & 0x00000010) != 0; - } - - /** - * optional uint32 relic_id = 6; - * @return this - */ - public BattleRelic clearRelicId() { - bitField0_ &= ~0x00000010; - relicId = 0; - return this; - } - - /** - * optional uint32 relic_id = 6; - * @return the relicId - */ - public int getRelicId() { - return relicId; - } - - /** - * optional uint32 relic_id = 6; - * @param value the relicId to set - * @return this - */ - public BattleRelic setRelicId(final int value) { - bitField0_ |= 0x00000010; - relicId = value; - return this; - } - - /** - * optional uint32 slot = 7; - * @return whether the slot field is set - */ - public boolean hasSlot() { - return (bitField0_ & 0x00000020) != 0; - } - - /** - * optional uint32 slot = 7; - * @return this - */ - public BattleRelic clearSlot() { - bitField0_ &= ~0x00000020; - slot = 0; - return this; - } - - /** - * optional uint32 slot = 7; - * @return the slot - */ - public int getSlot() { - return slot; - } - - /** - * optional uint32 slot = 7; - * @param value the slot to set - * @return this - */ - public BattleRelic setSlot(final int value) { - bitField0_ |= 0x00000020; - slot = value; - return this; - } - - /** - * optional uint32 DCKIHBLMEGF = 8; - * @return whether the dCKIHBLMEGF field is set - */ - public boolean hasDCKIHBLMEGF() { - return (bitField0_ & 0x00000040) != 0; - } - - /** - * optional uint32 DCKIHBLMEGF = 8; - * @return this - */ - public BattleRelic clearDCKIHBLMEGF() { - bitField0_ &= ~0x00000040; - dCKIHBLMEGF = 0; - return this; - } - - /** - * optional uint32 DCKIHBLMEGF = 8; - * @return the dCKIHBLMEGF - */ - public int getDCKIHBLMEGF() { - return dCKIHBLMEGF; - } - - /** - * optional uint32 DCKIHBLMEGF = 8; - * @param value the dCKIHBLMEGF to set - * @return this - */ - public BattleRelic setDCKIHBLMEGF(final int value) { - bitField0_ |= 0x00000040; - dCKIHBLMEGF = value; - return this; - } - /** * repeated .RelicAffix sub_affix_list = 4; * @return whether the subAffixList field is set */ public boolean hasSubAffixList() { - return (bitField0_ & 0x00000080) != 0; + return (bitField0_ & 0x00000010) != 0; } /** @@ -341,7 +215,7 @@ public boolean hasSubAffixList() { * @return this */ public BattleRelic clearSubAffixList() { - bitField0_ &= ~0x00000080; + bitField0_ &= ~0x00000010; subAffixList.clear(); return this; } @@ -370,7 +244,7 @@ public RepeatedMessage getSubAffixList() { * @return internal storage object for modifications */ public RepeatedMessage getMutableSubAffixList() { - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000010; return subAffixList; } @@ -380,7 +254,7 @@ public RepeatedMessage getMutableSubAffixList() * @return this */ public BattleRelic addSubAffixList(final RelicAffixOuterClass.RelicAffix value) { - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000010; subAffixList.add(value); return this; } @@ -391,7 +265,7 @@ public BattleRelic addSubAffixList(final RelicAffixOuterClass.RelicAffix value) * @return this */ public BattleRelic addAllSubAffixList(final RelicAffixOuterClass.RelicAffix... values) { - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000010; subAffixList.addAll(values); return this; } @@ -405,9 +279,6 @@ public BattleRelic copyFrom(final BattleRelic other) { level = other.level; mainAffixId = other.mainAffixId; uniqueId = other.uniqueId; - relicId = other.relicId; - slot = other.slot; - dCKIHBLMEGF = other.dCKIHBLMEGF; subAffixList.copyFrom(other.subAffixList); } return this; @@ -431,15 +302,6 @@ public BattleRelic mergeFrom(final BattleRelic other) { if (other.hasUniqueId()) { setUniqueId(other.uniqueId); } - if (other.hasRelicId()) { - setRelicId(other.relicId); - } - if (other.hasSlot()) { - setSlot(other.slot); - } - if (other.hasDCKIHBLMEGF()) { - setDCKIHBLMEGF(other.dCKIHBLMEGF); - } if (other.hasSubAffixList()) { getMutableSubAffixList().addAll(other.subAffixList); } @@ -457,9 +319,6 @@ public BattleRelic clear() { level = 0; mainAffixId = 0; uniqueId = 0; - relicId = 0; - slot = 0; - dCKIHBLMEGF = 0; subAffixList.clear(); return this; } @@ -489,9 +348,6 @@ public boolean equals(Object o) { && (!hasLevel() || level == other.level) && (!hasMainAffixId() || mainAffixId == other.mainAffixId) && (!hasUniqueId() || uniqueId == other.uniqueId) - && (!hasRelicId() || relicId == other.relicId) - && (!hasSlot() || slot == other.slot) - && (!hasDCKIHBLMEGF() || dCKIHBLMEGF == other.dCKIHBLMEGF) && (!hasSubAffixList() || subAffixList.equals(other.subAffixList)); } @@ -514,18 +370,6 @@ public void writeTo(final ProtoSink output) throws IOException { output.writeUInt32NoTag(uniqueId); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 48); - output.writeUInt32NoTag(relicId); - } - if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 56); - output.writeUInt32NoTag(slot); - } - if ((bitField0_ & 0x00000040) != 0) { - output.writeRawByte((byte) 64); - output.writeUInt32NoTag(dCKIHBLMEGF); - } - if ((bitField0_ & 0x00000080) != 0) { for (int i = 0; i < subAffixList.length(); i++) { output.writeRawByte((byte) 34); output.writeMessageNoTag(subAffixList.get(i)); @@ -549,15 +393,6 @@ protected int computeSerializedSize() { size += 1 + ProtoSink.computeUInt32SizeNoTag(uniqueId); } if ((bitField0_ & 0x00000010) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(relicId); - } - if ((bitField0_ & 0x00000020) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(slot); - } - if ((bitField0_ & 0x00000040) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(dCKIHBLMEGF); - } - if ((bitField0_ & 0x00000080) != 0) { size += (1 * subAffixList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(subAffixList); } return size; @@ -602,33 +437,6 @@ public BattleRelic mergeFrom(final ProtoSource input) throws IOException { uniqueId = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 48) { - break; - } - } - case 48: { - // relicId - relicId = input.readUInt32(); - bitField0_ |= 0x00000010; - tag = input.readTag(); - if (tag != 56) { - break; - } - } - case 56: { - // slot - slot = input.readUInt32(); - bitField0_ |= 0x00000020; - tag = input.readTag(); - if (tag != 64) { - break; - } - } - case 64: { - // dCKIHBLMEGF - dCKIHBLMEGF = input.readUInt32(); - bitField0_ |= 0x00000040; - tag = input.readTag(); if (tag != 34) { break; } @@ -636,7 +444,7 @@ public BattleRelic mergeFrom(final ProtoSource input) throws IOException { case 34: { // subAffixList tag = input.readRepeatedMessage(subAffixList, tag); - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000010; if (tag != 0) { break; } @@ -671,15 +479,6 @@ public void writeTo(final JsonSink output) throws IOException { output.writeUInt32(FieldNames.uniqueId, uniqueId); } if ((bitField0_ & 0x00000010) != 0) { - output.writeUInt32(FieldNames.relicId, relicId); - } - if ((bitField0_ & 0x00000020) != 0) { - output.writeUInt32(FieldNames.slot, slot); - } - if ((bitField0_ & 0x00000040) != 0) { - output.writeUInt32(FieldNames.dCKIHBLMEGF, dCKIHBLMEGF); - } - if ((bitField0_ & 0x00000080) != 0) { output.writeRepeatedMessage(FieldNames.subAffixList, subAffixList); } output.endObject(); @@ -738,46 +537,12 @@ public BattleRelic mergeFrom(final JsonSource input) throws IOException { } break; } - case 1090714606: - case -547564185: { - if (input.isAtField(FieldNames.relicId)) { - if (!input.trySkipNullValue()) { - relicId = input.readUInt32(); - bitField0_ |= 0x00000010; - } - } else { - input.skipUnknownField(); - } - break; - } - case 3533310: { - if (input.isAtField(FieldNames.slot)) { - if (!input.trySkipNullValue()) { - slot = input.readUInt32(); - bitField0_ |= 0x00000020; - } - } else { - input.skipUnknownField(); - } - break; - } - case -521277108: { - if (input.isAtField(FieldNames.dCKIHBLMEGF)) { - if (!input.trySkipNullValue()) { - dCKIHBLMEGF = input.readUInt32(); - bitField0_ |= 0x00000040; - } - } else { - input.skipUnknownField(); - } - break; - } case -600836050: case 919890188: { if (input.isAtField(FieldNames.subAffixList)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(subAffixList); - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000010; } } else { input.skipUnknownField(); @@ -844,12 +609,6 @@ static class FieldNames { static final FieldName uniqueId = FieldName.forField("uniqueId", "unique_id"); - static final FieldName relicId = FieldName.forField("relicId", "relic_id"); - - static final FieldName slot = FieldName.forField("slot"); - - static final FieldName dCKIHBLMEGF = FieldName.forField("DCKIHBLMEGF"); - static final FieldName subAffixList = FieldName.forField("subAffixList", "sub_affix_list"); } } diff --git a/src/generated/main/emu/lunarcore/proto/BoardDataSyncOuterClass.java b/src/generated/main/emu/lunarcore/proto/BoardDataSyncOuterClass.java index e6459cb7d..f7602b32b 100644 --- a/src/generated/main/emu/lunarcore/proto/BoardDataSyncOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/BoardDataSyncOuterClass.java @@ -26,7 +26,7 @@ public static final class BoardDataSync extends ProtoMessage impl private final Utf8String signature = Utf8String.newEmptyInstance(); /** - * repeated .HeadIcon unlocked_head_icon_list = 9; + * repeated .HeadIcon unlocked_head_icon_list = 5; */ private final RepeatedMessage unlockedHeadIconList = RepeatedMessage.newEmptyInstance(HeadIconOuterClass.HeadIcon.getFactory()); @@ -106,7 +106,7 @@ public BoardDataSync setSignature(final Utf8String value) { } /** - * repeated .HeadIcon unlocked_head_icon_list = 9; + * repeated .HeadIcon unlocked_head_icon_list = 5; * @return whether the unlockedHeadIconList field is set */ public boolean hasUnlockedHeadIconList() { @@ -114,7 +114,7 @@ public boolean hasUnlockedHeadIconList() { } /** - * repeated .HeadIcon unlocked_head_icon_list = 9; + * repeated .HeadIcon unlocked_head_icon_list = 5; * @return this */ public BoardDataSync clearUnlockedHeadIconList() { @@ -124,7 +124,7 @@ public BoardDataSync clearUnlockedHeadIconList() { } /** - * repeated .HeadIcon unlocked_head_icon_list = 9; + * repeated .HeadIcon unlocked_head_icon_list = 5; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -138,7 +138,7 @@ public RepeatedMessage getUnlockedHeadIconList() { } /** - * repeated .HeadIcon unlocked_head_icon_list = 9; + * repeated .HeadIcon unlocked_head_icon_list = 5; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -152,7 +152,7 @@ public RepeatedMessage getMutableUnlockedHeadIconLi } /** - * repeated .HeadIcon unlocked_head_icon_list = 9; + * repeated .HeadIcon unlocked_head_icon_list = 5; * @param value the unlockedHeadIconList to add * @return this */ @@ -163,7 +163,7 @@ public BoardDataSync addUnlockedHeadIconList(final HeadIconOuterClass.HeadIcon v } /** - * repeated .HeadIcon unlocked_head_icon_list = 9; + * repeated .HeadIcon unlocked_head_icon_list = 5; * @param values the unlockedHeadIconList to add * @return this */ @@ -245,7 +245,7 @@ public void writeTo(final ProtoSink output) throws IOException { } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < unlockedHeadIconList.length(); i++) { - output.writeRawByte((byte) 74); + output.writeRawByte((byte) 42); output.writeMessageNoTag(unlockedHeadIconList.get(i)); } } @@ -275,11 +275,11 @@ public BoardDataSync mergeFrom(final ProtoSource input) throws IOException { input.readString(signature); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 74) { + if (tag != 42) { break; } } - case 74: { + case 42: { // unlockedHeadIconList tag = input.readRepeatedMessage(unlockedHeadIconList, tag); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/BuffInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/BuffInfoOuterClass.java index bdc8fbb6f..b5f50d289 100644 --- a/src/generated/main/emu/lunarcore/proto/BuffInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/BuffInfoOuterClass.java @@ -22,37 +22,37 @@ public static final class BuffInfo extends ProtoMessage implements Clo private static final long serialVersionUID = 0L; /** - * optional uint64 add_time_ms = 13; + * optional uint64 add_time_ms = 10; */ private long addTimeMs; /** - * optional float life_time = 12; + * optional float life_time = 11; */ private float lifeTime; /** - * optional uint32 base_avatar_id = 1; + * optional uint32 level = 2; */ - private int baseAvatarId; + private int level; /** - * optional uint32 level = 6; + * optional uint32 base_avatar_id = 3; */ - private int level; + private int baseAvatarId; /** - * optional uint32 count = 7; + * optional uint32 buff_id = 5; */ - private int count; + private int buffId; /** - * optional uint32 buff_id = 15; + * optional uint32 count = 14; */ - private int buffId; + private int count; /** - * repeated .BuffInfo.DynamicValuesEntry dynamic_values = 10; + * repeated .BuffInfo.DynamicValuesEntry dynamic_values = 4; */ private final RepeatedMessage dynamicValues = RepeatedMessage.newEmptyInstance(DynamicValuesEntry.getFactory()); @@ -67,7 +67,7 @@ public static BuffInfo newInstance() { } /** - * optional uint64 add_time_ms = 13; + * optional uint64 add_time_ms = 10; * @return whether the addTimeMs field is set */ public boolean hasAddTimeMs() { @@ -75,7 +75,7 @@ public boolean hasAddTimeMs() { } /** - * optional uint64 add_time_ms = 13; + * optional uint64 add_time_ms = 10; * @return this */ public BuffInfo clearAddTimeMs() { @@ -85,7 +85,7 @@ public BuffInfo clearAddTimeMs() { } /** - * optional uint64 add_time_ms = 13; + * optional uint64 add_time_ms = 10; * @return the addTimeMs */ public long getAddTimeMs() { @@ -93,7 +93,7 @@ public long getAddTimeMs() { } /** - * optional uint64 add_time_ms = 13; + * optional uint64 add_time_ms = 10; * @param value the addTimeMs to set * @return this */ @@ -104,7 +104,7 @@ public BuffInfo setAddTimeMs(final long value) { } /** - * optional float life_time = 12; + * optional float life_time = 11; * @return whether the lifeTime field is set */ public boolean hasLifeTime() { @@ -112,7 +112,7 @@ public boolean hasLifeTime() { } /** - * optional float life_time = 12; + * optional float life_time = 11; * @return this */ public BuffInfo clearLifeTime() { @@ -122,7 +122,7 @@ public BuffInfo clearLifeTime() { } /** - * optional float life_time = 12; + * optional float life_time = 11; * @return the lifeTime */ public float getLifeTime() { @@ -130,7 +130,7 @@ public float getLifeTime() { } /** - * optional float life_time = 12; + * optional float life_time = 11; * @param value the lifeTime to set * @return this */ @@ -141,155 +141,155 @@ public BuffInfo setLifeTime(final float value) { } /** - * optional uint32 base_avatar_id = 1; - * @return whether the baseAvatarId field is set + * optional uint32 level = 2; + * @return whether the level field is set */ - public boolean hasBaseAvatarId() { + public boolean hasLevel() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 base_avatar_id = 1; + * optional uint32 level = 2; * @return this */ - public BuffInfo clearBaseAvatarId() { + public BuffInfo clearLevel() { bitField0_ &= ~0x00000004; - baseAvatarId = 0; + level = 0; return this; } /** - * optional uint32 base_avatar_id = 1; - * @return the baseAvatarId + * optional uint32 level = 2; + * @return the level */ - public int getBaseAvatarId() { - return baseAvatarId; + public int getLevel() { + return level; } /** - * optional uint32 base_avatar_id = 1; - * @param value the baseAvatarId to set + * optional uint32 level = 2; + * @param value the level to set * @return this */ - public BuffInfo setBaseAvatarId(final int value) { + public BuffInfo setLevel(final int value) { bitField0_ |= 0x00000004; - baseAvatarId = value; + level = value; return this; } /** - * optional uint32 level = 6; - * @return whether the level field is set + * optional uint32 base_avatar_id = 3; + * @return whether the baseAvatarId field is set */ - public boolean hasLevel() { + public boolean hasBaseAvatarId() { return (bitField0_ & 0x00000008) != 0; } /** - * optional uint32 level = 6; + * optional uint32 base_avatar_id = 3; * @return this */ - public BuffInfo clearLevel() { + public BuffInfo clearBaseAvatarId() { bitField0_ &= ~0x00000008; - level = 0; + baseAvatarId = 0; return this; } /** - * optional uint32 level = 6; - * @return the level + * optional uint32 base_avatar_id = 3; + * @return the baseAvatarId */ - public int getLevel() { - return level; + public int getBaseAvatarId() { + return baseAvatarId; } /** - * optional uint32 level = 6; - * @param value the level to set + * optional uint32 base_avatar_id = 3; + * @param value the baseAvatarId to set * @return this */ - public BuffInfo setLevel(final int value) { + public BuffInfo setBaseAvatarId(final int value) { bitField0_ |= 0x00000008; - level = value; + baseAvatarId = value; return this; } /** - * optional uint32 count = 7; - * @return whether the count field is set + * optional uint32 buff_id = 5; + * @return whether the buffId field is set */ - public boolean hasCount() { + public boolean hasBuffId() { return (bitField0_ & 0x00000010) != 0; } /** - * optional uint32 count = 7; + * optional uint32 buff_id = 5; * @return this */ - public BuffInfo clearCount() { + public BuffInfo clearBuffId() { bitField0_ &= ~0x00000010; - count = 0; + buffId = 0; return this; } /** - * optional uint32 count = 7; - * @return the count + * optional uint32 buff_id = 5; + * @return the buffId */ - public int getCount() { - return count; + public int getBuffId() { + return buffId; } /** - * optional uint32 count = 7; - * @param value the count to set + * optional uint32 buff_id = 5; + * @param value the buffId to set * @return this */ - public BuffInfo setCount(final int value) { + public BuffInfo setBuffId(final int value) { bitField0_ |= 0x00000010; - count = value; + buffId = value; return this; } /** - * optional uint32 buff_id = 15; - * @return whether the buffId field is set + * optional uint32 count = 14; + * @return whether the count field is set */ - public boolean hasBuffId() { + public boolean hasCount() { return (bitField0_ & 0x00000020) != 0; } /** - * optional uint32 buff_id = 15; + * optional uint32 count = 14; * @return this */ - public BuffInfo clearBuffId() { + public BuffInfo clearCount() { bitField0_ &= ~0x00000020; - buffId = 0; + count = 0; return this; } /** - * optional uint32 buff_id = 15; - * @return the buffId + * optional uint32 count = 14; + * @return the count */ - public int getBuffId() { - return buffId; + public int getCount() { + return count; } /** - * optional uint32 buff_id = 15; - * @param value the buffId to set + * optional uint32 count = 14; + * @param value the count to set * @return this */ - public BuffInfo setBuffId(final int value) { + public BuffInfo setCount(final int value) { bitField0_ |= 0x00000020; - buffId = value; + count = value; return this; } /** - * repeated .BuffInfo.DynamicValuesEntry dynamic_values = 10; + * repeated .BuffInfo.DynamicValuesEntry dynamic_values = 4; * @return whether the dynamicValues field is set */ public boolean hasDynamicValues() { @@ -297,7 +297,7 @@ public boolean hasDynamicValues() { } /** - * repeated .BuffInfo.DynamicValuesEntry dynamic_values = 10; + * repeated .BuffInfo.DynamicValuesEntry dynamic_values = 4; * @return this */ public BuffInfo clearDynamicValues() { @@ -307,7 +307,7 @@ public BuffInfo clearDynamicValues() { } /** - * repeated .BuffInfo.DynamicValuesEntry dynamic_values = 10; + * repeated .BuffInfo.DynamicValuesEntry dynamic_values = 4; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -321,7 +321,7 @@ public RepeatedMessage getDynamicValues() { } /** - * repeated .BuffInfo.DynamicValuesEntry dynamic_values = 10; + * repeated .BuffInfo.DynamicValuesEntry dynamic_values = 4; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -335,7 +335,7 @@ public RepeatedMessage getMutableDynamicValues() { } /** - * repeated .BuffInfo.DynamicValuesEntry dynamic_values = 10; + * repeated .BuffInfo.DynamicValuesEntry dynamic_values = 4; * @param value the dynamicValues to add * @return this */ @@ -346,7 +346,7 @@ public BuffInfo addDynamicValues(final DynamicValuesEntry value) { } /** - * repeated .BuffInfo.DynamicValuesEntry dynamic_values = 10; + * repeated .BuffInfo.DynamicValuesEntry dynamic_values = 4; * @param values the dynamicValues to add * @return this */ @@ -363,10 +363,10 @@ public BuffInfo copyFrom(final BuffInfo other) { bitField0_ = other.bitField0_; addTimeMs = other.addTimeMs; lifeTime = other.lifeTime; - baseAvatarId = other.baseAvatarId; level = other.level; - count = other.count; + baseAvatarId = other.baseAvatarId; buffId = other.buffId; + count = other.count; dynamicValues.copyFrom(other.dynamicValues); } return this; @@ -384,18 +384,18 @@ public BuffInfo mergeFrom(final BuffInfo other) { if (other.hasLifeTime()) { setLifeTime(other.lifeTime); } - if (other.hasBaseAvatarId()) { - setBaseAvatarId(other.baseAvatarId); - } if (other.hasLevel()) { setLevel(other.level); } - if (other.hasCount()) { - setCount(other.count); + if (other.hasBaseAvatarId()) { + setBaseAvatarId(other.baseAvatarId); } if (other.hasBuffId()) { setBuffId(other.buffId); } + if (other.hasCount()) { + setCount(other.count); + } if (other.hasDynamicValues()) { getMutableDynamicValues().addAll(other.dynamicValues); } @@ -411,10 +411,10 @@ public BuffInfo clear() { bitField0_ = 0; addTimeMs = 0L; lifeTime = 0F; - baseAvatarId = 0; level = 0; - count = 0; + baseAvatarId = 0; buffId = 0; + count = 0; dynamicValues.clear(); return this; } @@ -442,42 +442,42 @@ public boolean equals(Object o) { return bitField0_ == other.bitField0_ && (!hasAddTimeMs() || addTimeMs == other.addTimeMs) && (!hasLifeTime() || ProtoUtil.isEqual(lifeTime, other.lifeTime)) - && (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId) && (!hasLevel() || level == other.level) - && (!hasCount() || count == other.count) + && (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId) && (!hasBuffId() || buffId == other.buffId) + && (!hasCount() || count == other.count) && (!hasDynamicValues() || dynamicValues.equals(other.dynamicValues)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 80); output.writeUInt64NoTag(addTimeMs); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 101); + output.writeRawByte((byte) 93); output.writeFloatNoTag(lifeTime); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 8); - output.writeUInt32NoTag(baseAvatarId); + output.writeRawByte((byte) 16); + output.writeUInt32NoTag(level); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 48); - output.writeUInt32NoTag(level); + output.writeRawByte((byte) 24); + output.writeUInt32NoTag(baseAvatarId); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 56); - output.writeUInt32NoTag(count); + output.writeRawByte((byte) 40); + output.writeUInt32NoTag(buffId); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 120); - output.writeUInt32NoTag(buffId); + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(count); } if ((bitField0_ & 0x00000040) != 0) { for (int i = 0; i < dynamicValues.length(); i++) { - output.writeRawByte((byte) 82); + output.writeRawByte((byte) 34); output.writeMessageNoTag(dynamicValues.get(i)); } } @@ -493,16 +493,16 @@ protected int computeSerializedSize() { size += 5; } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(level); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(level); + size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId); } if ((bitField0_ & 0x00000010) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(count); + size += 1 + ProtoSink.computeUInt32SizeNoTag(buffId); } if ((bitField0_ & 0x00000020) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(buffId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(count); } if ((bitField0_ & 0x00000040) != 0) { size += (1 * dynamicValues.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(dynamicValues); @@ -517,61 +517,61 @@ public BuffInfo mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 104: { + case 80: { // addTimeMs addTimeMs = input.readUInt64(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 101) { + if (tag != 93) { break; } } - case 101: { + case 93: { // lifeTime lifeTime = input.readFloat(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 8) { + if (tag != 16) { break; } } - case 8: { - // baseAvatarId - baseAvatarId = input.readUInt32(); + case 16: { + // level + level = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 48) { + if (tag != 24) { break; } } - case 48: { - // level - level = input.readUInt32(); + case 24: { + // baseAvatarId + baseAvatarId = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 56) { + if (tag != 40) { break; } } - case 56: { - // count - count = input.readUInt32(); + case 40: { + // buffId + buffId = input.readUInt32(); bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 120) { + if (tag != 112) { break; } } - case 120: { - // buffId - buffId = input.readUInt32(); + case 112: { + // count + count = input.readUInt32(); bitField0_ |= 0x00000020; tag = input.readTag(); - if (tag != 82) { + if (tag != 34) { break; } } - case 82: { + case 34: { // dynamicValues tag = input.readRepeatedMessage(dynamicValues, tag); bitField0_ |= 0x00000040; @@ -603,16 +603,16 @@ public void writeTo(final JsonSink output) throws IOException { output.writeFloat(FieldNames.lifeTime, lifeTime); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId); + output.writeUInt32(FieldNames.level, level); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.level, level); + output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId); } if ((bitField0_ & 0x00000010) != 0) { - output.writeUInt32(FieldNames.count, count); + output.writeUInt32(FieldNames.buffId, buffId); } if ((bitField0_ & 0x00000020) != 0) { - output.writeUInt32(FieldNames.buffId, buffId); + output.writeUInt32(FieldNames.count, count); } if ((bitField0_ & 0x00000040) != 0) { output.writeRepeatedMessage(FieldNames.dynamicValues, dynamicValues); @@ -651,11 +651,10 @@ public BuffInfo mergeFrom(final JsonSource input) throws IOException { } break; } - case 118022725: - case -1756826157: { - if (input.isAtField(FieldNames.baseAvatarId)) { + case 102865796: { + if (input.isAtField(FieldNames.level)) { if (!input.trySkipNullValue()) { - baseAvatarId = input.readUInt32(); + level = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -663,10 +662,11 @@ public BuffInfo mergeFrom(final JsonSource input) throws IOException { } break; } - case 102865796: { - if (input.isAtField(FieldNames.level)) { + case 118022725: + case -1756826157: { + if (input.isAtField(FieldNames.baseAvatarId)) { if (!input.trySkipNullValue()) { - level = input.readUInt32(); + baseAvatarId = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -674,10 +674,11 @@ public BuffInfo mergeFrom(final JsonSource input) throws IOException { } break; } - case 94851343: { - if (input.isAtField(FieldNames.count)) { + case -1378119474: + case 227990663: { + if (input.isAtField(FieldNames.buffId)) { if (!input.trySkipNullValue()) { - count = input.readUInt32(); + buffId = input.readUInt32(); bitField0_ |= 0x00000010; } } else { @@ -685,11 +686,10 @@ public BuffInfo mergeFrom(final JsonSource input) throws IOException { } break; } - case -1378119474: - case 227990663: { - if (input.isAtField(FieldNames.buffId)) { + case 94851343: { + if (input.isAtField(FieldNames.count)) { if (!input.trySkipNullValue()) { - buffId = input.readUInt32(); + count = input.readUInt32(); bitField0_ |= 0x00000020; } } else { @@ -1119,14 +1119,14 @@ static class FieldNames { static final FieldName lifeTime = FieldName.forField("lifeTime", "life_time"); - static final FieldName baseAvatarId = FieldName.forField("baseAvatarId", "base_avatar_id"); - static final FieldName level = FieldName.forField("level"); - static final FieldName count = FieldName.forField("count"); + static final FieldName baseAvatarId = FieldName.forField("baseAvatarId", "base_avatar_id"); static final FieldName buffId = FieldName.forField("buffId", "buff_id"); + static final FieldName count = FieldName.forField("count"); + static final FieldName dynamicValues = FieldName.forField("dynamicValues", "dynamic_values"); } } diff --git a/src/generated/main/emu/lunarcore/proto/BuyGoodsCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/BuyGoodsCsReqOuterClass.java index 10c026178..151b2660c 100644 --- a/src/generated/main/emu/lunarcore/proto/BuyGoodsCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/BuyGoodsCsReqOuterClass.java @@ -19,9 +19,9 @@ public static final class BuyGoodsCsReq extends ProtoMessage impl private static final long serialVersionUID = 0L; /** - * optional uint32 item_id = 5; + * optional uint32 shop_id = 5; */ - private int itemId; + private int shopId; /** * optional uint32 goods_id = 7; @@ -29,14 +29,14 @@ public static final class BuyGoodsCsReq extends ProtoMessage impl private int goodsId; /** - * optional uint32 goods_num = 9; + * optional uint32 goods_num = 10; */ private int goodsNum; /** - * optional uint32 shop_id = 12; + * optional uint32 item_id = 15; */ - private int shopId; + private int itemId; private BuyGoodsCsReq() { } @@ -49,39 +49,39 @@ public static BuyGoodsCsReq newInstance() { } /** - * optional uint32 item_id = 5; - * @return whether the itemId field is set + * optional uint32 shop_id = 5; + * @return whether the shopId field is set */ - public boolean hasItemId() { + public boolean hasShopId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 item_id = 5; + * optional uint32 shop_id = 5; * @return this */ - public BuyGoodsCsReq clearItemId() { + public BuyGoodsCsReq clearShopId() { bitField0_ &= ~0x00000001; - itemId = 0; + shopId = 0; return this; } /** - * optional uint32 item_id = 5; - * @return the itemId + * optional uint32 shop_id = 5; + * @return the shopId */ - public int getItemId() { - return itemId; + public int getShopId() { + return shopId; } /** - * optional uint32 item_id = 5; - * @param value the itemId to set + * optional uint32 shop_id = 5; + * @param value the shopId to set * @return this */ - public BuyGoodsCsReq setItemId(final int value) { + public BuyGoodsCsReq setShopId(final int value) { bitField0_ |= 0x00000001; - itemId = value; + shopId = value; return this; } @@ -123,7 +123,7 @@ public BuyGoodsCsReq setGoodsId(final int value) { } /** - * optional uint32 goods_num = 9; + * optional uint32 goods_num = 10; * @return whether the goodsNum field is set */ public boolean hasGoodsNum() { @@ -131,7 +131,7 @@ public boolean hasGoodsNum() { } /** - * optional uint32 goods_num = 9; + * optional uint32 goods_num = 10; * @return this */ public BuyGoodsCsReq clearGoodsNum() { @@ -141,7 +141,7 @@ public BuyGoodsCsReq clearGoodsNum() { } /** - * optional uint32 goods_num = 9; + * optional uint32 goods_num = 10; * @return the goodsNum */ public int getGoodsNum() { @@ -149,7 +149,7 @@ public int getGoodsNum() { } /** - * optional uint32 goods_num = 9; + * optional uint32 goods_num = 10; * @param value the goodsNum to set * @return this */ @@ -160,39 +160,39 @@ public BuyGoodsCsReq setGoodsNum(final int value) { } /** - * optional uint32 shop_id = 12; - * @return whether the shopId field is set + * optional uint32 item_id = 15; + * @return whether the itemId field is set */ - public boolean hasShopId() { + public boolean hasItemId() { return (bitField0_ & 0x00000008) != 0; } /** - * optional uint32 shop_id = 12; + * optional uint32 item_id = 15; * @return this */ - public BuyGoodsCsReq clearShopId() { + public BuyGoodsCsReq clearItemId() { bitField0_ &= ~0x00000008; - shopId = 0; + itemId = 0; return this; } /** - * optional uint32 shop_id = 12; - * @return the shopId + * optional uint32 item_id = 15; + * @return the itemId */ - public int getShopId() { - return shopId; + public int getItemId() { + return itemId; } /** - * optional uint32 shop_id = 12; - * @param value the shopId to set + * optional uint32 item_id = 15; + * @param value the itemId to set * @return this */ - public BuyGoodsCsReq setShopId(final int value) { + public BuyGoodsCsReq setItemId(final int value) { bitField0_ |= 0x00000008; - shopId = value; + itemId = value; return this; } @@ -201,10 +201,10 @@ public BuyGoodsCsReq copyFrom(final BuyGoodsCsReq other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - itemId = other.itemId; + shopId = other.shopId; goodsId = other.goodsId; goodsNum = other.goodsNum; - shopId = other.shopId; + itemId = other.itemId; } return this; } @@ -215,8 +215,8 @@ public BuyGoodsCsReq mergeFrom(final BuyGoodsCsReq other) { return this; } cachedSize = -1; - if (other.hasItemId()) { - setItemId(other.itemId); + if (other.hasShopId()) { + setShopId(other.shopId); } if (other.hasGoodsId()) { setGoodsId(other.goodsId); @@ -224,8 +224,8 @@ public BuyGoodsCsReq mergeFrom(final BuyGoodsCsReq other) { if (other.hasGoodsNum()) { setGoodsNum(other.goodsNum); } - if (other.hasShopId()) { - setShopId(other.shopId); + if (other.hasItemId()) { + setItemId(other.itemId); } return this; } @@ -237,10 +237,10 @@ public BuyGoodsCsReq clear() { } cachedSize = -1; bitField0_ = 0; - itemId = 0; + shopId = 0; goodsId = 0; goodsNum = 0; - shopId = 0; + itemId = 0; return this; } @@ -264,29 +264,29 @@ public boolean equals(Object o) { } BuyGoodsCsReq other = (BuyGoodsCsReq) o; return bitField0_ == other.bitField0_ - && (!hasItemId() || itemId == other.itemId) + && (!hasShopId() || shopId == other.shopId) && (!hasGoodsId() || goodsId == other.goodsId) && (!hasGoodsNum() || goodsNum == other.goodsNum) - && (!hasShopId() || shopId == other.shopId); + && (!hasItemId() || itemId == other.itemId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { output.writeRawByte((byte) 40); - output.writeUInt32NoTag(itemId); + output.writeUInt32NoTag(shopId); } if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 56); output.writeUInt32NoTag(goodsId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(goodsNum); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 96); - output.writeUInt32NoTag(shopId); + output.writeRawByte((byte) 120); + output.writeUInt32NoTag(itemId); } } @@ -294,7 +294,7 @@ public void writeTo(final ProtoSink output) throws IOException { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(itemId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(shopId); } if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(goodsId); @@ -303,7 +303,7 @@ protected int computeSerializedSize() { size += 1 + ProtoSink.computeUInt32SizeNoTag(goodsNum); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(shopId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(itemId); } return size; } @@ -316,8 +316,8 @@ public BuyGoodsCsReq mergeFrom(final ProtoSource input) throws IOException { while (true) { switch (tag) { case 40: { - // itemId - itemId = input.readUInt32(); + // shopId + shopId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 56) { @@ -329,22 +329,22 @@ public BuyGoodsCsReq mergeFrom(final ProtoSource input) throws IOException { goodsId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 72) { + if (tag != 80) { break; } } - case 72: { + case 80: { // goodsNum goodsNum = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 96) { + if (tag != 120) { break; } } - case 96: { - // shopId - shopId = input.readUInt32(); + case 120: { + // itemId + itemId = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); if (tag != 0) { @@ -369,7 +369,7 @@ public BuyGoodsCsReq mergeFrom(final ProtoSource input) throws IOException { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.itemId, itemId); + output.writeUInt32(FieldNames.shopId, shopId); } if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.goodsId, goodsId); @@ -378,7 +378,7 @@ public void writeTo(final JsonSink output) throws IOException { output.writeUInt32(FieldNames.goodsNum, goodsNum); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.shopId, shopId); + output.writeUInt32(FieldNames.itemId, itemId); } output.endObject(); } @@ -390,11 +390,11 @@ public BuyGoodsCsReq mergeFrom(final JsonSource input) throws IOException { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1178662002: - case 2116204999: { - if (input.isAtField(FieldNames.itemId)) { + case -903151951: + case 2067081988: { + if (input.isAtField(FieldNames.shopId)) { if (!input.trySkipNullValue()) { - itemId = input.readUInt32(); + shopId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -426,11 +426,11 @@ public BuyGoodsCsReq mergeFrom(final JsonSource input) throws IOException { } break; } - case -903151951: - case 2067081988: { - if (input.isAtField(FieldNames.shopId)) { + case -1178662002: + case 2116204999: { + if (input.isAtField(FieldNames.itemId)) { if (!input.trySkipNullValue()) { - shopId = input.readUInt32(); + itemId = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -490,13 +490,13 @@ public BuyGoodsCsReq create() { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName itemId = FieldName.forField("itemId", "item_id"); + static final FieldName shopId = FieldName.forField("shopId", "shop_id"); static final FieldName goodsId = FieldName.forField("goodsId", "goods_id"); static final FieldName goodsNum = FieldName.forField("goodsNum", "goods_num"); - static final FieldName shopId = FieldName.forField("shopId", "shop_id"); + static final FieldName itemId = FieldName.forField("itemId", "item_id"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/BuyGoodsScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/BuyGoodsScRspOuterClass.java index 72773dc51..d7dea5324 100644 --- a/src/generated/main/emu/lunarcore/proto/BuyGoodsScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/BuyGoodsScRspOuterClass.java @@ -19,27 +19,27 @@ public static final class BuyGoodsScRsp extends ProtoMessage impl private static final long serialVersionUID = 0L; /** - * optional uint32 goods_id = 1; + * optional uint32 retcode = 3; */ - private int goodsId; + private int retcode; /** - * optional uint32 retcode = 5; + * optional uint32 goods_buy_times = 8; */ - private int retcode; + private int goodsBuyTimes; /** - * optional uint32 goods_buy_times = 10; + * optional uint32 goods_id = 14; */ - private int goodsBuyTimes; + private int goodsId; /** - * optional uint32 shop_id = 14; + * optional uint32 shop_id = 15; */ private int shopId; /** - * optional .ItemList return_item_list = 9; + * optional .ItemList return_item_list = 4; */ private final ItemListOuterClass.ItemList returnItemList = ItemListOuterClass.ItemList.newInstance(); @@ -54,118 +54,118 @@ public static BuyGoodsScRsp newInstance() { } /** - * optional uint32 goods_id = 1; - * @return whether the goodsId field is set + * optional uint32 retcode = 3; + * @return whether the retcode field is set */ - public boolean hasGoodsId() { + public boolean hasRetcode() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 goods_id = 1; + * optional uint32 retcode = 3; * @return this */ - public BuyGoodsScRsp clearGoodsId() { + public BuyGoodsScRsp clearRetcode() { bitField0_ &= ~0x00000001; - goodsId = 0; + retcode = 0; return this; } /** - * optional uint32 goods_id = 1; - * @return the goodsId + * optional uint32 retcode = 3; + * @return the retcode */ - public int getGoodsId() { - return goodsId; + public int getRetcode() { + return retcode; } /** - * optional uint32 goods_id = 1; - * @param value the goodsId to set + * optional uint32 retcode = 3; + * @param value the retcode to set * @return this */ - public BuyGoodsScRsp setGoodsId(final int value) { + public BuyGoodsScRsp setRetcode(final int value) { bitField0_ |= 0x00000001; - goodsId = value; + retcode = value; return this; } /** - * optional uint32 retcode = 5; - * @return whether the retcode field is set + * optional uint32 goods_buy_times = 8; + * @return whether the goodsBuyTimes field is set */ - public boolean hasRetcode() { + public boolean hasGoodsBuyTimes() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 retcode = 5; + * optional uint32 goods_buy_times = 8; * @return this */ - public BuyGoodsScRsp clearRetcode() { + public BuyGoodsScRsp clearGoodsBuyTimes() { bitField0_ &= ~0x00000002; - retcode = 0; + goodsBuyTimes = 0; return this; } /** - * optional uint32 retcode = 5; - * @return the retcode + * optional uint32 goods_buy_times = 8; + * @return the goodsBuyTimes */ - public int getRetcode() { - return retcode; + public int getGoodsBuyTimes() { + return goodsBuyTimes; } /** - * optional uint32 retcode = 5; - * @param value the retcode to set + * optional uint32 goods_buy_times = 8; + * @param value the goodsBuyTimes to set * @return this */ - public BuyGoodsScRsp setRetcode(final int value) { + public BuyGoodsScRsp setGoodsBuyTimes(final int value) { bitField0_ |= 0x00000002; - retcode = value; + goodsBuyTimes = value; return this; } /** - * optional uint32 goods_buy_times = 10; - * @return whether the goodsBuyTimes field is set + * optional uint32 goods_id = 14; + * @return whether the goodsId field is set */ - public boolean hasGoodsBuyTimes() { + public boolean hasGoodsId() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 goods_buy_times = 10; + * optional uint32 goods_id = 14; * @return this */ - public BuyGoodsScRsp clearGoodsBuyTimes() { + public BuyGoodsScRsp clearGoodsId() { bitField0_ &= ~0x00000004; - goodsBuyTimes = 0; + goodsId = 0; return this; } /** - * optional uint32 goods_buy_times = 10; - * @return the goodsBuyTimes + * optional uint32 goods_id = 14; + * @return the goodsId */ - public int getGoodsBuyTimes() { - return goodsBuyTimes; + public int getGoodsId() { + return goodsId; } /** - * optional uint32 goods_buy_times = 10; - * @param value the goodsBuyTimes to set + * optional uint32 goods_id = 14; + * @param value the goodsId to set * @return this */ - public BuyGoodsScRsp setGoodsBuyTimes(final int value) { + public BuyGoodsScRsp setGoodsId(final int value) { bitField0_ |= 0x00000004; - goodsBuyTimes = value; + goodsId = value; return this; } /** - * optional uint32 shop_id = 14; + * optional uint32 shop_id = 15; * @return whether the shopId field is set */ public boolean hasShopId() { @@ -173,7 +173,7 @@ public boolean hasShopId() { } /** - * optional uint32 shop_id = 14; + * optional uint32 shop_id = 15; * @return this */ public BuyGoodsScRsp clearShopId() { @@ -183,7 +183,7 @@ public BuyGoodsScRsp clearShopId() { } /** - * optional uint32 shop_id = 14; + * optional uint32 shop_id = 15; * @return the shopId */ public int getShopId() { @@ -191,7 +191,7 @@ public int getShopId() { } /** - * optional uint32 shop_id = 14; + * optional uint32 shop_id = 15; * @param value the shopId to set * @return this */ @@ -202,7 +202,7 @@ public BuyGoodsScRsp setShopId(final int value) { } /** - * optional .ItemList return_item_list = 9; + * optional .ItemList return_item_list = 4; * @return whether the returnItemList field is set */ public boolean hasReturnItemList() { @@ -210,7 +210,7 @@ public boolean hasReturnItemList() { } /** - * optional .ItemList return_item_list = 9; + * optional .ItemList return_item_list = 4; * @return this */ public BuyGoodsScRsp clearReturnItemList() { @@ -220,7 +220,7 @@ public BuyGoodsScRsp clearReturnItemList() { } /** - * optional .ItemList return_item_list = 9; + * optional .ItemList return_item_list = 4; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -234,7 +234,7 @@ public ItemListOuterClass.ItemList getReturnItemList() { } /** - * optional .ItemList return_item_list = 9; + * optional .ItemList return_item_list = 4; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -248,7 +248,7 @@ public ItemListOuterClass.ItemList getMutableReturnItemList() { } /** - * optional .ItemList return_item_list = 9; + * optional .ItemList return_item_list = 4; * @param value the returnItemList to set * @return this */ @@ -263,9 +263,9 @@ public BuyGoodsScRsp copyFrom(final BuyGoodsScRsp other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - goodsId = other.goodsId; retcode = other.retcode; goodsBuyTimes = other.goodsBuyTimes; + goodsId = other.goodsId; shopId = other.shopId; returnItemList.copyFrom(other.returnItemList); } @@ -278,15 +278,15 @@ public BuyGoodsScRsp mergeFrom(final BuyGoodsScRsp other) { return this; } cachedSize = -1; - if (other.hasGoodsId()) { - setGoodsId(other.goodsId); - } if (other.hasRetcode()) { setRetcode(other.retcode); } if (other.hasGoodsBuyTimes()) { setGoodsBuyTimes(other.goodsBuyTimes); } + if (other.hasGoodsId()) { + setGoodsId(other.goodsId); + } if (other.hasShopId()) { setShopId(other.shopId); } @@ -303,9 +303,9 @@ public BuyGoodsScRsp clear() { } cachedSize = -1; bitField0_ = 0; - goodsId = 0; retcode = 0; goodsBuyTimes = 0; + goodsId = 0; shopId = 0; returnItemList.clear(); return this; @@ -332,9 +332,9 @@ public boolean equals(Object o) { } BuyGoodsScRsp other = (BuyGoodsScRsp) o; return bitField0_ == other.bitField0_ - && (!hasGoodsId() || goodsId == other.goodsId) && (!hasRetcode() || retcode == other.retcode) && (!hasGoodsBuyTimes() || goodsBuyTimes == other.goodsBuyTimes) + && (!hasGoodsId() || goodsId == other.goodsId) && (!hasShopId() || shopId == other.shopId) && (!hasReturnItemList() || returnItemList.equals(other.returnItemList)); } @@ -342,23 +342,23 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); - output.writeUInt32NoTag(goodsId); + output.writeRawByte((byte) 24); + output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 40); - output.writeUInt32NoTag(retcode); + output.writeRawByte((byte) 64); + output.writeUInt32NoTag(goodsBuyTimes); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 80); - output.writeUInt32NoTag(goodsBuyTimes); + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(goodsId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(shopId); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 74); + output.writeRawByte((byte) 34); output.writeMessageNoTag(returnItemList); } } @@ -367,13 +367,13 @@ public void writeTo(final ProtoSink output) throws IOException { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(goodsId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(goodsBuyTimes); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(goodsBuyTimes); + size += 1 + ProtoSink.computeUInt32SizeNoTag(goodsId); } if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(shopId); @@ -391,43 +391,43 @@ public BuyGoodsScRsp mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { - // goodsId - goodsId = input.readUInt32(); + case 24: { + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 40) { + if (tag != 64) { break; } } - case 40: { - // retcode - retcode = input.readUInt32(); + case 64: { + // goodsBuyTimes + goodsBuyTimes = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 80) { + if (tag != 112) { break; } } - case 80: { - // goodsBuyTimes - goodsBuyTimes = input.readUInt32(); + case 112: { + // goodsId + goodsId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 112) { + if (tag != 120) { break; } } - case 112: { + case 120: { // shopId shopId = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 74) { + if (tag != 34) { break; } } - case 74: { + case 34: { // returnItemList input.readMessage(returnItemList); bitField0_ |= 0x00000010; @@ -454,13 +454,13 @@ public BuyGoodsScRsp mergeFrom(final ProtoSource input) throws IOException { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.goodsId, goodsId); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.goodsBuyTimes, goodsBuyTimes); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.goodsBuyTimes, goodsBuyTimes); + output.writeUInt32(FieldNames.goodsId, goodsId); } if ((bitField0_ & 0x00000008) != 0) { output.writeUInt32(FieldNames.shopId, shopId); @@ -478,11 +478,10 @@ public BuyGoodsScRsp mergeFrom(final JsonSource input) throws IOException { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 207037201: - case 2123207332: { - if (input.isAtField(FieldNames.goodsId)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - goodsId = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -490,10 +489,11 @@ public BuyGoodsScRsp mergeFrom(final JsonSource input) throws IOException { } break; } - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case -1410858538: + case -230536540: { + if (input.isAtField(FieldNames.goodsBuyTimes)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + goodsBuyTimes = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -501,11 +501,11 @@ public BuyGoodsScRsp mergeFrom(final JsonSource input) throws IOException { } break; } - case -1410858538: - case -230536540: { - if (input.isAtField(FieldNames.goodsBuyTimes)) { + case 207037201: + case 2123207332: { + if (input.isAtField(FieldNames.goodsId)) { if (!input.trySkipNullValue()) { - goodsBuyTimes = input.readUInt32(); + goodsId = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -589,12 +589,12 @@ public BuyGoodsScRsp create() { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName goodsId = FieldName.forField("goodsId", "goods_id"); - static final FieldName retcode = FieldName.forField("retcode"); static final FieldName goodsBuyTimes = FieldName.forField("goodsBuyTimes", "goods_buy_times"); + static final FieldName goodsId = FieldName.forField("goodsId", "goods_id"); + static final FieldName shopId = FieldName.forField("shopId", "shop_id"); static final FieldName returnItemList = FieldName.forField("returnItemList", "return_item_list"); diff --git a/src/generated/main/emu/lunarcore/proto/ChallengeInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChallengeInfoOuterClass.java index 6c79e65cc..0455a6b00 100644 --- a/src/generated/main/emu/lunarcore/proto/ChallengeInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ChallengeInfoOuterClass.java @@ -19,37 +19,37 @@ public static final class ChallengeInfo extends ProtoMessage impl private static final long serialVersionUID = 0L; /** - * optional uint32 challenge_id = 1; + * optional uint32 score_two = 2; */ - private int challengeId; + private int scoreTwo; /** - * optional uint32 round_count = 2; + * optional uint32 round_count = 5; */ private int roundCount; /** - * optional uint32 score = 8; + * optional uint32 score = 9; */ private int score; /** - * optional uint32 score_two = 10; + * optional uint32 challenge_id = 14; */ - private int scoreTwo; + private int challengeId; /** - * optional .ChallengeStatus status = 6; + * optional .ExtraLineupType extra_lineup_type = 4; */ - private int status; + private int extraLineupType; /** - * optional .ExtraLineupType extra_lineup_type = 15; + * optional .ChallengeStatus status = 10; */ - private int extraLineupType; + private int status; /** - * optional .ChallengeStoryInfo story_info = 13; + * optional .ChallengeStoryInfo story_info = 6; */ private final ChallengeStoryInfoOuterClass.ChallengeStoryInfo storyInfo = ChallengeStoryInfoOuterClass.ChallengeStoryInfo.newInstance(); @@ -64,44 +64,44 @@ public static ChallengeInfo newInstance() { } /** - * optional uint32 challenge_id = 1; - * @return whether the challengeId field is set + * optional uint32 score_two = 2; + * @return whether the scoreTwo field is set */ - public boolean hasChallengeId() { + public boolean hasScoreTwo() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 challenge_id = 1; + * optional uint32 score_two = 2; * @return this */ - public ChallengeInfo clearChallengeId() { + public ChallengeInfo clearScoreTwo() { bitField0_ &= ~0x00000001; - challengeId = 0; + scoreTwo = 0; return this; } /** - * optional uint32 challenge_id = 1; - * @return the challengeId + * optional uint32 score_two = 2; + * @return the scoreTwo */ - public int getChallengeId() { - return challengeId; + public int getScoreTwo() { + return scoreTwo; } /** - * optional uint32 challenge_id = 1; - * @param value the challengeId to set + * optional uint32 score_two = 2; + * @param value the scoreTwo to set * @return this */ - public ChallengeInfo setChallengeId(final int value) { + public ChallengeInfo setScoreTwo(final int value) { bitField0_ |= 0x00000001; - challengeId = value; + scoreTwo = value; return this; } /** - * optional uint32 round_count = 2; + * optional uint32 round_count = 5; * @return whether the roundCount field is set */ public boolean hasRoundCount() { @@ -109,7 +109,7 @@ public boolean hasRoundCount() { } /** - * optional uint32 round_count = 2; + * optional uint32 round_count = 5; * @return this */ public ChallengeInfo clearRoundCount() { @@ -119,7 +119,7 @@ public ChallengeInfo clearRoundCount() { } /** - * optional uint32 round_count = 2; + * optional uint32 round_count = 5; * @return the roundCount */ public int getRoundCount() { @@ -127,7 +127,7 @@ public int getRoundCount() { } /** - * optional uint32 round_count = 2; + * optional uint32 round_count = 5; * @param value the roundCount to set * @return this */ @@ -138,7 +138,7 @@ public ChallengeInfo setRoundCount(final int value) { } /** - * optional uint32 score = 8; + * optional uint32 score = 9; * @return whether the score field is set */ public boolean hasScore() { @@ -146,7 +146,7 @@ public boolean hasScore() { } /** - * optional uint32 score = 8; + * optional uint32 score = 9; * @return this */ public ChallengeInfo clearScore() { @@ -156,7 +156,7 @@ public ChallengeInfo clearScore() { } /** - * optional uint32 score = 8; + * optional uint32 score = 9; * @return the score */ public int getScore() { @@ -164,7 +164,7 @@ public int getScore() { } /** - * optional uint32 score = 8; + * optional uint32 score = 9; * @param value the score to set * @return this */ @@ -175,168 +175,168 @@ public ChallengeInfo setScore(final int value) { } /** - * optional uint32 score_two = 10; - * @return whether the scoreTwo field is set + * optional uint32 challenge_id = 14; + * @return whether the challengeId field is set */ - public boolean hasScoreTwo() { + public boolean hasChallengeId() { return (bitField0_ & 0x00000008) != 0; } /** - * optional uint32 score_two = 10; + * optional uint32 challenge_id = 14; * @return this */ - public ChallengeInfo clearScoreTwo() { + public ChallengeInfo clearChallengeId() { bitField0_ &= ~0x00000008; - scoreTwo = 0; + challengeId = 0; return this; } /** - * optional uint32 score_two = 10; - * @return the scoreTwo + * optional uint32 challenge_id = 14; + * @return the challengeId */ - public int getScoreTwo() { - return scoreTwo; + public int getChallengeId() { + return challengeId; } /** - * optional uint32 score_two = 10; - * @param value the scoreTwo to set + * optional uint32 challenge_id = 14; + * @param value the challengeId to set * @return this */ - public ChallengeInfo setScoreTwo(final int value) { + public ChallengeInfo setChallengeId(final int value) { bitField0_ |= 0x00000008; - scoreTwo = value; + challengeId = value; return this; } /** - * optional .ChallengeStatus status = 6; - * @return whether the status field is set + * optional .ExtraLineupType extra_lineup_type = 4; + * @return whether the extraLineupType field is set */ - public boolean hasStatus() { + public boolean hasExtraLineupType() { return (bitField0_ & 0x00000010) != 0; } /** - * optional .ChallengeStatus status = 6; + * optional .ExtraLineupType extra_lineup_type = 4; * @return this */ - public ChallengeInfo clearStatus() { + public ChallengeInfo clearExtraLineupType() { bitField0_ &= ~0x00000010; - status = 0; + extraLineupType = 0; return this; } /** - * optional .ChallengeStatus status = 6; - * @return the status + * optional .ExtraLineupType extra_lineup_type = 4; + * @return the extraLineupType */ - public ChallengeStatusOuterClass.ChallengeStatus getStatus() { - return ChallengeStatusOuterClass.ChallengeStatus.forNumber(status); + public ExtraLineupTypeOuterClass.ExtraLineupType getExtraLineupType() { + return ExtraLineupTypeOuterClass.ExtraLineupType.forNumber(extraLineupType); } /** * Gets the value of the internal enum store. The result is - * equivalent to {@link ChallengeInfo#getStatus()}.getNumber(). + * equivalent to {@link ChallengeInfo#getExtraLineupType()}.getNumber(). * * @return numeric wire representation */ - public int getStatusValue() { - return status; + public int getExtraLineupTypeValue() { + return extraLineupType; } /** * Sets the value of the internal enum store. This does not * do any validity checks, so be sure to use appropriate value - * constants from {@link ChallengeStatusOuterClass.ChallengeStatus}. Setting an invalid value - * can cause {@link ChallengeInfo#getStatus()} to return null + * constants from {@link ExtraLineupTypeOuterClass.ExtraLineupType}. Setting an invalid value + * can cause {@link ChallengeInfo#getExtraLineupType()} to return null * * @param value the numeric wire value to set * @return this */ - public ChallengeInfo setStatusValue(final int value) { + public ChallengeInfo setExtraLineupTypeValue(final int value) { bitField0_ |= 0x00000010; - status = value; + extraLineupType = value; return this; } /** - * optional .ChallengeStatus status = 6; - * @param value the status to set + * optional .ExtraLineupType extra_lineup_type = 4; + * @param value the extraLineupType to set * @return this */ - public ChallengeInfo setStatus(final ChallengeStatusOuterClass.ChallengeStatus value) { + public ChallengeInfo setExtraLineupType(final ExtraLineupTypeOuterClass.ExtraLineupType value) { bitField0_ |= 0x00000010; - status = value.getNumber(); + extraLineupType = value.getNumber(); return this; } /** - * optional .ExtraLineupType extra_lineup_type = 15; - * @return whether the extraLineupType field is set + * optional .ChallengeStatus status = 10; + * @return whether the status field is set */ - public boolean hasExtraLineupType() { + public boolean hasStatus() { return (bitField0_ & 0x00000020) != 0; } /** - * optional .ExtraLineupType extra_lineup_type = 15; + * optional .ChallengeStatus status = 10; * @return this */ - public ChallengeInfo clearExtraLineupType() { + public ChallengeInfo clearStatus() { bitField0_ &= ~0x00000020; - extraLineupType = 0; + status = 0; return this; } /** - * optional .ExtraLineupType extra_lineup_type = 15; - * @return the extraLineupType + * optional .ChallengeStatus status = 10; + * @return the status */ - public ExtraLineupTypeOuterClass.ExtraLineupType getExtraLineupType() { - return ExtraLineupTypeOuterClass.ExtraLineupType.forNumber(extraLineupType); + public ChallengeStatusOuterClass.ChallengeStatus getStatus() { + return ChallengeStatusOuterClass.ChallengeStatus.forNumber(status); } /** * Gets the value of the internal enum store. The result is - * equivalent to {@link ChallengeInfo#getExtraLineupType()}.getNumber(). + * equivalent to {@link ChallengeInfo#getStatus()}.getNumber(). * * @return numeric wire representation */ - public int getExtraLineupTypeValue() { - return extraLineupType; + public int getStatusValue() { + return status; } /** * Sets the value of the internal enum store. This does not * do any validity checks, so be sure to use appropriate value - * constants from {@link ExtraLineupTypeOuterClass.ExtraLineupType}. Setting an invalid value - * can cause {@link ChallengeInfo#getExtraLineupType()} to return null + * constants from {@link ChallengeStatusOuterClass.ChallengeStatus}. Setting an invalid value + * can cause {@link ChallengeInfo#getStatus()} to return null * * @param value the numeric wire value to set * @return this */ - public ChallengeInfo setExtraLineupTypeValue(final int value) { + public ChallengeInfo setStatusValue(final int value) { bitField0_ |= 0x00000020; - extraLineupType = value; + status = value; return this; } /** - * optional .ExtraLineupType extra_lineup_type = 15; - * @param value the extraLineupType to set + * optional .ChallengeStatus status = 10; + * @param value the status to set * @return this */ - public ChallengeInfo setExtraLineupType(final ExtraLineupTypeOuterClass.ExtraLineupType value) { + public ChallengeInfo setStatus(final ChallengeStatusOuterClass.ChallengeStatus value) { bitField0_ |= 0x00000020; - extraLineupType = value.getNumber(); + status = value.getNumber(); return this; } /** - * optional .ChallengeStoryInfo story_info = 13; + * optional .ChallengeStoryInfo story_info = 6; * @return whether the storyInfo field is set */ public boolean hasStoryInfo() { @@ -344,7 +344,7 @@ public boolean hasStoryInfo() { } /** - * optional .ChallengeStoryInfo story_info = 13; + * optional .ChallengeStoryInfo story_info = 6; * @return this */ public ChallengeInfo clearStoryInfo() { @@ -354,7 +354,7 @@ public ChallengeInfo clearStoryInfo() { } /** - * optional .ChallengeStoryInfo story_info = 13; + * optional .ChallengeStoryInfo story_info = 6; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -368,7 +368,7 @@ public ChallengeStoryInfoOuterClass.ChallengeStoryInfo getStoryInfo() { } /** - * optional .ChallengeStoryInfo story_info = 13; + * optional .ChallengeStoryInfo story_info = 6; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -382,7 +382,7 @@ public ChallengeStoryInfoOuterClass.ChallengeStoryInfo getMutableStoryInfo() { } /** - * optional .ChallengeStoryInfo story_info = 13; + * optional .ChallengeStoryInfo story_info = 6; * @param value the storyInfo to set * @return this */ @@ -397,12 +397,12 @@ public ChallengeInfo copyFrom(final ChallengeInfo other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - challengeId = other.challengeId; + scoreTwo = other.scoreTwo; roundCount = other.roundCount; score = other.score; - scoreTwo = other.scoreTwo; - status = other.status; + challengeId = other.challengeId; extraLineupType = other.extraLineupType; + status = other.status; storyInfo.copyFrom(other.storyInfo); } return this; @@ -414,8 +414,8 @@ public ChallengeInfo mergeFrom(final ChallengeInfo other) { return this; } cachedSize = -1; - if (other.hasChallengeId()) { - setChallengeId(other.challengeId); + if (other.hasScoreTwo()) { + setScoreTwo(other.scoreTwo); } if (other.hasRoundCount()) { setRoundCount(other.roundCount); @@ -423,15 +423,15 @@ public ChallengeInfo mergeFrom(final ChallengeInfo other) { if (other.hasScore()) { setScore(other.score); } - if (other.hasScoreTwo()) { - setScoreTwo(other.scoreTwo); - } - if (other.hasStatus()) { - setStatusValue(other.status); + if (other.hasChallengeId()) { + setChallengeId(other.challengeId); } if (other.hasExtraLineupType()) { setExtraLineupTypeValue(other.extraLineupType); } + if (other.hasStatus()) { + setStatusValue(other.status); + } if (other.hasStoryInfo()) { getMutableStoryInfo().mergeFrom(other.storyInfo); } @@ -445,12 +445,12 @@ public ChallengeInfo clear() { } cachedSize = -1; bitField0_ = 0; - challengeId = 0; + scoreTwo = 0; roundCount = 0; score = 0; - scoreTwo = 0; - status = 0; + challengeId = 0; extraLineupType = 0; + status = 0; storyInfo.clear(); return this; } @@ -476,43 +476,43 @@ public boolean equals(Object o) { } ChallengeInfo other = (ChallengeInfo) o; return bitField0_ == other.bitField0_ - && (!hasChallengeId() || challengeId == other.challengeId) + && (!hasScoreTwo() || scoreTwo == other.scoreTwo) && (!hasRoundCount() || roundCount == other.roundCount) && (!hasScore() || score == other.score) - && (!hasScoreTwo() || scoreTwo == other.scoreTwo) - && (!hasStatus() || status == other.status) + && (!hasChallengeId() || challengeId == other.challengeId) && (!hasExtraLineupType() || extraLineupType == other.extraLineupType) + && (!hasStatus() || status == other.status) && (!hasStoryInfo() || storyInfo.equals(other.storyInfo)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); - output.writeUInt32NoTag(challengeId); + output.writeRawByte((byte) 16); + output.writeUInt32NoTag(scoreTwo); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(roundCount); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(score); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 80); - output.writeUInt32NoTag(scoreTwo); + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(challengeId); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 48); - output.writeEnumNoTag(status); + output.writeRawByte((byte) 32); + output.writeEnumNoTag(extraLineupType); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 120); - output.writeEnumNoTag(extraLineupType); + output.writeRawByte((byte) 80); + output.writeEnumNoTag(status); } if ((bitField0_ & 0x00000040) != 0) { - output.writeRawByte((byte) 106); + output.writeRawByte((byte) 50); output.writeMessageNoTag(storyInfo); } } @@ -521,7 +521,7 @@ public void writeTo(final ProtoSink output) throws IOException { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(challengeId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(scoreTwo); } if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(roundCount); @@ -530,13 +530,13 @@ protected int computeSerializedSize() { size += 1 + ProtoSink.computeUInt32SizeNoTag(score); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(scoreTwo); + size += 1 + ProtoSink.computeUInt32SizeNoTag(challengeId); } if ((bitField0_ & 0x00000010) != 0) { - size += 1 + ProtoSink.computeEnumSizeNoTag(status); + size += 1 + ProtoSink.computeEnumSizeNoTag(extraLineupType); } if ((bitField0_ & 0x00000020) != 0) { - size += 1 + ProtoSink.computeEnumSizeNoTag(extraLineupType); + size += 1 + ProtoSink.computeEnumSizeNoTag(status); } if ((bitField0_ & 0x00000040) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(storyInfo); @@ -551,67 +551,67 @@ public ChallengeInfo mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { - // challengeId - challengeId = input.readUInt32(); + case 16: { + // scoreTwo + scoreTwo = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 16) { + if (tag != 40) { break; } } - case 16: { + case 40: { // roundCount roundCount = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 64) { + if (tag != 72) { break; } } - case 64: { + case 72: { // score score = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 80) { + if (tag != 112) { break; } } - case 80: { - // scoreTwo - scoreTwo = input.readUInt32(); + case 112: { + // challengeId + challengeId = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 48) { + if (tag != 32) { break; } } - case 48: { - // status + case 32: { + // extraLineupType final int value = input.readInt32(); - if (ChallengeStatusOuterClass.ChallengeStatus.forNumber(value) != null) { - status = value; + if (ExtraLineupTypeOuterClass.ExtraLineupType.forNumber(value) != null) { + extraLineupType = value; bitField0_ |= 0x00000010; } tag = input.readTag(); - if (tag != 120) { + if (tag != 80) { break; } } - case 120: { - // extraLineupType + case 80: { + // status final int value = input.readInt32(); - if (ExtraLineupTypeOuterClass.ExtraLineupType.forNumber(value) != null) { - extraLineupType = value; + if (ChallengeStatusOuterClass.ChallengeStatus.forNumber(value) != null) { + status = value; bitField0_ |= 0x00000020; } tag = input.readTag(); - if (tag != 106) { + if (tag != 50) { break; } } - case 106: { + case 50: { // storyInfo input.readMessage(storyInfo); bitField0_ |= 0x00000040; @@ -638,7 +638,7 @@ public ChallengeInfo mergeFrom(final ProtoSource input) throws IOException { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.challengeId, challengeId); + output.writeUInt32(FieldNames.scoreTwo, scoreTwo); } if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.roundCount, roundCount); @@ -647,13 +647,13 @@ public void writeTo(final JsonSink output) throws IOException { output.writeUInt32(FieldNames.score, score); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.scoreTwo, scoreTwo); + output.writeUInt32(FieldNames.challengeId, challengeId); } if ((bitField0_ & 0x00000010) != 0) { - output.writeEnum(FieldNames.status, status, ChallengeStatusOuterClass.ChallengeStatus.converter()); + output.writeEnum(FieldNames.extraLineupType, extraLineupType, ExtraLineupTypeOuterClass.ExtraLineupType.converter()); } if ((bitField0_ & 0x00000020) != 0) { - output.writeEnum(FieldNames.extraLineupType, extraLineupType, ExtraLineupTypeOuterClass.ExtraLineupType.converter()); + output.writeEnum(FieldNames.status, status, ChallengeStatusOuterClass.ChallengeStatus.converter()); } if ((bitField0_ & 0x00000040) != 0) { output.writeMessage(FieldNames.storyInfo, storyInfo); @@ -668,11 +668,11 @@ public ChallengeInfo mergeFrom(final JsonSource input) throws IOException { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -689112866: - case 112359031: { - if (input.isAtField(FieldNames.challengeId)) { + case -485512614: + case 2129303327: { + if (input.isAtField(FieldNames.scoreTwo)) { if (!input.trySkipNullValue()) { - challengeId = input.readUInt32(); + scoreTwo = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -703,11 +703,11 @@ public ChallengeInfo mergeFrom(final JsonSource input) throws IOException { } break; } - case -485512614: - case 2129303327: { - if (input.isAtField(FieldNames.scoreTwo)) { + case -689112866: + case 112359031: { + if (input.isAtField(FieldNames.challengeId)) { if (!input.trySkipNullValue()) { - scoreTwo = input.readUInt32(); + challengeId = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -715,12 +715,13 @@ public ChallengeInfo mergeFrom(final JsonSource input) throws IOException { } break; } - case -892481550: { - if (input.isAtField(FieldNames.status)) { + case -468135527: + case -1144475077: { + if (input.isAtField(FieldNames.extraLineupType)) { if (!input.trySkipNullValue()) { - final ChallengeStatusOuterClass.ChallengeStatus value = input.readEnum(ChallengeStatusOuterClass.ChallengeStatus.converter()); + final ExtraLineupTypeOuterClass.ExtraLineupType value = input.readEnum(ExtraLineupTypeOuterClass.ExtraLineupType.converter()); if (value != null) { - status = value.getNumber(); + extraLineupType = value.getNumber(); bitField0_ |= 0x00000010; } else { input.skipUnknownEnumValue(); @@ -731,13 +732,12 @@ public ChallengeInfo mergeFrom(final JsonSource input) throws IOException { } break; } - case -468135527: - case -1144475077: { - if (input.isAtField(FieldNames.extraLineupType)) { + case -892481550: { + if (input.isAtField(FieldNames.status)) { if (!input.trySkipNullValue()) { - final ExtraLineupTypeOuterClass.ExtraLineupType value = input.readEnum(ExtraLineupTypeOuterClass.ExtraLineupType.converter()); + final ChallengeStatusOuterClass.ChallengeStatus value = input.readEnum(ChallengeStatusOuterClass.ChallengeStatus.converter()); if (value != null) { - extraLineupType = value.getNumber(); + status = value.getNumber(); bitField0_ |= 0x00000020; } else { input.skipUnknownEnumValue(); @@ -812,18 +812,18 @@ public ChallengeInfo create() { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName challengeId = FieldName.forField("challengeId", "challenge_id"); + static final FieldName scoreTwo = FieldName.forField("scoreTwo", "score_two"); static final FieldName roundCount = FieldName.forField("roundCount", "round_count"); static final FieldName score = FieldName.forField("score"); - static final FieldName scoreTwo = FieldName.forField("scoreTwo", "score_two"); - - static final FieldName status = FieldName.forField("status"); + static final FieldName challengeId = FieldName.forField("challengeId", "challenge_id"); static final FieldName extraLineupType = FieldName.forField("extraLineupType", "extra_lineup_type"); + static final FieldName status = FieldName.forField("status"); + static final FieldName storyInfo = FieldName.forField("storyInfo", "story_info"); } } diff --git a/src/generated/main/emu/lunarcore/proto/ChallengeLineupNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChallengeLineupNotifyOuterClass.java index c9abd4f74..0cb080270 100644 --- a/src/generated/main/emu/lunarcore/proto/ChallengeLineupNotifyOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ChallengeLineupNotifyOuterClass.java @@ -19,7 +19,7 @@ public static final class ChallengeLineupNotify extends ProtoMessageoptional .ExtraLineupType extra_lineup_type = 13; + * optional .ExtraLineupType extra_lineup_type = 14; */ private int extraLineupType; @@ -34,7 +34,7 @@ public static ChallengeLineupNotify newInstance() { } /** - * optional .ExtraLineupType extra_lineup_type = 13; + * optional .ExtraLineupType extra_lineup_type = 14; * @return whether the extraLineupType field is set */ public boolean hasExtraLineupType() { @@ -42,7 +42,7 @@ public boolean hasExtraLineupType() { } /** - * optional .ExtraLineupType extra_lineup_type = 13; + * optional .ExtraLineupType extra_lineup_type = 14; * @return this */ public ChallengeLineupNotify clearExtraLineupType() { @@ -52,7 +52,7 @@ public ChallengeLineupNotify clearExtraLineupType() { } /** - * optional .ExtraLineupType extra_lineup_type = 13; + * optional .ExtraLineupType extra_lineup_type = 14; * @return the extraLineupType */ public ExtraLineupTypeOuterClass.ExtraLineupType getExtraLineupType() { @@ -85,7 +85,7 @@ public ChallengeLineupNotify setExtraLineupTypeValue(final int value) { } /** - * optional .ExtraLineupType extra_lineup_type = 13; + * optional .ExtraLineupType extra_lineup_type = 14; * @param value the extraLineupType to set * @return this */ @@ -155,7 +155,7 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 112); output.writeEnumNoTag(extraLineupType); } } @@ -176,7 +176,7 @@ public ChallengeLineupNotify mergeFrom(final ProtoSource input) throws IOExcepti int tag = input.readTag(); while (true) { switch (tag) { - case 104: { + case 112: { // extraLineupType final int value = input.readInt32(); if (ExtraLineupTypeOuterClass.ExtraLineupType.forNumber(value) != null) { diff --git a/src/generated/main/emu/lunarcore/proto/ChallengeOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChallengeOuterClass.java index 9d14434f1..d572f5d44 100644 --- a/src/generated/main/emu/lunarcore/proto/ChallengeOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ChallengeOuterClass.java @@ -19,29 +19,24 @@ public static final class Challenge extends ProtoMessage implements C private static final long serialVersionUID = 0L; /** - * optional uint32 score_two = 5; + * optional uint32 score = 2; */ - private int scoreTwo; - - /** - * optional uint32 stars = 10; - */ - private int stars; + private int score; /** - * optional uint32 challenge_id = 13; + * optional uint32 challenge_id = 8; */ private int challengeId; /** - * optional uint32 taken_reward = 14; + * optional uint32 taken_reward = 10; */ private int takenReward; /** - * optional uint32 score = 15; + * optional uint32 stars = 11; */ - private int score; + private int stars; private Challenge() { } @@ -54,99 +49,62 @@ public static Challenge newInstance() { } /** - * optional uint32 score_two = 5; - * @return whether the scoreTwo field is set + * optional uint32 score = 2; + * @return whether the score field is set */ - public boolean hasScoreTwo() { + public boolean hasScore() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 score_two = 5; + * optional uint32 score = 2; * @return this */ - public Challenge clearScoreTwo() { + public Challenge clearScore() { bitField0_ &= ~0x00000001; - scoreTwo = 0; + score = 0; return this; } /** - * optional uint32 score_two = 5; - * @return the scoreTwo + * optional uint32 score = 2; + * @return the score */ - public int getScoreTwo() { - return scoreTwo; + public int getScore() { + return score; } /** - * optional uint32 score_two = 5; - * @param value the scoreTwo to set + * optional uint32 score = 2; + * @param value the score to set * @return this */ - public Challenge setScoreTwo(final int value) { + public Challenge setScore(final int value) { bitField0_ |= 0x00000001; - scoreTwo = value; - return this; - } - - /** - * optional uint32 stars = 10; - * @return whether the stars field is set - */ - public boolean hasStars() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 stars = 10; - * @return this - */ - public Challenge clearStars() { - bitField0_ &= ~0x00000002; - stars = 0; - return this; - } - - /** - * optional uint32 stars = 10; - * @return the stars - */ - public int getStars() { - return stars; - } - - /** - * optional uint32 stars = 10; - * @param value the stars to set - * @return this - */ - public Challenge setStars(final int value) { - bitField0_ |= 0x00000002; - stars = value; + score = value; return this; } /** - * optional uint32 challenge_id = 13; + * optional uint32 challenge_id = 8; * @return whether the challengeId field is set */ public boolean hasChallengeId() { - return (bitField0_ & 0x00000004) != 0; + return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 challenge_id = 13; + * optional uint32 challenge_id = 8; * @return this */ public Challenge clearChallengeId() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; challengeId = 0; return this; } /** - * optional uint32 challenge_id = 13; + * optional uint32 challenge_id = 8; * @return the challengeId */ public int getChallengeId() { @@ -154,36 +112,36 @@ public int getChallengeId() { } /** - * optional uint32 challenge_id = 13; + * optional uint32 challenge_id = 8; * @param value the challengeId to set * @return this */ public Challenge setChallengeId(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; challengeId = value; return this; } /** - * optional uint32 taken_reward = 14; + * optional uint32 taken_reward = 10; * @return whether the takenReward field is set */ public boolean hasTakenReward() { - return (bitField0_ & 0x00000008) != 0; + return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 taken_reward = 14; + * optional uint32 taken_reward = 10; * @return this */ public Challenge clearTakenReward() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000004; takenReward = 0; return this; } /** - * optional uint32 taken_reward = 14; + * optional uint32 taken_reward = 10; * @return the takenReward */ public int getTakenReward() { @@ -191,50 +149,50 @@ public int getTakenReward() { } /** - * optional uint32 taken_reward = 14; + * optional uint32 taken_reward = 10; * @param value the takenReward to set * @return this */ public Challenge setTakenReward(final int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; takenReward = value; return this; } /** - * optional uint32 score = 15; - * @return whether the score field is set + * optional uint32 stars = 11; + * @return whether the stars field is set */ - public boolean hasScore() { - return (bitField0_ & 0x00000010) != 0; + public boolean hasStars() { + return (bitField0_ & 0x00000008) != 0; } /** - * optional uint32 score = 15; + * optional uint32 stars = 11; * @return this */ - public Challenge clearScore() { - bitField0_ &= ~0x00000010; - score = 0; + public Challenge clearStars() { + bitField0_ &= ~0x00000008; + stars = 0; return this; } /** - * optional uint32 score = 15; - * @return the score + * optional uint32 stars = 11; + * @return the stars */ - public int getScore() { - return score; + public int getStars() { + return stars; } /** - * optional uint32 score = 15; - * @param value the score to set + * optional uint32 stars = 11; + * @param value the stars to set * @return this */ - public Challenge setScore(final int value) { - bitField0_ |= 0x00000010; - score = value; + public Challenge setStars(final int value) { + bitField0_ |= 0x00000008; + stars = value; return this; } @@ -243,11 +201,10 @@ public Challenge copyFrom(final Challenge other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - scoreTwo = other.scoreTwo; - stars = other.stars; + score = other.score; challengeId = other.challengeId; takenReward = other.takenReward; - score = other.score; + stars = other.stars; } return this; } @@ -258,11 +215,8 @@ public Challenge mergeFrom(final Challenge other) { return this; } cachedSize = -1; - if (other.hasScoreTwo()) { - setScoreTwo(other.scoreTwo); - } - if (other.hasStars()) { - setStars(other.stars); + if (other.hasScore()) { + setScore(other.score); } if (other.hasChallengeId()) { setChallengeId(other.challengeId); @@ -270,8 +224,8 @@ public Challenge mergeFrom(final Challenge other) { if (other.hasTakenReward()) { setTakenReward(other.takenReward); } - if (other.hasScore()) { - setScore(other.score); + if (other.hasStars()) { + setStars(other.stars); } return this; } @@ -283,11 +237,10 @@ public Challenge clear() { } cachedSize = -1; bitField0_ = 0; - scoreTwo = 0; - stars = 0; + score = 0; challengeId = 0; takenReward = 0; - score = 0; + stars = 0; return this; } @@ -311,34 +264,29 @@ public boolean equals(Object o) { } Challenge other = (Challenge) o; return bitField0_ == other.bitField0_ - && (!hasScoreTwo() || scoreTwo == other.scoreTwo) - && (!hasStars() || stars == other.stars) + && (!hasScore() || score == other.score) && (!hasChallengeId() || challengeId == other.challengeId) && (!hasTakenReward() || takenReward == other.takenReward) - && (!hasScore() || score == other.score); + && (!hasStars() || stars == other.stars); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 40); - output.writeUInt32NoTag(scoreTwo); + output.writeRawByte((byte) 16); + output.writeUInt32NoTag(score); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 80); - output.writeUInt32NoTag(stars); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(challengeId); } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 112); + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 80); output.writeUInt32NoTag(takenReward); } - if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 120); - output.writeUInt32NoTag(score); + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 88); + output.writeUInt32NoTag(stars); } } @@ -346,19 +294,16 @@ public void writeTo(final ProtoSink output) throws IOException { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(scoreTwo); + size += 1 + ProtoSink.computeUInt32SizeNoTag(score); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(stars); - } - if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(challengeId); } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(takenReward); } - if ((bitField0_ & 0x00000010) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(score); + if ((bitField0_ & 0x00000008) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(stars); } return size; } @@ -370,46 +315,37 @@ public Challenge mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { - // scoreTwo - scoreTwo = input.readUInt32(); + case 16: { + // score + score = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 80) { + if (tag != 64) { break; } } - case 80: { - // stars - stars = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 104) { - break; - } - } - case 104: { + case 64: { // challengeId challengeId = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 112) { + if (tag != 80) { break; } } - case 112: { + case 80: { // takenReward takenReward = input.readUInt32(); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 120) { + if (tag != 88) { break; } } - case 120: { - // score - score = input.readUInt32(); - bitField0_ |= 0x00000010; + case 88: { + // stars + stars = input.readUInt32(); + bitField0_ |= 0x00000008; tag = input.readTag(); if (tag != 0) { break; @@ -433,19 +369,16 @@ public Challenge mergeFrom(final ProtoSource input) throws IOException { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.scoreTwo, scoreTwo); + output.writeUInt32(FieldNames.score, score); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.stars, stars); - } - if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.challengeId, challengeId); } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.takenReward, takenReward); } - if ((bitField0_ & 0x00000010) != 0) { - output.writeUInt32(FieldNames.score, score); + if ((bitField0_ & 0x00000008) != 0) { + output.writeUInt32(FieldNames.stars, stars); } output.endObject(); } @@ -457,11 +390,10 @@ public Challenge mergeFrom(final JsonSource input) throws IOException { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -485512614: - case 2129303327: { - if (input.isAtField(FieldNames.scoreTwo)) { + case 109264530: { + if (input.isAtField(FieldNames.score)) { if (!input.trySkipNullValue()) { - scoreTwo = input.readUInt32(); + score = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -469,23 +401,12 @@ public Challenge mergeFrom(final JsonSource input) throws IOException { } break; } - case 109757537: { - if (input.isAtField(FieldNames.stars)) { - if (!input.trySkipNullValue()) { - stars = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } case -689112866: case 112359031: { if (input.isAtField(FieldNames.challengeId)) { if (!input.trySkipNullValue()) { challengeId = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; } } else { input.skipUnknownField(); @@ -497,18 +418,18 @@ public Challenge mergeFrom(final JsonSource input) throws IOException { if (input.isAtField(FieldNames.takenReward)) { if (!input.trySkipNullValue()) { takenReward = input.readUInt32(); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; } } else { input.skipUnknownField(); } break; } - case 109264530: { - if (input.isAtField(FieldNames.score)) { + case 109757537: { + if (input.isAtField(FieldNames.stars)) { if (!input.trySkipNullValue()) { - score = input.readUInt32(); - bitField0_ |= 0x00000010; + stars = input.readUInt32(); + bitField0_ |= 0x00000008; } } else { input.skipUnknownField(); @@ -567,15 +488,13 @@ public Challenge create() { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName scoreTwo = FieldName.forField("scoreTwo", "score_two"); - - static final FieldName stars = FieldName.forField("stars"); + static final FieldName score = FieldName.forField("score"); static final FieldName challengeId = FieldName.forField("challengeId", "challenge_id"); static final FieldName takenReward = FieldName.forField("takenReward", "taken_reward"); - static final FieldName score = FieldName.forField("score"); + static final FieldName stars = FieldName.forField("stars"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/ChallengeRewardOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChallengeRewardOuterClass.java index 8c96470b8..c30a3ff85 100644 --- a/src/generated/main/emu/lunarcore/proto/ChallengeRewardOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ChallengeRewardOuterClass.java @@ -19,12 +19,12 @@ public static final class ChallengeReward extends ProtoMessage private static final long serialVersionUID = 0L; /** - * optional uint64 taken_challenge_reward = 10; + * optional uint64 taken_challenge_reward = 3; */ private long takenChallengeReward; /** - * optional uint32 group_id = 15; + * optional uint32 group_id = 14; */ private int groupId; @@ -39,7 +39,7 @@ public static ChallengeReward newInstance() { } /** - * optional uint64 taken_challenge_reward = 10; + * optional uint64 taken_challenge_reward = 3; * @return whether the takenChallengeReward field is set */ public boolean hasTakenChallengeReward() { @@ -47,7 +47,7 @@ public boolean hasTakenChallengeReward() { } /** - * optional uint64 taken_challenge_reward = 10; + * optional uint64 taken_challenge_reward = 3; * @return this */ public ChallengeReward clearTakenChallengeReward() { @@ -57,7 +57,7 @@ public ChallengeReward clearTakenChallengeReward() { } /** - * optional uint64 taken_challenge_reward = 10; + * optional uint64 taken_challenge_reward = 3; * @return the takenChallengeReward */ public long getTakenChallengeReward() { @@ -65,7 +65,7 @@ public long getTakenChallengeReward() { } /** - * optional uint64 taken_challenge_reward = 10; + * optional uint64 taken_challenge_reward = 3; * @param value the takenChallengeReward to set * @return this */ @@ -76,7 +76,7 @@ public ChallengeReward setTakenChallengeReward(final long value) { } /** - * optional uint32 group_id = 15; + * optional uint32 group_id = 14; * @return whether the groupId field is set */ public boolean hasGroupId() { @@ -84,7 +84,7 @@ public boolean hasGroupId() { } /** - * optional uint32 group_id = 15; + * optional uint32 group_id = 14; * @return this */ public ChallengeReward clearGroupId() { @@ -94,7 +94,7 @@ public ChallengeReward clearGroupId() { } /** - * optional uint32 group_id = 15; + * optional uint32 group_id = 14; * @return the groupId */ public int getGroupId() { @@ -102,7 +102,7 @@ public int getGroupId() { } /** - * optional uint32 group_id = 15; + * optional uint32 group_id = 14; * @param value the groupId to set * @return this */ @@ -177,11 +177,11 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 24); output.writeUInt64NoTag(takenChallengeReward); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(groupId); } } @@ -205,16 +205,16 @@ public ChallengeReward mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 80: { + case 24: { // takenChallengeReward takenChallengeReward = input.readUInt64(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 120) { + if (tag != 112) { break; } } - case 120: { + case 112: { // groupId groupId = input.readUInt32(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/ChallengeSettleNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChallengeSettleNotifyOuterClass.java index 406bea2a6..532c9a330 100644 --- a/src/generated/main/emu/lunarcore/proto/ChallengeSettleNotifyOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ChallengeSettleNotifyOuterClass.java @@ -19,32 +19,32 @@ public static final class ChallengeSettleNotify extends ProtoMessageoptional uint32 score_two = 6; + * optional uint32 challenge_score = 9; */ - private int scoreTwo; + private int challengeScore; /** - * optional uint32 challenge_id = 9; + * optional uint32 score_two = 10; */ - private int challengeId; + private int scoreTwo; /** - * optional uint32 challenge_score = 11; + * optional uint32 stars = 13; */ - private int challengeScore; + private int stars; /** - * optional uint32 stars = 15; + * optional uint32 challenge_id = 14; */ - private int stars; + private int challengeId; /** - * optional bool is_win = 13; + * optional bool is_win = 15; */ private boolean isWin; /** - * optional .ItemList reward = 8; + * optional .ItemList reward = 12; */ private final ItemListOuterClass.ItemList reward = ItemListOuterClass.ItemList.newInstance(); @@ -59,155 +59,155 @@ public static ChallengeSettleNotify newInstance() { } /** - * optional uint32 score_two = 6; - * @return whether the scoreTwo field is set + * optional uint32 challenge_score = 9; + * @return whether the challengeScore field is set */ - public boolean hasScoreTwo() { + public boolean hasChallengeScore() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 score_two = 6; + * optional uint32 challenge_score = 9; * @return this */ - public ChallengeSettleNotify clearScoreTwo() { + public ChallengeSettleNotify clearChallengeScore() { bitField0_ &= ~0x00000001; - scoreTwo = 0; + challengeScore = 0; return this; } /** - * optional uint32 score_two = 6; - * @return the scoreTwo + * optional uint32 challenge_score = 9; + * @return the challengeScore */ - public int getScoreTwo() { - return scoreTwo; + public int getChallengeScore() { + return challengeScore; } /** - * optional uint32 score_two = 6; - * @param value the scoreTwo to set + * optional uint32 challenge_score = 9; + * @param value the challengeScore to set * @return this */ - public ChallengeSettleNotify setScoreTwo(final int value) { + public ChallengeSettleNotify setChallengeScore(final int value) { bitField0_ |= 0x00000001; - scoreTwo = value; + challengeScore = value; return this; } /** - * optional uint32 challenge_id = 9; - * @return whether the challengeId field is set + * optional uint32 score_two = 10; + * @return whether the scoreTwo field is set */ - public boolean hasChallengeId() { + public boolean hasScoreTwo() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 challenge_id = 9; + * optional uint32 score_two = 10; * @return this */ - public ChallengeSettleNotify clearChallengeId() { + public ChallengeSettleNotify clearScoreTwo() { bitField0_ &= ~0x00000002; - challengeId = 0; + scoreTwo = 0; return this; } /** - * optional uint32 challenge_id = 9; - * @return the challengeId + * optional uint32 score_two = 10; + * @return the scoreTwo */ - public int getChallengeId() { - return challengeId; + public int getScoreTwo() { + return scoreTwo; } /** - * optional uint32 challenge_id = 9; - * @param value the challengeId to set + * optional uint32 score_two = 10; + * @param value the scoreTwo to set * @return this */ - public ChallengeSettleNotify setChallengeId(final int value) { + public ChallengeSettleNotify setScoreTwo(final int value) { bitField0_ |= 0x00000002; - challengeId = value; + scoreTwo = value; return this; } /** - * optional uint32 challenge_score = 11; - * @return whether the challengeScore field is set + * optional uint32 stars = 13; + * @return whether the stars field is set */ - public boolean hasChallengeScore() { + public boolean hasStars() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 challenge_score = 11; + * optional uint32 stars = 13; * @return this */ - public ChallengeSettleNotify clearChallengeScore() { + public ChallengeSettleNotify clearStars() { bitField0_ &= ~0x00000004; - challengeScore = 0; + stars = 0; return this; } /** - * optional uint32 challenge_score = 11; - * @return the challengeScore + * optional uint32 stars = 13; + * @return the stars */ - public int getChallengeScore() { - return challengeScore; + public int getStars() { + return stars; } /** - * optional uint32 challenge_score = 11; - * @param value the challengeScore to set + * optional uint32 stars = 13; + * @param value the stars to set * @return this */ - public ChallengeSettleNotify setChallengeScore(final int value) { + public ChallengeSettleNotify setStars(final int value) { bitField0_ |= 0x00000004; - challengeScore = value; + stars = value; return this; } /** - * optional uint32 stars = 15; - * @return whether the stars field is set + * optional uint32 challenge_id = 14; + * @return whether the challengeId field is set */ - public boolean hasStars() { + public boolean hasChallengeId() { return (bitField0_ & 0x00000008) != 0; } /** - * optional uint32 stars = 15; + * optional uint32 challenge_id = 14; * @return this */ - public ChallengeSettleNotify clearStars() { + public ChallengeSettleNotify clearChallengeId() { bitField0_ &= ~0x00000008; - stars = 0; + challengeId = 0; return this; } /** - * optional uint32 stars = 15; - * @return the stars + * optional uint32 challenge_id = 14; + * @return the challengeId */ - public int getStars() { - return stars; + public int getChallengeId() { + return challengeId; } /** - * optional uint32 stars = 15; - * @param value the stars to set + * optional uint32 challenge_id = 14; + * @param value the challengeId to set * @return this */ - public ChallengeSettleNotify setStars(final int value) { + public ChallengeSettleNotify setChallengeId(final int value) { bitField0_ |= 0x00000008; - stars = value; + challengeId = value; return this; } /** - * optional bool is_win = 13; + * optional bool is_win = 15; * @return whether the isWin field is set */ public boolean hasIsWin() { @@ -215,7 +215,7 @@ public boolean hasIsWin() { } /** - * optional bool is_win = 13; + * optional bool is_win = 15; * @return this */ public ChallengeSettleNotify clearIsWin() { @@ -225,7 +225,7 @@ public ChallengeSettleNotify clearIsWin() { } /** - * optional bool is_win = 13; + * optional bool is_win = 15; * @return the isWin */ public boolean getIsWin() { @@ -233,7 +233,7 @@ public boolean getIsWin() { } /** - * optional bool is_win = 13; + * optional bool is_win = 15; * @param value the isWin to set * @return this */ @@ -244,7 +244,7 @@ public ChallengeSettleNotify setIsWin(final boolean value) { } /** - * optional .ItemList reward = 8; + * optional .ItemList reward = 12; * @return whether the reward field is set */ public boolean hasReward() { @@ -252,7 +252,7 @@ public boolean hasReward() { } /** - * optional .ItemList reward = 8; + * optional .ItemList reward = 12; * @return this */ public ChallengeSettleNotify clearReward() { @@ -262,7 +262,7 @@ public ChallengeSettleNotify clearReward() { } /** - * optional .ItemList reward = 8; + * optional .ItemList reward = 12; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -276,7 +276,7 @@ public ItemListOuterClass.ItemList getReward() { } /** - * optional .ItemList reward = 8; + * optional .ItemList reward = 12; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -290,7 +290,7 @@ public ItemListOuterClass.ItemList getMutableReward() { } /** - * optional .ItemList reward = 8; + * optional .ItemList reward = 12; * @param value the reward to set * @return this */ @@ -305,10 +305,10 @@ public ChallengeSettleNotify copyFrom(final ChallengeSettleNotify other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - scoreTwo = other.scoreTwo; - challengeId = other.challengeId; challengeScore = other.challengeScore; + scoreTwo = other.scoreTwo; stars = other.stars; + challengeId = other.challengeId; isWin = other.isWin; reward.copyFrom(other.reward); } @@ -321,18 +321,18 @@ public ChallengeSettleNotify mergeFrom(final ChallengeSettleNotify other) { return this; } cachedSize = -1; - if (other.hasScoreTwo()) { - setScoreTwo(other.scoreTwo); - } - if (other.hasChallengeId()) { - setChallengeId(other.challengeId); - } if (other.hasChallengeScore()) { setChallengeScore(other.challengeScore); } + if (other.hasScoreTwo()) { + setScoreTwo(other.scoreTwo); + } if (other.hasStars()) { setStars(other.stars); } + if (other.hasChallengeId()) { + setChallengeId(other.challengeId); + } if (other.hasIsWin()) { setIsWin(other.isWin); } @@ -349,10 +349,10 @@ public ChallengeSettleNotify clear() { } cachedSize = -1; bitField0_ = 0; - scoreTwo = 0; - challengeId = 0; challengeScore = 0; + scoreTwo = 0; stars = 0; + challengeId = 0; isWin = false; reward.clear(); return this; @@ -379,10 +379,10 @@ public boolean equals(Object o) { } ChallengeSettleNotify other = (ChallengeSettleNotify) o; return bitField0_ == other.bitField0_ - && (!hasScoreTwo() || scoreTwo == other.scoreTwo) - && (!hasChallengeId() || challengeId == other.challengeId) && (!hasChallengeScore() || challengeScore == other.challengeScore) + && (!hasScoreTwo() || scoreTwo == other.scoreTwo) && (!hasStars() || stars == other.stars) + && (!hasChallengeId() || challengeId == other.challengeId) && (!hasIsWin() || isWin == other.isWin) && (!hasReward() || reward.equals(other.reward)); } @@ -390,27 +390,27 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 48); - output.writeUInt32NoTag(scoreTwo); + output.writeRawByte((byte) 72); + output.writeUInt32NoTag(challengeScore); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 72); - output.writeUInt32NoTag(challengeId); + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(scoreTwo); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 88); - output.writeUInt32NoTag(challengeScore); + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(stars); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 120); - output.writeUInt32NoTag(stars); + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(challengeId); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 120); output.writeBoolNoTag(isWin); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 66); + output.writeRawByte((byte) 98); output.writeMessageNoTag(reward); } } @@ -419,16 +419,16 @@ public void writeTo(final ProtoSink output) throws IOException { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(scoreTwo); + size += 1 + ProtoSink.computeUInt32SizeNoTag(challengeScore); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(challengeId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(scoreTwo); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(challengeScore); + size += 1 + ProtoSink.computeUInt32SizeNoTag(stars); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(stars); + size += 1 + ProtoSink.computeUInt32SizeNoTag(challengeId); } if ((bitField0_ & 0x00000010) != 0) { size += 2; @@ -446,52 +446,52 @@ public ChallengeSettleNotify mergeFrom(final ProtoSource input) throws IOExcepti int tag = input.readTag(); while (true) { switch (tag) { - case 48: { - // scoreTwo - scoreTwo = input.readUInt32(); + case 72: { + // challengeScore + challengeScore = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 72) { + if (tag != 80) { break; } } - case 72: { - // challengeId - challengeId = input.readUInt32(); + case 80: { + // scoreTwo + scoreTwo = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 88) { + if (tag != 104) { break; } } - case 88: { - // challengeScore - challengeScore = input.readUInt32(); + case 104: { + // stars + stars = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 120) { + if (tag != 112) { break; } } - case 120: { - // stars - stars = input.readUInt32(); + case 112: { + // challengeId + challengeId = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 104) { + if (tag != 120) { break; } } - case 104: { + case 120: { // isWin isWin = input.readBool(); bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 66) { + if (tag != 98) { break; } } - case 66: { + case 98: { // reward input.readMessage(reward); bitField0_ |= 0x00000020; @@ -518,16 +518,16 @@ public ChallengeSettleNotify mergeFrom(final ProtoSource input) throws IOExcepti public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.scoreTwo, scoreTwo); + output.writeUInt32(FieldNames.challengeScore, challengeScore); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.challengeId, challengeId); + output.writeUInt32(FieldNames.scoreTwo, scoreTwo); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.challengeScore, challengeScore); + output.writeUInt32(FieldNames.stars, stars); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.stars, stars); + output.writeUInt32(FieldNames.challengeId, challengeId); } if ((bitField0_ & 0x00000010) != 0) { output.writeBool(FieldNames.isWin, isWin); @@ -545,11 +545,11 @@ public ChallengeSettleNotify mergeFrom(final JsonSource input) throws IOExceptio } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -485512614: - case 2129303327: { - if (input.isAtField(FieldNames.scoreTwo)) { + case 591599599: + case 1517684662: { + if (input.isAtField(FieldNames.challengeScore)) { if (!input.trySkipNullValue()) { - scoreTwo = input.readUInt32(); + challengeScore = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -557,11 +557,11 @@ public ChallengeSettleNotify mergeFrom(final JsonSource input) throws IOExceptio } break; } - case -689112866: - case 112359031: { - if (input.isAtField(FieldNames.challengeId)) { + case -485512614: + case 2129303327: { + if (input.isAtField(FieldNames.scoreTwo)) { if (!input.trySkipNullValue()) { - challengeId = input.readUInt32(); + scoreTwo = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -569,11 +569,10 @@ public ChallengeSettleNotify mergeFrom(final JsonSource input) throws IOExceptio } break; } - case 591599599: - case 1517684662: { - if (input.isAtField(FieldNames.challengeScore)) { + case 109757537: { + if (input.isAtField(FieldNames.stars)) { if (!input.trySkipNullValue()) { - challengeScore = input.readUInt32(); + stars = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -581,10 +580,11 @@ public ChallengeSettleNotify mergeFrom(final JsonSource input) throws IOExceptio } break; } - case 109757537: { - if (input.isAtField(FieldNames.stars)) { + case -689112866: + case 112359031: { + if (input.isAtField(FieldNames.challengeId)) { if (!input.trySkipNullValue()) { - stars = input.readUInt32(); + challengeId = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -668,14 +668,14 @@ public ChallengeSettleNotify create() { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName scoreTwo = FieldName.forField("scoreTwo", "score_two"); - - static final FieldName challengeId = FieldName.forField("challengeId", "challenge_id"); - static final FieldName challengeScore = FieldName.forField("challengeScore", "challenge_score"); + static final FieldName scoreTwo = FieldName.forField("scoreTwo", "score_two"); + static final FieldName stars = FieldName.forField("stars"); + static final FieldName challengeId = FieldName.forField("challengeId", "challenge_id"); + static final FieldName isWin = FieldName.forField("isWin", "is_win"); static final FieldName reward = FieldName.forField("reward"); diff --git a/src/generated/main/emu/lunarcore/proto/ChallengeStoryBuffInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChallengeStoryBuffInfoOuterClass.java index f4524fb5c..da5dbedc9 100644 --- a/src/generated/main/emu/lunarcore/proto/ChallengeStoryBuffInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ChallengeStoryBuffInfoOuterClass.java @@ -20,7 +20,7 @@ public static final class ChallengeStoryBuffInfo extends ProtoMessagerepeated uint32 buff_list = 5; + * repeated uint32 buff_list = 2; */ private final RepeatedInt buffList = RepeatedInt.newEmptyInstance(); @@ -35,7 +35,7 @@ public static ChallengeStoryBuffInfo newInstance() { } /** - * repeated uint32 buff_list = 5; + * repeated uint32 buff_list = 2; * @return whether the buffList field is set */ public boolean hasBuffList() { @@ -43,7 +43,7 @@ public boolean hasBuffList() { } /** - * repeated uint32 buff_list = 5; + * repeated uint32 buff_list = 2; * @return this */ public ChallengeStoryBuffInfo clearBuffList() { @@ -53,7 +53,7 @@ public ChallengeStoryBuffInfo clearBuffList() { } /** - * repeated uint32 buff_list = 5; + * repeated uint32 buff_list = 2; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -67,7 +67,7 @@ public RepeatedInt getBuffList() { } /** - * repeated uint32 buff_list = 5; + * repeated uint32 buff_list = 2; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -81,7 +81,7 @@ public RepeatedInt getMutableBuffList() { } /** - * repeated uint32 buff_list = 5; + * repeated uint32 buff_list = 2; * @param value the buffList to add * @return this */ @@ -92,7 +92,7 @@ public ChallengeStoryBuffInfo addBuffList(final int value) { } /** - * repeated uint32 buff_list = 5; + * repeated uint32 buff_list = 2; * @param values the buffList to add * @return this */ @@ -163,7 +163,7 @@ public boolean equals(Object o) { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { for (int i = 0; i < buffList.length(); i++) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(buffList.array()[i]); } } @@ -185,7 +185,7 @@ public ChallengeStoryBuffInfo mergeFrom(final ProtoSource input) throws IOExcept int tag = input.readTag(); while (true) { switch (tag) { - case 42: { + case 18: { // buffList [packed=true] input.readPackedUInt32(buffList, tag); bitField0_ |= 0x00000001; @@ -204,7 +204,7 @@ public ChallengeStoryBuffInfo mergeFrom(final ProtoSource input) throws IOExcept tag = input.readTag(); break; } - case 40: { + case 16: { // buffList [packed=false] tag = input.readRepeatedUInt32(buffList, tag); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/ChallengeStoryInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChallengeStoryInfoOuterClass.java index e4b80755f..da8a4f317 100644 --- a/src/generated/main/emu/lunarcore/proto/ChallengeStoryInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ChallengeStoryInfoOuterClass.java @@ -19,7 +19,7 @@ public static final class ChallengeStoryInfo extends ProtoMessageoptional .ChallengeStoryBuffInfo cur_story_buffs = 6; + * optional .ChallengeStoryBuffInfo cur_story_buffs = 1; */ private final ChallengeStoryBuffInfoOuterClass.ChallengeStoryBuffInfo curStoryBuffs = ChallengeStoryBuffInfoOuterClass.ChallengeStoryBuffInfo.newInstance(); @@ -34,7 +34,7 @@ public static ChallengeStoryInfo newInstance() { } /** - * optional .ChallengeStoryBuffInfo cur_story_buffs = 6; + * optional .ChallengeStoryBuffInfo cur_story_buffs = 1; * @return whether the curStoryBuffs field is set */ public boolean hasCurStoryBuffs() { @@ -42,7 +42,7 @@ public boolean hasCurStoryBuffs() { } /** - * optional .ChallengeStoryBuffInfo cur_story_buffs = 6; + * optional .ChallengeStoryBuffInfo cur_story_buffs = 1; * @return this */ public ChallengeStoryInfo clearCurStoryBuffs() { @@ -52,7 +52,7 @@ public ChallengeStoryInfo clearCurStoryBuffs() { } /** - * optional .ChallengeStoryBuffInfo cur_story_buffs = 6; + * optional .ChallengeStoryBuffInfo cur_story_buffs = 1; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -66,7 +66,7 @@ public ChallengeStoryBuffInfoOuterClass.ChallengeStoryBuffInfo getCurStoryBuffs( } /** - * optional .ChallengeStoryBuffInfo cur_story_buffs = 6; + * optional .ChallengeStoryBuffInfo cur_story_buffs = 1; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -80,7 +80,7 @@ public ChallengeStoryBuffInfoOuterClass.ChallengeStoryBuffInfo getMutableCurStor } /** - * optional .ChallengeStoryBuffInfo cur_story_buffs = 6; + * optional .ChallengeStoryBuffInfo cur_story_buffs = 1; * @param value the curStoryBuffs to set * @return this */ @@ -151,7 +151,7 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 50); + output.writeRawByte((byte) 10); output.writeMessageNoTag(curStoryBuffs); } } @@ -172,7 +172,7 @@ public ChallengeStoryInfo mergeFrom(final ProtoSource input) throws IOException int tag = input.readTag(); while (true) { switch (tag) { - case 50: { + case 10: { // curStoryBuffs input.readMessage(curStoryBuffs); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/ChangeLineupLeaderCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChangeLineupLeaderCsReqOuterClass.java index 29461558e..723b16668 100644 --- a/src/generated/main/emu/lunarcore/proto/ChangeLineupLeaderCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ChangeLineupLeaderCsReqOuterClass.java @@ -19,7 +19,7 @@ public static final class ChangeLineupLeaderCsReq extends ProtoMessageoptional uint32 slot = 10; + * optional uint32 slot = 9; */ private int slot; @@ -34,7 +34,7 @@ public static ChangeLineupLeaderCsReq newInstance() { } /** - * optional uint32 slot = 10; + * optional uint32 slot = 9; * @return whether the slot field is set */ public boolean hasSlot() { @@ -42,7 +42,7 @@ public boolean hasSlot() { } /** - * optional uint32 slot = 10; + * optional uint32 slot = 9; * @return this */ public ChangeLineupLeaderCsReq clearSlot() { @@ -52,7 +52,7 @@ public ChangeLineupLeaderCsReq clearSlot() { } /** - * optional uint32 slot = 10; + * optional uint32 slot = 9; * @return the slot */ public int getSlot() { @@ -60,7 +60,7 @@ public int getSlot() { } /** - * optional uint32 slot = 10; + * optional uint32 slot = 9; * @param value the slot to set * @return this */ @@ -129,7 +129,7 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(slot); } } @@ -150,7 +150,7 @@ public ChangeLineupLeaderCsReq mergeFrom(final ProtoSource input) throws IOExcep int tag = input.readTag(); while (true) { switch (tag) { - case 80: { + case 72: { // slot slot = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/ChangeLineupLeaderScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChangeLineupLeaderScRspOuterClass.java index 89a8cebfa..a98652b61 100644 --- a/src/generated/main/emu/lunarcore/proto/ChangeLineupLeaderScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ChangeLineupLeaderScRspOuterClass.java @@ -19,14 +19,14 @@ public static final class ChangeLineupLeaderScRsp extends ProtoMessageoptional uint32 slot = 1; + * optional uint32 retcode = 8; */ - private int slot; + private int retcode; /** - * optional uint32 retcode = 15; + * optional uint32 slot = 10; */ - private int retcode; + private int slot; private ChangeLineupLeaderScRsp() { } @@ -39,76 +39,76 @@ public static ChangeLineupLeaderScRsp newInstance() { } /** - * optional uint32 slot = 1; - * @return whether the slot field is set + * optional uint32 retcode = 8; + * @return whether the retcode field is set */ - public boolean hasSlot() { + public boolean hasRetcode() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 slot = 1; + * optional uint32 retcode = 8; * @return this */ - public ChangeLineupLeaderScRsp clearSlot() { + public ChangeLineupLeaderScRsp clearRetcode() { bitField0_ &= ~0x00000001; - slot = 0; + retcode = 0; return this; } /** - * optional uint32 slot = 1; - * @return the slot + * optional uint32 retcode = 8; + * @return the retcode */ - public int getSlot() { - return slot; + public int getRetcode() { + return retcode; } /** - * optional uint32 slot = 1; - * @param value the slot to set + * optional uint32 retcode = 8; + * @param value the retcode to set * @return this */ - public ChangeLineupLeaderScRsp setSlot(final int value) { + public ChangeLineupLeaderScRsp setRetcode(final int value) { bitField0_ |= 0x00000001; - slot = value; + retcode = value; return this; } /** - * optional uint32 retcode = 15; - * @return whether the retcode field is set + * optional uint32 slot = 10; + * @return whether the slot field is set */ - public boolean hasRetcode() { + public boolean hasSlot() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 retcode = 15; + * optional uint32 slot = 10; * @return this */ - public ChangeLineupLeaderScRsp clearRetcode() { + public ChangeLineupLeaderScRsp clearSlot() { bitField0_ &= ~0x00000002; - retcode = 0; + slot = 0; return this; } /** - * optional uint32 retcode = 15; - * @return the retcode + * optional uint32 slot = 10; + * @return the slot */ - public int getRetcode() { - return retcode; + public int getSlot() { + return slot; } /** - * optional uint32 retcode = 15; - * @param value the retcode to set + * optional uint32 slot = 10; + * @param value the slot to set * @return this */ - public ChangeLineupLeaderScRsp setRetcode(final int value) { + public ChangeLineupLeaderScRsp setSlot(final int value) { bitField0_ |= 0x00000002; - retcode = value; + slot = value; return this; } @@ -117,8 +117,8 @@ public ChangeLineupLeaderScRsp copyFrom(final ChangeLineupLeaderScRsp other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - slot = other.slot; retcode = other.retcode; + slot = other.slot; } return this; } @@ -129,12 +129,12 @@ public ChangeLineupLeaderScRsp mergeFrom(final ChangeLineupLeaderScRsp other) { return this; } cachedSize = -1; - if (other.hasSlot()) { - setSlot(other.slot); - } if (other.hasRetcode()) { setRetcode(other.retcode); } + if (other.hasSlot()) { + setSlot(other.slot); + } return this; } @@ -145,8 +145,8 @@ public ChangeLineupLeaderScRsp clear() { } cachedSize = -1; bitField0_ = 0; - slot = 0; retcode = 0; + slot = 0; return this; } @@ -170,19 +170,19 @@ public boolean equals(Object o) { } ChangeLineupLeaderScRsp other = (ChangeLineupLeaderScRsp) o; return bitField0_ == other.bitField0_ - && (!hasSlot() || slot == other.slot) - && (!hasRetcode() || retcode == other.retcode); + && (!hasRetcode() || retcode == other.retcode) + && (!hasSlot() || slot == other.slot); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); - output.writeUInt32NoTag(slot); + output.writeRawByte((byte) 64); + output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 120); - output.writeUInt32NoTag(retcode); + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(slot); } } @@ -190,10 +190,10 @@ public void writeTo(final ProtoSink output) throws IOException { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(slot); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(slot); } return size; } @@ -205,18 +205,18 @@ public ChangeLineupLeaderScRsp mergeFrom(final ProtoSource input) throws IOExcep int tag = input.readTag(); while (true) { switch (tag) { - case 8: { - // slot - slot = input.readUInt32(); + case 64: { + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 120) { + if (tag != 80) { break; } } - case 120: { - // retcode - retcode = input.readUInt32(); + case 80: { + // slot + slot = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -241,10 +241,10 @@ public ChangeLineupLeaderScRsp mergeFrom(final ProtoSource input) throws IOExcep public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.slot, slot); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.slot, slot); } output.endObject(); } @@ -256,10 +256,10 @@ public ChangeLineupLeaderScRsp mergeFrom(final JsonSource input) throws IOExcept } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 3533310: { - if (input.isAtField(FieldNames.slot)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - slot = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -267,10 +267,10 @@ public ChangeLineupLeaderScRsp mergeFrom(final JsonSource input) throws IOExcept } break; } - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case 3533310: { + if (input.isAtField(FieldNames.slot)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + slot = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -331,9 +331,9 @@ public ChangeLineupLeaderScRsp create() { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName slot = FieldName.forField("slot"); - static final FieldName retcode = FieldName.forField("retcode"); + + static final FieldName slot = FieldName.forField("slot"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/ChargerInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChargerInfoOuterClass.java new file mode 100644 index 000000000..0cbe79b3c --- /dev/null +++ b/src/generated/main/emu/lunarcore/proto/ChargerInfoOuterClass.java @@ -0,0 +1,340 @@ +// Code generated by protocol buffer compiler. Do not edit! +package emu.lunarcore.proto; + +import java.io.IOException; +import us.hebi.quickbuf.FieldName; +import us.hebi.quickbuf.InvalidProtocolBufferException; +import us.hebi.quickbuf.JsonSink; +import us.hebi.quickbuf.JsonSource; +import us.hebi.quickbuf.MessageFactory; +import us.hebi.quickbuf.ProtoMessage; +import us.hebi.quickbuf.ProtoSink; +import us.hebi.quickbuf.ProtoSource; + +public final class ChargerInfoOuterClass { + /** + * Protobuf type {@code ChargerInfo} + */ + public static final class ChargerInfo extends ProtoMessage implements Cloneable { + private static final long serialVersionUID = 0L; + + /** + * optional uint32 unk_int = 1; + */ + private int unkInt; + + /** + * optional uint32 group_id = 14; + */ + private int groupId; + + private ChargerInfo() { + } + + /** + * @return a new empty instance of {@code ChargerInfo} + */ + public static ChargerInfo newInstance() { + return new ChargerInfo(); + } + + /** + * optional uint32 unk_int = 1; + * @return whether the unkInt field is set + */ + public boolean hasUnkInt() { + return (bitField0_ & 0x00000001) != 0; + } + + /** + * optional uint32 unk_int = 1; + * @return this + */ + public ChargerInfo clearUnkInt() { + bitField0_ &= ~0x00000001; + unkInt = 0; + return this; + } + + /** + * optional uint32 unk_int = 1; + * @return the unkInt + */ + public int getUnkInt() { + return unkInt; + } + + /** + * optional uint32 unk_int = 1; + * @param value the unkInt to set + * @return this + */ + public ChargerInfo setUnkInt(final int value) { + bitField0_ |= 0x00000001; + unkInt = value; + return this; + } + + /** + * optional uint32 group_id = 14; + * @return whether the groupId field is set + */ + public boolean hasGroupId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 group_id = 14; + * @return this + */ + public ChargerInfo clearGroupId() { + bitField0_ &= ~0x00000002; + groupId = 0; + return this; + } + + /** + * optional uint32 group_id = 14; + * @return the groupId + */ + public int getGroupId() { + return groupId; + } + + /** + * optional uint32 group_id = 14; + * @param value the groupId to set + * @return this + */ + public ChargerInfo setGroupId(final int value) { + bitField0_ |= 0x00000002; + groupId = value; + return this; + } + + @Override + public ChargerInfo copyFrom(final ChargerInfo other) { + cachedSize = other.cachedSize; + if ((bitField0_ | other.bitField0_) != 0) { + bitField0_ = other.bitField0_; + unkInt = other.unkInt; + groupId = other.groupId; + } + return this; + } + + @Override + public ChargerInfo mergeFrom(final ChargerInfo other) { + if (other.isEmpty()) { + return this; + } + cachedSize = -1; + if (other.hasUnkInt()) { + setUnkInt(other.unkInt); + } + if (other.hasGroupId()) { + setGroupId(other.groupId); + } + return this; + } + + @Override + public ChargerInfo clear() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + unkInt = 0; + groupId = 0; + return this; + } + + @Override + public ChargerInfo clearQuick() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + return this; + } + + @Override + public boolean equals(Object o) { + if (o == this) { + return true; + } + if (!(o instanceof ChargerInfo)) { + return false; + } + ChargerInfo other = (ChargerInfo) o; + return bitField0_ == other.bitField0_ + && (!hasUnkInt() || unkInt == other.unkInt) + && (!hasGroupId() || groupId == other.groupId); + } + + @Override + public void writeTo(final ProtoSink output) throws IOException { + if ((bitField0_ & 0x00000001) != 0) { + output.writeRawByte((byte) 8); + output.writeUInt32NoTag(unkInt); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(groupId); + } + } + + @Override + protected int computeSerializedSize() { + int size = 0; + if ((bitField0_ & 0x00000001) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(unkInt); + } + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(groupId); + } + return size; + } + + @Override + @SuppressWarnings("fallthrough") + public ChargerInfo mergeFrom(final ProtoSource input) throws IOException { + // Enabled Fall-Through Optimization (QuickBuffers) + int tag = input.readTag(); + while (true) { + switch (tag) { + case 8: { + // unkInt + unkInt = input.readUInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 112) { + break; + } + } + case 112: { + // groupId + groupId = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 0) { + break; + } + } + case 0: { + return this; + } + default: { + if (!input.skipField(tag)) { + return this; + } + tag = input.readTag(); + break; + } + } + } + } + + @Override + public void writeTo(final JsonSink output) throws IOException { + output.beginObject(); + if ((bitField0_ & 0x00000001) != 0) { + output.writeUInt32(FieldNames.unkInt, unkInt); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeUInt32(FieldNames.groupId, groupId); + } + output.endObject(); + } + + @Override + public ChargerInfo mergeFrom(final JsonSource input) throws IOException { + if (!input.beginObject()) { + return this; + } + while (!input.isAtEnd()) { + switch (input.readFieldHash()) { + case -840508003: + case -285293790: { + if (input.isAtField(FieldNames.unkInt)) { + if (!input.trySkipNullValue()) { + unkInt = input.readUInt32(); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } + case 293428218: + case 506361563: { + if (input.isAtField(FieldNames.groupId)) { + if (!input.trySkipNullValue()) { + groupId = input.readUInt32(); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + default: { + input.skipUnknownField(); + break; + } + } + } + input.endObject(); + return this; + } + + @Override + public ChargerInfo clone() { + return new ChargerInfo().copyFrom(this); + } + + @Override + public boolean isEmpty() { + return ((bitField0_) == 0); + } + + public static ChargerInfo parseFrom(final byte[] data) throws InvalidProtocolBufferException { + return ProtoMessage.mergeFrom(new ChargerInfo(), data).checkInitialized(); + } + + public static ChargerInfo parseFrom(final ProtoSource input) throws IOException { + return ProtoMessage.mergeFrom(new ChargerInfo(), input).checkInitialized(); + } + + public static ChargerInfo parseFrom(final JsonSource input) throws IOException { + return ProtoMessage.mergeFrom(new ChargerInfo(), input).checkInitialized(); + } + + /** + * @return factory for creating ChargerInfo messages + */ + public static MessageFactory getFactory() { + return ChargerInfoFactory.INSTANCE; + } + + private enum ChargerInfoFactory implements MessageFactory { + INSTANCE; + + @Override + public ChargerInfo create() { + return ChargerInfo.newInstance(); + } + } + + /** + * Contains name constants used for serializing JSON + */ + static class FieldNames { + static final FieldName unkInt = FieldName.forField("unkInt", "unk_int"); + + static final FieldName groupId = FieldName.forField("groupId", "group_id"); + } + } +} diff --git a/src/generated/main/emu/lunarcore/proto/ChatOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChatOuterClass.java index 72492167f..031d496f6 100644 --- a/src/generated/main/emu/lunarcore/proto/ChatOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ChatOuterClass.java @@ -20,27 +20,27 @@ public static final class Chat extends ProtoMessage implements Cloneable { private static final long serialVersionUID = 0L; /** - * optional uint64 sent_time = 13; + * optional uint64 sent_time = 9; */ private long sentTime; /** - * optional uint32 sender_uid = 1; + * optional uint32 sender_uid = 4; */ private int senderUid; /** - * optional uint32 emote = 11; + * optional uint32 emote = 6; */ private int emote; /** - * optional .MsgType msg_type = 8; + * optional .MsgType msg_type = 2; */ private int msgType; /** - * optional string text = 2; + * optional string text = 5; */ private final Utf8String text = Utf8String.newEmptyInstance(); @@ -55,7 +55,7 @@ public static Chat newInstance() { } /** - * optional uint64 sent_time = 13; + * optional uint64 sent_time = 9; * @return whether the sentTime field is set */ public boolean hasSentTime() { @@ -63,7 +63,7 @@ public boolean hasSentTime() { } /** - * optional uint64 sent_time = 13; + * optional uint64 sent_time = 9; * @return this */ public Chat clearSentTime() { @@ -73,7 +73,7 @@ public Chat clearSentTime() { } /** - * optional uint64 sent_time = 13; + * optional uint64 sent_time = 9; * @return the sentTime */ public long getSentTime() { @@ -81,7 +81,7 @@ public long getSentTime() { } /** - * optional uint64 sent_time = 13; + * optional uint64 sent_time = 9; * @param value the sentTime to set * @return this */ @@ -92,7 +92,7 @@ public Chat setSentTime(final long value) { } /** - * optional uint32 sender_uid = 1; + * optional uint32 sender_uid = 4; * @return whether the senderUid field is set */ public boolean hasSenderUid() { @@ -100,7 +100,7 @@ public boolean hasSenderUid() { } /** - * optional uint32 sender_uid = 1; + * optional uint32 sender_uid = 4; * @return this */ public Chat clearSenderUid() { @@ -110,7 +110,7 @@ public Chat clearSenderUid() { } /** - * optional uint32 sender_uid = 1; + * optional uint32 sender_uid = 4; * @return the senderUid */ public int getSenderUid() { @@ -118,7 +118,7 @@ public int getSenderUid() { } /** - * optional uint32 sender_uid = 1; + * optional uint32 sender_uid = 4; * @param value the senderUid to set * @return this */ @@ -129,7 +129,7 @@ public Chat setSenderUid(final int value) { } /** - * optional uint32 emote = 11; + * optional uint32 emote = 6; * @return whether the emote field is set */ public boolean hasEmote() { @@ -137,7 +137,7 @@ public boolean hasEmote() { } /** - * optional uint32 emote = 11; + * optional uint32 emote = 6; * @return this */ public Chat clearEmote() { @@ -147,7 +147,7 @@ public Chat clearEmote() { } /** - * optional uint32 emote = 11; + * optional uint32 emote = 6; * @return the emote */ public int getEmote() { @@ -155,7 +155,7 @@ public int getEmote() { } /** - * optional uint32 emote = 11; + * optional uint32 emote = 6; * @param value the emote to set * @return this */ @@ -166,7 +166,7 @@ public Chat setEmote(final int value) { } /** - * optional .MsgType msg_type = 8; + * optional .MsgType msg_type = 2; * @return whether the msgType field is set */ public boolean hasMsgType() { @@ -174,7 +174,7 @@ public boolean hasMsgType() { } /** - * optional .MsgType msg_type = 8; + * optional .MsgType msg_type = 2; * @return this */ public Chat clearMsgType() { @@ -184,7 +184,7 @@ public Chat clearMsgType() { } /** - * optional .MsgType msg_type = 8; + * optional .MsgType msg_type = 2; * @return the msgType */ public MsgTypeOuterClass.MsgType getMsgType() { @@ -217,7 +217,7 @@ public Chat setMsgTypeValue(final int value) { } /** - * optional .MsgType msg_type = 8; + * optional .MsgType msg_type = 2; * @param value the msgType to set * @return this */ @@ -228,7 +228,7 @@ public Chat setMsgType(final MsgTypeOuterClass.MsgType value) { } /** - * optional string text = 2; + * optional string text = 5; * @return whether the text field is set */ public boolean hasText() { @@ -236,7 +236,7 @@ public boolean hasText() { } /** - * optional string text = 2; + * optional string text = 5; * @return this */ public Chat clearText() { @@ -246,7 +246,7 @@ public Chat clearText() { } /** - * optional string text = 2; + * optional string text = 5; * @return the text */ public String getText() { @@ -254,7 +254,7 @@ public String getText() { } /** - * optional string text = 2; + * optional string text = 5; * @return internal {@code Utf8String} representation of text for reading */ public Utf8String getTextBytes() { @@ -262,7 +262,7 @@ public Utf8String getTextBytes() { } /** - * optional string text = 2; + * optional string text = 5; * @return internal {@code Utf8String} representation of text for modifications */ public Utf8String getMutableTextBytes() { @@ -271,7 +271,7 @@ public Utf8String getMutableTextBytes() { } /** - * optional string text = 2; + * optional string text = 5; * @param value the text to set * @return this */ @@ -282,7 +282,7 @@ public Chat setText(final CharSequence value) { } /** - * optional string text = 2; + * optional string text = 5; * @param value the text to set * @return this */ @@ -376,23 +376,23 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 72); output.writeUInt64NoTag(sentTime); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(senderUid); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(emote); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 16); output.writeEnumNoTag(msgType); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 18); + output.writeRawByte((byte) 42); output.writeStringNoTag(text); } } @@ -425,34 +425,34 @@ public Chat mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 104: { + case 72: { // sentTime sentTime = input.readUInt64(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 8) { + if (tag != 32) { break; } } - case 8: { + case 32: { // senderUid senderUid = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 88) { + if (tag != 48) { break; } } - case 88: { + case 48: { // emote emote = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 64) { + if (tag != 16) { break; } } - case 64: { + case 16: { // msgType final int value = input.readInt32(); if (MsgTypeOuterClass.MsgType.forNumber(value) != null) { @@ -460,11 +460,11 @@ public Chat mergeFrom(final ProtoSource input) throws IOException { bitField0_ |= 0x00000008; } tag = input.readTag(); - if (tag != 18) { + if (tag != 42) { break; } } - case 18: { + case 42: { // text input.readString(text); bitField0_ |= 0x00000010; diff --git a/src/generated/main/emu/lunarcore/proto/ChessRogueNousQueryInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChessRogueNousQueryInfoOuterClass.java index 35de81fa5..e119c8e7a 100644 --- a/src/generated/main/emu/lunarcore/proto/ChessRogueNousQueryInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ChessRogueNousQueryInfoOuterClass.java @@ -2,7 +2,6 @@ package emu.lunarcore.proto; import java.io.IOException; -import us.hebi.quickbuf.FieldName; import us.hebi.quickbuf.InvalidProtocolBufferException; import us.hebi.quickbuf.JsonSink; import us.hebi.quickbuf.JsonSource; @@ -10,354 +9,45 @@ import us.hebi.quickbuf.ProtoMessage; import us.hebi.quickbuf.ProtoSink; import us.hebi.quickbuf.ProtoSource; -import us.hebi.quickbuf.RepeatedInt; public final class ChessRogueNousQueryInfoOuterClass { /** + * 
+   * MAKPHMAOCHI talent_info = 1;
+   * OFHBFINPHAG JNAGMIALOII = 6;
+   * CLIDPGPDFGK IKGPADCBBPN = 4;
+   * ChessRogueQuery query_info = 13;
+   * repeated uint32 PHJAFGJHOCO = 7;
+   * repeated uint32 CMNHLKGFKOP = 8;
+   *
+ * * Protobuf type {@code ChessRogueNousQueryInfo} */ public static final class ChessRogueNousQueryInfo extends ProtoMessage implements Cloneable { private static final long serialVersionUID = 0L; - /** - * 
-     * MAKPHMAOCHI talent_info = 1;
-     *
- * - * optional .OFHBFINPHAG JNAGMIALOII = 6; - */ - private final OFHBFINPHAGOuterClass.OFHBFINPHAG jNAGMIALOII = OFHBFINPHAGOuterClass.OFHBFINPHAG.newInstance(); - - /** - * 
-     * CLIDPGPDFGK IKGPADCBBPN = 4;
-     *
- * - * optional .ChessRogueQuery query_info = 13; - */ - private final ChessRogueQueryOuterClass.ChessRogueQuery queryInfo = ChessRogueQueryOuterClass.ChessRogueQuery.newInstance(); - - /** - * repeated uint32 PHJAFGJHOCO = 7; - */ - private final RepeatedInt pHJAFGJHOCO = RepeatedInt.newEmptyInstance(); - - /** - * repeated uint32 CMNHLKGFKOP = 8; - */ - private final RepeatedInt cMNHLKGFKOP = RepeatedInt.newEmptyInstance(); - private ChessRogueNousQueryInfo() { } - /** - * @return a new empty instance of {@code ChessRogueNousQueryInfo} - */ - public static ChessRogueNousQueryInfo newInstance() { - return new ChessRogueNousQueryInfo(); - } - - /** - * 
-     * MAKPHMAOCHI talent_info = 1;
-     *
- * - * optional .OFHBFINPHAG JNAGMIALOII = 6; - * @return whether the jNAGMIALOII field is set - */ - public boolean hasJNAGMIALOII() { - return (bitField0_ & 0x00000001) != 0; - } - - /** - * 
-     * MAKPHMAOCHI talent_info = 1;
-     *
- * - * optional .OFHBFINPHAG JNAGMIALOII = 6; - * @return this - */ - public ChessRogueNousQueryInfo clearJNAGMIALOII() { - bitField0_ &= ~0x00000001; - jNAGMIALOII.clear(); - return this; - } - /** * 
      * MAKPHMAOCHI talent_info = 1;
-     *
- * - * optional .OFHBFINPHAG JNAGMIALOII = 6; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * Use {@link #getMutableJNAGMIALOII()} if you want to modify it. - * - * @return internal storage object for reading - */ - public OFHBFINPHAGOuterClass.OFHBFINPHAG getJNAGMIALOII() { - return jNAGMIALOII; - } - - /** - * 
-     * MAKPHMAOCHI talent_info = 1;
-     *
- * - * optional .OFHBFINPHAG JNAGMIALOII = 6; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public OFHBFINPHAGOuterClass.OFHBFINPHAG getMutableJNAGMIALOII() { - bitField0_ |= 0x00000001; - return jNAGMIALOII; - } - - /** - * 
-     * MAKPHMAOCHI talent_info = 1;
-     *
- * - * optional .OFHBFINPHAG JNAGMIALOII = 6; - * @param value the jNAGMIALOII to set - * @return this - */ - public ChessRogueNousQueryInfo setJNAGMIALOII(final OFHBFINPHAGOuterClass.OFHBFINPHAG value) { - bitField0_ |= 0x00000001; - jNAGMIALOII.copyFrom(value); - return this; - } - - /** - * 
+     * OFHBFINPHAG JNAGMIALOII = 6;
      * CLIDPGPDFGK IKGPADCBBPN = 4;
+     * ChessRogueQuery query_info = 13;
+     * repeated uint32 PHJAFGJHOCO = 7;
+     * repeated uint32 CMNHLKGFKOP = 8;
      *
* - * optional .ChessRogueQuery query_info = 13; - * @return whether the queryInfo field is set - */ - public boolean hasQueryInfo() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * 
-     * CLIDPGPDFGK IKGPADCBBPN = 4;
-     *
- * - * optional .ChessRogueQuery query_info = 13; - * @return this - */ - public ChessRogueNousQueryInfo clearQueryInfo() { - bitField0_ &= ~0x00000002; - queryInfo.clear(); - return this; - } - - /** - * 
-     * CLIDPGPDFGK IKGPADCBBPN = 4;
-     *
- * - * optional .ChessRogueQuery query_info = 13; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * Use {@link #getMutableQueryInfo()} if you want to modify it. - * - * @return internal storage object for reading - */ - public ChessRogueQueryOuterClass.ChessRogueQuery getQueryInfo() { - return queryInfo; - } - - /** - * 
-     * CLIDPGPDFGK IKGPADCBBPN = 4;
-     *
- * - * optional .ChessRogueQuery query_info = 13; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public ChessRogueQueryOuterClass.ChessRogueQuery getMutableQueryInfo() { - bitField0_ |= 0x00000002; - return queryInfo; - } - - /** - * 
-     * CLIDPGPDFGK IKGPADCBBPN = 4;
-     *
- * - * optional .ChessRogueQuery query_info = 13; - * @param value the queryInfo to set - * @return this - */ - public ChessRogueNousQueryInfo setQueryInfo( - final ChessRogueQueryOuterClass.ChessRogueQuery value) { - bitField0_ |= 0x00000002; - queryInfo.copyFrom(value); - return this; - } - - /** - * repeated uint32 PHJAFGJHOCO = 7; - * @return whether the pHJAFGJHOCO field is set - */ - public boolean hasPHJAFGJHOCO() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * repeated uint32 PHJAFGJHOCO = 7; - * @return this - */ - public ChessRogueNousQueryInfo clearPHJAFGJHOCO() { - bitField0_ &= ~0x00000004; - pHJAFGJHOCO.clear(); - return this; - } - - /** - * repeated uint32 PHJAFGJHOCO = 7; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * Use {@link #getMutablePHJAFGJHOCO()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedInt getPHJAFGJHOCO() { - return pHJAFGJHOCO; - } - - /** - * repeated uint32 PHJAFGJHOCO = 7; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public RepeatedInt getMutablePHJAFGJHOCO() { - bitField0_ |= 0x00000004; - return pHJAFGJHOCO; - } - - /** - * repeated uint32 PHJAFGJHOCO = 7; - * @param value the pHJAFGJHOCO to add - * @return this - */ - public ChessRogueNousQueryInfo addPHJAFGJHOCO(final int value) { - bitField0_ |= 0x00000004; - pHJAFGJHOCO.add(value); - return this; - } - - /** - * repeated uint32 PHJAFGJHOCO = 7; - * @param values the pHJAFGJHOCO to add - * @return this - */ - public ChessRogueNousQueryInfo addAllPHJAFGJHOCO(final int... values) { - bitField0_ |= 0x00000004; - pHJAFGJHOCO.addAll(values); - return this; - } - - /** - * repeated uint32 CMNHLKGFKOP = 8; - * @return whether the cMNHLKGFKOP field is set - */ - public boolean hasCMNHLKGFKOP() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * repeated uint32 CMNHLKGFKOP = 8; - * @return this - */ - public ChessRogueNousQueryInfo clearCMNHLKGFKOP() { - bitField0_ &= ~0x00000008; - cMNHLKGFKOP.clear(); - return this; - } - - /** - * repeated uint32 CMNHLKGFKOP = 8; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * Use {@link #getMutableCMNHLKGFKOP()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedInt getCMNHLKGFKOP() { - return cMNHLKGFKOP; - } - - /** - * repeated uint32 CMNHLKGFKOP = 8; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public RepeatedInt getMutableCMNHLKGFKOP() { - bitField0_ |= 0x00000008; - return cMNHLKGFKOP; - } - - /** - * repeated uint32 CMNHLKGFKOP = 8; - * @param value the cMNHLKGFKOP to add - * @return this - */ - public ChessRogueNousQueryInfo addCMNHLKGFKOP(final int value) { - bitField0_ |= 0x00000008; - cMNHLKGFKOP.add(value); - return this; - } - - /** - * repeated uint32 CMNHLKGFKOP = 8; - * @param values the cMNHLKGFKOP to add - * @return this + * @return a new empty instance of {@code ChessRogueNousQueryInfo} */ - public ChessRogueNousQueryInfo addAllCMNHLKGFKOP(final int... values) { - bitField0_ |= 0x00000008; - cMNHLKGFKOP.addAll(values); - return this; + public static ChessRogueNousQueryInfo newInstance() { + return new ChessRogueNousQueryInfo(); } @Override public ChessRogueNousQueryInfo copyFrom(final ChessRogueNousQueryInfo other) { cachedSize = other.cachedSize; - if ((bitField0_ | other.bitField0_) != 0) { - bitField0_ = other.bitField0_; - jNAGMIALOII.copyFrom(other.jNAGMIALOII); - queryInfo.copyFrom(other.queryInfo); - pHJAFGJHOCO.copyFrom(other.pHJAFGJHOCO); - cMNHLKGFKOP.copyFrom(other.cMNHLKGFKOP); - } return this; } @@ -367,18 +57,6 @@ public ChessRogueNousQueryInfo mergeFrom(final ChessRogueNousQueryInfo other) { return this; } cachedSize = -1; - if (other.hasJNAGMIALOII()) { - getMutableJNAGMIALOII().mergeFrom(other.jNAGMIALOII); - } - if (other.hasQueryInfo()) { - getMutableQueryInfo().mergeFrom(other.queryInfo); - } - if (other.hasPHJAFGJHOCO()) { - getMutablePHJAFGJHOCO().addAll(other.pHJAFGJHOCO); - } - if (other.hasCMNHLKGFKOP()) { - getMutableCMNHLKGFKOP().addAll(other.cMNHLKGFKOP); - } return this; } @@ -388,11 +66,6 @@ public ChessRogueNousQueryInfo clear() { return this; } cachedSize = -1; - bitField0_ = 0; - jNAGMIALOII.clear(); - queryInfo.clear(); - pHJAFGJHOCO.clear(); - cMNHLKGFKOP.clear(); return this; } @@ -402,11 +75,6 @@ public ChessRogueNousQueryInfo clearQuick() { return this; } cachedSize = -1; - bitField0_ = 0; - jNAGMIALOII.clearQuick(); - queryInfo.clearQuick(); - pHJAFGJHOCO.clear(); - cMNHLKGFKOP.clear(); return this; } @@ -419,52 +87,16 @@ public boolean equals(Object o) { return false; } ChessRogueNousQueryInfo other = (ChessRogueNousQueryInfo) o; - return bitField0_ == other.bitField0_ - && (!hasJNAGMIALOII() || jNAGMIALOII.equals(other.jNAGMIALOII)) - && (!hasQueryInfo() || queryInfo.equals(other.queryInfo)) - && (!hasPHJAFGJHOCO() || pHJAFGJHOCO.equals(other.pHJAFGJHOCO)) - && (!hasCMNHLKGFKOP() || cMNHLKGFKOP.equals(other.cMNHLKGFKOP)); + return true; } @Override public void writeTo(final ProtoSink output) throws IOException { - if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 50); - output.writeMessageNoTag(jNAGMIALOII); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 106); - output.writeMessageNoTag(queryInfo); - } - if ((bitField0_ & 0x00000004) != 0) { - for (int i = 0; i < pHJAFGJHOCO.length(); i++) { - output.writeRawByte((byte) 56); - output.writeUInt32NoTag(pHJAFGJHOCO.array()[i]); - } - } - if ((bitField0_ & 0x00000008) != 0) { - for (int i = 0; i < cMNHLKGFKOP.length(); i++) { - output.writeRawByte((byte) 64); - output.writeUInt32NoTag(cMNHLKGFKOP.array()[i]); - } - } } @Override protected int computeSerializedSize() { int size = 0; - if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(jNAGMIALOII); - } - if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(queryInfo); - } - if ((bitField0_ & 0x00000004) != 0) { - size += (1 * pHJAFGJHOCO.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(pHJAFGJHOCO); - } - if ((bitField0_ & 0x00000008) != 0) { - size += (1 * cMNHLKGFKOP.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(cMNHLKGFKOP); - } return size; } @@ -475,42 +107,6 @@ public ChessRogueNousQueryInfo mergeFrom(final ProtoSource input) throws IOExcep int tag = input.readTag(); while (true) { switch (tag) { - case 50: { - // jNAGMIALOII - input.readMessage(jNAGMIALOII); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 106) { - break; - } - } - case 106: { - // queryInfo - input.readMessage(queryInfo); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 58) { - break; - } - } - case 58: { - // pHJAFGJHOCO [packed=true] - input.readPackedUInt32(pHJAFGJHOCO, tag); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 66) { - break; - } - } - case 66: { - // cMNHLKGFKOP [packed=true] - input.readPackedUInt32(cMNHLKGFKOP, tag); - bitField0_ |= 0x00000008; - tag = input.readTag(); - if (tag != 0) { - break; - } - } case 0: { return this; } @@ -521,18 +117,6 @@ public ChessRogueNousQueryInfo mergeFrom(final ProtoSource input) throws IOExcep tag = input.readTag(); break; } - case 56: { - // pHJAFGJHOCO [packed=false] - tag = input.readRepeatedUInt32(pHJAFGJHOCO, tag); - bitField0_ |= 0x00000004; - break; - } - case 64: { - // cMNHLKGFKOP [packed=false] - tag = input.readRepeatedUInt32(cMNHLKGFKOP, tag); - bitField0_ |= 0x00000008; - break; - } } } } @@ -540,18 +124,6 @@ public ChessRogueNousQueryInfo mergeFrom(final ProtoSource input) throws IOExcep @Override public void writeTo(final JsonSink output) throws IOException { output.beginObject(); - if ((bitField0_ & 0x00000001) != 0) { - output.writeMessage(FieldNames.jNAGMIALOII, jNAGMIALOII); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeMessage(FieldNames.queryInfo, queryInfo); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRepeatedUInt32(FieldNames.pHJAFGJHOCO, pHJAFGJHOCO); - } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRepeatedUInt32(FieldNames.cMNHLKGFKOP, cMNHLKGFKOP); - } output.endObject(); } @@ -562,51 +134,6 @@ public ChessRogueNousQueryInfo mergeFrom(final JsonSource input) throws IOExcept } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1457066462: { - if (input.isAtField(FieldNames.jNAGMIALOII)) { - if (!input.trySkipNullValue()) { - input.readMessage(jNAGMIALOII); - bitField0_ |= 0x00000001; - } - } else { - input.skipUnknownField(); - } - break; - } - case -1807200874: - case -168476219: { - if (input.isAtField(FieldNames.queryInfo)) { - if (!input.trySkipNullValue()) { - input.readMessage(queryInfo); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } - case 1818568397: { - if (input.isAtField(FieldNames.pHJAFGJHOCO)) { - if (!input.trySkipNullValue()) { - input.readRepeatedUInt32(pHJAFGJHOCO); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } - case 243189738: { - if (input.isAtField(FieldNames.cMNHLKGFKOP)) { - if (!input.trySkipNullValue()) { - input.readRepeatedUInt32(cMNHLKGFKOP); - bitField0_ |= 0x00000008; - } - } else { - input.skipUnknownField(); - } - break; - } default: { input.skipUnknownField(); break; @@ -660,13 +187,6 @@ public ChessRogueNousQueryInfo create() { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName jNAGMIALOII = FieldName.forField("JNAGMIALOII"); - - static final FieldName queryInfo = FieldName.forField("queryInfo", "query_info"); - - static final FieldName pHJAFGJHOCO = FieldName.forField("PHJAFGJHOCO"); - - static final FieldName cMNHLKGFKOP = FieldName.forField("CMNHLKGFKOP"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/ChessRoguePhaseOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChessRoguePhaseOuterClass.java deleted file mode 100644 index d49a3e557..000000000 --- a/src/generated/main/emu/lunarcore/proto/ChessRoguePhaseOuterClass.java +++ /dev/null @@ -1,130 +0,0 @@ -// Code generated by protocol buffer compiler. Do not edit! -package emu.lunarcore.proto; - -import us.hebi.quickbuf.ProtoEnum; -import us.hebi.quickbuf.ProtoUtil; - -public final class ChessRoguePhaseOuterClass { - /** - * Protobuf enum {@code ChessRoguePhase} - */ - public enum ChessRoguePhase implements ProtoEnum { - /** - * NONE = 0; - */ - NONE("NONE", 0), - - /** - * PHASE_ONE = 1; - */ - PHASE_ONE("PHASE_ONE", 1), - - /** - * PHASE_TWO = 2; - */ - PHASE_TWO("PHASE_TWO", 2); - - /** - * NONE = 0; - */ - public static final int NONE_VALUE = 0; - - /** - * PHASE_ONE = 1; - */ - public static final int PHASE_ONE_VALUE = 1; - - /** - * PHASE_TWO = 2; - */ - public static final int PHASE_TWO_VALUE = 2; - - private final String name; - - private final int number; - - private ChessRoguePhase(String name, int number) { - this.name = name; - this.number = number; - } - - /** - * @return the string representation of enum entry - */ - @Override - public String getName() { - return name; - } - - /** - * @return the numeric wire value of this enum entry - */ - @Override - public int getNumber() { - return number; - } - - /** - * @return a converter that maps between this enum's numeric and text representations - */ - public static ProtoEnum.EnumConverter converter() { - return ChessRoguePhaseConverter.INSTANCE; - } - - /** - * @param value The numeric wire value of the corresponding enum entry. - * @return The enum associated with the given numeric wire value, or null if unknown. - */ - public static ChessRoguePhase forNumber(int value) { - return ChessRoguePhaseConverter.INSTANCE.forNumber(value); - } - - /** - * @param value The numeric wire value of the corresponding enum entry. - * @param other Fallback value in case the value is not known. - * @return The enum associated with the given numeric wire value, or the fallback value if unknown. - */ - public static ChessRoguePhase forNumberOr(int number, ChessRoguePhase other) { - ChessRoguePhase value = forNumber(number); - return value == null ? other : value; - } - - enum ChessRoguePhaseConverter implements ProtoEnum.EnumConverter { - INSTANCE; - - private static final ChessRoguePhase[] lookup = new ChessRoguePhase[3]; - - static { - lookup[0] = NONE; - lookup[1] = PHASE_ONE; - lookup[2] = PHASE_TWO; - } - - @Override - public final ChessRoguePhase forNumber(final int value) { - if (value >= 0 && value < lookup.length) { - return lookup[value]; - } - return null; - } - - @Override - public final ChessRoguePhase forName(final CharSequence value) { - if (value.length() == 4) { - if (ProtoUtil.isEqual("NONE", value)) { - return NONE; - } - } - if (value.length() == 9) { - if (ProtoUtil.isEqual("PHASE_ONE", value)) { - return PHASE_ONE; - } - if (ProtoUtil.isEqual("PHASE_TWO", value)) { - return PHASE_TWO; - } - } - return null; - } - } - } -} diff --git a/src/generated/main/emu/lunarcore/proto/ChessRogueQueryInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChessRogueQueryInfoOuterClass.java deleted file mode 100644 index 544f715d7..000000000 --- a/src/generated/main/emu/lunarcore/proto/ChessRogueQueryInfoOuterClass.java +++ /dev/null @@ -1,686 +0,0 @@ -// Code generated by protocol buffer compiler. Do not edit! -package emu.lunarcore.proto; - -import java.io.IOException; -import us.hebi.quickbuf.FieldName; -import us.hebi.quickbuf.InvalidProtocolBufferException; -import us.hebi.quickbuf.JsonSink; -import us.hebi.quickbuf.JsonSource; -import us.hebi.quickbuf.MessageFactory; -import us.hebi.quickbuf.ProtoMessage; -import us.hebi.quickbuf.ProtoSink; -import us.hebi.quickbuf.ProtoSource; -import us.hebi.quickbuf.RepeatedInt; - -public final class ChessRogueQueryInfoOuterClass { - /** - * Protobuf type {@code ChessRogueQueryInfo} - */ - public static final class ChessRogueQueryInfo extends ProtoMessage implements Cloneable { - private static final long serialVersionUID = 0L; - - /** - * optional .OFHBFINPHAG JNAGMIALOII = 3; - */ - private final OFHBFINPHAGOuterClass.OFHBFINPHAG jNAGMIALOII = OFHBFINPHAGOuterClass.OFHBFINPHAG.newInstance(); - - /** - * optional .ChessRogueQuery query_info = 14; - */ - private final ChessRogueQueryOuterClass.ChessRogueQuery queryInfo = ChessRogueQueryOuterClass.ChessRogueQuery.newInstance(); - - /** - * 
-     * MAKPHMAOCHI talent_info = 11;
-     *
- * - * repeated uint32 CMNHLKGFKOP = 4; - */ - private final RepeatedInt cMNHLKGFKOP = RepeatedInt.newEmptyInstance(); - - /** - * 
-     * CGAPFPHEJIA EEFGNNFCDNJ = 6;
-     * CLIDPGPDFGK IKGPADCBBPN = 9;
-     *
- * - * repeated uint32 PHJAFGJHOCO = 8; - */ - private final RepeatedInt pHJAFGJHOCO = RepeatedInt.newEmptyInstance(); - - private ChessRogueQueryInfo() { - } - - /** - * @return a new empty instance of {@code ChessRogueQueryInfo} - */ - public static ChessRogueQueryInfo newInstance() { - return new ChessRogueQueryInfo(); - } - - /** - * optional .OFHBFINPHAG JNAGMIALOII = 3; - * @return whether the jNAGMIALOII field is set - */ - public boolean hasJNAGMIALOII() { - return (bitField0_ & 0x00000001) != 0; - } - - /** - * optional .OFHBFINPHAG JNAGMIALOII = 3; - * @return this - */ - public ChessRogueQueryInfo clearJNAGMIALOII() { - bitField0_ &= ~0x00000001; - jNAGMIALOII.clear(); - return this; - } - - /** - * optional .OFHBFINPHAG JNAGMIALOII = 3; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * Use {@link #getMutableJNAGMIALOII()} if you want to modify it. - * - * @return internal storage object for reading - */ - public OFHBFINPHAGOuterClass.OFHBFINPHAG getJNAGMIALOII() { - return jNAGMIALOII; - } - - /** - * optional .OFHBFINPHAG JNAGMIALOII = 3; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public OFHBFINPHAGOuterClass.OFHBFINPHAG getMutableJNAGMIALOII() { - bitField0_ |= 0x00000001; - return jNAGMIALOII; - } - - /** - * optional .OFHBFINPHAG JNAGMIALOII = 3; - * @param value the jNAGMIALOII to set - * @return this - */ - public ChessRogueQueryInfo setJNAGMIALOII(final OFHBFINPHAGOuterClass.OFHBFINPHAG value) { - bitField0_ |= 0x00000001; - jNAGMIALOII.copyFrom(value); - return this; - } - - /** - * optional .ChessRogueQuery query_info = 14; - * @return whether the queryInfo field is set - */ - public boolean hasQueryInfo() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional .ChessRogueQuery query_info = 14; - * @return this - */ - public ChessRogueQueryInfo clearQueryInfo() { - bitField0_ &= ~0x00000002; - queryInfo.clear(); - return this; - } - - /** - * optional .ChessRogueQuery query_info = 14; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * Use {@link #getMutableQueryInfo()} if you want to modify it. - * - * @return internal storage object for reading - */ - public ChessRogueQueryOuterClass.ChessRogueQuery getQueryInfo() { - return queryInfo; - } - - /** - * optional .ChessRogueQuery query_info = 14; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public ChessRogueQueryOuterClass.ChessRogueQuery getMutableQueryInfo() { - bitField0_ |= 0x00000002; - return queryInfo; - } - - /** - * optional .ChessRogueQuery query_info = 14; - * @param value the queryInfo to set - * @return this - */ - public ChessRogueQueryInfo setQueryInfo(final ChessRogueQueryOuterClass.ChessRogueQuery value) { - bitField0_ |= 0x00000002; - queryInfo.copyFrom(value); - return this; - } - - /** - * 
-     * MAKPHMAOCHI talent_info = 11;
-     *
- * - * repeated uint32 CMNHLKGFKOP = 4; - * @return whether the cMNHLKGFKOP field is set - */ - public boolean hasCMNHLKGFKOP() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * 
-     * MAKPHMAOCHI talent_info = 11;
-     *
- * - * repeated uint32 CMNHLKGFKOP = 4; - * @return this - */ - public ChessRogueQueryInfo clearCMNHLKGFKOP() { - bitField0_ &= ~0x00000004; - cMNHLKGFKOP.clear(); - return this; - } - - /** - * 
-     * MAKPHMAOCHI talent_info = 11;
-     *
- * - * repeated uint32 CMNHLKGFKOP = 4; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * Use {@link #getMutableCMNHLKGFKOP()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedInt getCMNHLKGFKOP() { - return cMNHLKGFKOP; - } - - /** - * 
-     * MAKPHMAOCHI talent_info = 11;
-     *
- * - * repeated uint32 CMNHLKGFKOP = 4; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public RepeatedInt getMutableCMNHLKGFKOP() { - bitField0_ |= 0x00000004; - return cMNHLKGFKOP; - } - - /** - * 
-     * MAKPHMAOCHI talent_info = 11;
-     *
- * - * repeated uint32 CMNHLKGFKOP = 4; - * @param value the cMNHLKGFKOP to add - * @return this - */ - public ChessRogueQueryInfo addCMNHLKGFKOP(final int value) { - bitField0_ |= 0x00000004; - cMNHLKGFKOP.add(value); - return this; - } - - /** - * 
-     * MAKPHMAOCHI talent_info = 11;
-     *
- * - * repeated uint32 CMNHLKGFKOP = 4; - * @param values the cMNHLKGFKOP to add - * @return this - */ - public ChessRogueQueryInfo addAllCMNHLKGFKOP(final int... values) { - bitField0_ |= 0x00000004; - cMNHLKGFKOP.addAll(values); - return this; - } - - /** - * 
-     * CGAPFPHEJIA EEFGNNFCDNJ = 6;
-     * CLIDPGPDFGK IKGPADCBBPN = 9;
-     *
- * - * repeated uint32 PHJAFGJHOCO = 8; - * @return whether the pHJAFGJHOCO field is set - */ - public boolean hasPHJAFGJHOCO() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * 
-     * CGAPFPHEJIA EEFGNNFCDNJ = 6;
-     * CLIDPGPDFGK IKGPADCBBPN = 9;
-     *
- * - * repeated uint32 PHJAFGJHOCO = 8; - * @return this - */ - public ChessRogueQueryInfo clearPHJAFGJHOCO() { - bitField0_ &= ~0x00000008; - pHJAFGJHOCO.clear(); - return this; - } - - /** - * 
-     * CGAPFPHEJIA EEFGNNFCDNJ = 6;
-     * CLIDPGPDFGK IKGPADCBBPN = 9;
-     *
- * - * repeated uint32 PHJAFGJHOCO = 8; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * Use {@link #getMutablePHJAFGJHOCO()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedInt getPHJAFGJHOCO() { - return pHJAFGJHOCO; - } - - /** - * 
-     * CGAPFPHEJIA EEFGNNFCDNJ = 6;
-     * CLIDPGPDFGK IKGPADCBBPN = 9;
-     *
- * - * repeated uint32 PHJAFGJHOCO = 8; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public RepeatedInt getMutablePHJAFGJHOCO() { - bitField0_ |= 0x00000008; - return pHJAFGJHOCO; - } - - /** - * 
-     * CGAPFPHEJIA EEFGNNFCDNJ = 6;
-     * CLIDPGPDFGK IKGPADCBBPN = 9;
-     *
- * - * repeated uint32 PHJAFGJHOCO = 8; - * @param value the pHJAFGJHOCO to add - * @return this - */ - public ChessRogueQueryInfo addPHJAFGJHOCO(final int value) { - bitField0_ |= 0x00000008; - pHJAFGJHOCO.add(value); - return this; - } - - /** - * 
-     * CGAPFPHEJIA EEFGNNFCDNJ = 6;
-     * CLIDPGPDFGK IKGPADCBBPN = 9;
-     *
- * - * repeated uint32 PHJAFGJHOCO = 8; - * @param values the pHJAFGJHOCO to add - * @return this - */ - public ChessRogueQueryInfo addAllPHJAFGJHOCO(final int... values) { - bitField0_ |= 0x00000008; - pHJAFGJHOCO.addAll(values); - return this; - } - - @Override - public ChessRogueQueryInfo copyFrom(final ChessRogueQueryInfo other) { - cachedSize = other.cachedSize; - if ((bitField0_ | other.bitField0_) != 0) { - bitField0_ = other.bitField0_; - jNAGMIALOII.copyFrom(other.jNAGMIALOII); - queryInfo.copyFrom(other.queryInfo); - cMNHLKGFKOP.copyFrom(other.cMNHLKGFKOP); - pHJAFGJHOCO.copyFrom(other.pHJAFGJHOCO); - } - return this; - } - - @Override - public ChessRogueQueryInfo mergeFrom(final ChessRogueQueryInfo other) { - if (other.isEmpty()) { - return this; - } - cachedSize = -1; - if (other.hasJNAGMIALOII()) { - getMutableJNAGMIALOII().mergeFrom(other.jNAGMIALOII); - } - if (other.hasQueryInfo()) { - getMutableQueryInfo().mergeFrom(other.queryInfo); - } - if (other.hasCMNHLKGFKOP()) { - getMutableCMNHLKGFKOP().addAll(other.cMNHLKGFKOP); - } - if (other.hasPHJAFGJHOCO()) { - getMutablePHJAFGJHOCO().addAll(other.pHJAFGJHOCO); - } - return this; - } - - @Override - public ChessRogueQueryInfo clear() { - if (isEmpty()) { - return this; - } - cachedSize = -1; - bitField0_ = 0; - jNAGMIALOII.clear(); - queryInfo.clear(); - cMNHLKGFKOP.clear(); - pHJAFGJHOCO.clear(); - return this; - } - - @Override - public ChessRogueQueryInfo clearQuick() { - if (isEmpty()) { - return this; - } - cachedSize = -1; - bitField0_ = 0; - jNAGMIALOII.clearQuick(); - queryInfo.clearQuick(); - cMNHLKGFKOP.clear(); - pHJAFGJHOCO.clear(); - return this; - } - - @Override - public boolean equals(Object o) { - if (o == this) { - return true; - } - if (!(o instanceof ChessRogueQueryInfo)) { - return false; - } - ChessRogueQueryInfo other = (ChessRogueQueryInfo) o; - return bitField0_ == other.bitField0_ - && (!hasJNAGMIALOII() || jNAGMIALOII.equals(other.jNAGMIALOII)) - && (!hasQueryInfo() || queryInfo.equals(other.queryInfo)) - && (!hasCMNHLKGFKOP() || cMNHLKGFKOP.equals(other.cMNHLKGFKOP)) - && (!hasPHJAFGJHOCO() || pHJAFGJHOCO.equals(other.pHJAFGJHOCO)); - } - - @Override - public void writeTo(final ProtoSink output) throws IOException { - if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 26); - output.writeMessageNoTag(jNAGMIALOII); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 114); - output.writeMessageNoTag(queryInfo); - } - if ((bitField0_ & 0x00000004) != 0) { - for (int i = 0; i < cMNHLKGFKOP.length(); i++) { - output.writeRawByte((byte) 32); - output.writeUInt32NoTag(cMNHLKGFKOP.array()[i]); - } - } - if ((bitField0_ & 0x00000008) != 0) { - for (int i = 0; i < pHJAFGJHOCO.length(); i++) { - output.writeRawByte((byte) 64); - output.writeUInt32NoTag(pHJAFGJHOCO.array()[i]); - } - } - } - - @Override - protected int computeSerializedSize() { - int size = 0; - if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(jNAGMIALOII); - } - if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(queryInfo); - } - if ((bitField0_ & 0x00000004) != 0) { - size += (1 * cMNHLKGFKOP.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(cMNHLKGFKOP); - } - if ((bitField0_ & 0x00000008) != 0) { - size += (1 * pHJAFGJHOCO.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(pHJAFGJHOCO); - } - return size; - } - - @Override - @SuppressWarnings("fallthrough") - public ChessRogueQueryInfo mergeFrom(final ProtoSource input) throws IOException { - // Enabled Fall-Through Optimization (QuickBuffers) - int tag = input.readTag(); - while (true) { - switch (tag) { - case 26: { - // jNAGMIALOII - input.readMessage(jNAGMIALOII); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 114) { - break; - } - } - case 114: { - // queryInfo - input.readMessage(queryInfo); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 34) { - break; - } - } - case 34: { - // cMNHLKGFKOP [packed=true] - input.readPackedUInt32(cMNHLKGFKOP, tag); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 66) { - break; - } - } - case 66: { - // pHJAFGJHOCO [packed=true] - input.readPackedUInt32(pHJAFGJHOCO, tag); - bitField0_ |= 0x00000008; - tag = input.readTag(); - if (tag != 0) { - break; - } - } - case 0: { - return this; - } - default: { - if (!input.skipField(tag)) { - return this; - } - tag = input.readTag(); - break; - } - case 32: { - // cMNHLKGFKOP [packed=false] - tag = input.readRepeatedUInt32(cMNHLKGFKOP, tag); - bitField0_ |= 0x00000004; - break; - } - case 64: { - // pHJAFGJHOCO [packed=false] - tag = input.readRepeatedUInt32(pHJAFGJHOCO, tag); - bitField0_ |= 0x00000008; - break; - } - } - } - } - - @Override - public void writeTo(final JsonSink output) throws IOException { - output.beginObject(); - if ((bitField0_ & 0x00000001) != 0) { - output.writeMessage(FieldNames.jNAGMIALOII, jNAGMIALOII); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeMessage(FieldNames.queryInfo, queryInfo); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRepeatedUInt32(FieldNames.cMNHLKGFKOP, cMNHLKGFKOP); - } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRepeatedUInt32(FieldNames.pHJAFGJHOCO, pHJAFGJHOCO); - } - output.endObject(); - } - - @Override - public ChessRogueQueryInfo mergeFrom(final JsonSource input) throws IOException { - if (!input.beginObject()) { - return this; - } - while (!input.isAtEnd()) { - switch (input.readFieldHash()) { - case 1457066462: { - if (input.isAtField(FieldNames.jNAGMIALOII)) { - if (!input.trySkipNullValue()) { - input.readMessage(jNAGMIALOII); - bitField0_ |= 0x00000001; - } - } else { - input.skipUnknownField(); - } - break; - } - case -1807200874: - case -168476219: { - if (input.isAtField(FieldNames.queryInfo)) { - if (!input.trySkipNullValue()) { - input.readMessage(queryInfo); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } - case 243189738: { - if (input.isAtField(FieldNames.cMNHLKGFKOP)) { - if (!input.trySkipNullValue()) { - input.readRepeatedUInt32(cMNHLKGFKOP); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } - case 1818568397: { - if (input.isAtField(FieldNames.pHJAFGJHOCO)) { - if (!input.trySkipNullValue()) { - input.readRepeatedUInt32(pHJAFGJHOCO); - bitField0_ |= 0x00000008; - } - } else { - input.skipUnknownField(); - } - break; - } - default: { - input.skipUnknownField(); - break; - } - } - } - input.endObject(); - return this; - } - - @Override - public ChessRogueQueryInfo clone() { - return new ChessRogueQueryInfo().copyFrom(this); - } - - @Override - public boolean isEmpty() { - return ((bitField0_) == 0); - } - - public static ChessRogueQueryInfo parseFrom(final byte[] data) throws - InvalidProtocolBufferException { - return ProtoMessage.mergeFrom(new ChessRogueQueryInfo(), data).checkInitialized(); - } - - public static ChessRogueQueryInfo parseFrom(final ProtoSource input) throws IOException { - return ProtoMessage.mergeFrom(new ChessRogueQueryInfo(), input).checkInitialized(); - } - - public static ChessRogueQueryInfo parseFrom(final JsonSource input) throws IOException { - return ProtoMessage.mergeFrom(new ChessRogueQueryInfo(), input).checkInitialized(); - } - - /** - * @return factory for creating ChessRogueQueryInfo messages - */ - public static MessageFactory getFactory() { - return ChessRogueQueryInfoFactory.INSTANCE; - } - - private enum ChessRogueQueryInfoFactory implements MessageFactory { - INSTANCE; - - @Override - public ChessRogueQueryInfo create() { - return ChessRogueQueryInfo.newInstance(); - } - } - - /** - * Contains name constants used for serializing JSON - */ - static class FieldNames { - static final FieldName jNAGMIALOII = FieldName.forField("JNAGMIALOII"); - - static final FieldName queryInfo = FieldName.forField("queryInfo", "query_info"); - - static final FieldName cMNHLKGFKOP = FieldName.forField("CMNHLKGFKOP"); - - static final FieldName pHJAFGJHOCO = FieldName.forField("PHJAFGJHOCO"); - } - } -} diff --git a/src/generated/main/emu/lunarcore/proto/ChessRogueQueryOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChessRogueQueryOuterClass.java deleted file mode 100644 index 725284c98..000000000 --- a/src/generated/main/emu/lunarcore/proto/ChessRogueQueryOuterClass.java +++ /dev/null @@ -1,970 +0,0 @@ -// Code generated by protocol buffer compiler. Do not edit! -package emu.lunarcore.proto; - -import java.io.IOException; -import us.hebi.quickbuf.FieldName; -import us.hebi.quickbuf.InvalidProtocolBufferException; -import us.hebi.quickbuf.JsonSink; -import us.hebi.quickbuf.JsonSource; -import us.hebi.quickbuf.MessageFactory; -import us.hebi.quickbuf.ProtoMessage; -import us.hebi.quickbuf.ProtoSink; -import us.hebi.quickbuf.ProtoSource; -import us.hebi.quickbuf.RepeatedInt; -import us.hebi.quickbuf.RepeatedMessage; - -public final class ChessRogueQueryOuterClass { - /** - * Protobuf type {@code ChessRogueQuery} - */ - public static final class ChessRogueQuery extends ProtoMessage implements Cloneable { - private static final long serialVersionUID = 0L; - - /** - * optional .ChessRoguePhase phase = 10; - */ - private int phase; - - /** - * repeated uint32 main_story_id = 8; - */ - private final RepeatedInt mainStoryId = RepeatedInt.newEmptyInstance(); - - /** - * repeated .ChessRogueQuery.EKLAFMBHNIPEntry EKLAFMBHNIP = 6; - */ - private final RepeatedMessage eKLAFMBHNIP = RepeatedMessage.newEmptyInstance(EKLAFMBHNIPEntry.getFactory()); - - /** - * repeated .ChessRogueNousDiceInfo dice_info = 12; - */ - private final RepeatedMessage diceInfo = RepeatedMessage.newEmptyInstance(ChessRogueNousDiceInfoOuterClass.ChessRogueNousDiceInfo.getFactory()); - - private ChessRogueQuery() { - } - - /** - * @return a new empty instance of {@code ChessRogueQuery} - */ - public static ChessRogueQuery newInstance() { - return new ChessRogueQuery(); - } - - /** - * optional .ChessRoguePhase phase = 10; - * @return whether the phase field is set - */ - public boolean hasPhase() { - return (bitField0_ & 0x00000001) != 0; - } - - /** - * optional .ChessRoguePhase phase = 10; - * @return this - */ - public ChessRogueQuery clearPhase() { - bitField0_ &= ~0x00000001; - phase = 0; - return this; - } - - /** - * optional .ChessRoguePhase phase = 10; - * @return the phase - */ - public ChessRoguePhaseOuterClass.ChessRoguePhase getPhase() { - return ChessRoguePhaseOuterClass.ChessRoguePhase.forNumber(phase); - } - - /** - * Gets the value of the internal enum store. The result is - * equivalent to {@link ChessRogueQuery#getPhase()}.getNumber(). - * - * @return numeric wire representation - */ - public int getPhaseValue() { - return phase; - } - - /** - * Sets the value of the internal enum store. This does not - * do any validity checks, so be sure to use appropriate value - * constants from {@link ChessRoguePhaseOuterClass.ChessRoguePhase}. Setting an invalid value - * can cause {@link ChessRogueQuery#getPhase()} to return null - * - * @param value the numeric wire value to set - * @return this - */ - public ChessRogueQuery setPhaseValue(final int value) { - bitField0_ |= 0x00000001; - phase = value; - return this; - } - - /** - * optional .ChessRoguePhase phase = 10; - * @param value the phase to set - * @return this - */ - public ChessRogueQuery setPhase(final ChessRoguePhaseOuterClass.ChessRoguePhase value) { - bitField0_ |= 0x00000001; - phase = value.getNumber(); - return this; - } - - /** - * repeated uint32 main_story_id = 8; - * @return whether the mainStoryId field is set - */ - public boolean hasMainStoryId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * repeated uint32 main_story_id = 8; - * @return this - */ - public ChessRogueQuery clearMainStoryId() { - bitField0_ &= ~0x00000002; - mainStoryId.clear(); - return this; - } - - /** - * repeated uint32 main_story_id = 8; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * Use {@link #getMutableMainStoryId()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedInt getMainStoryId() { - return mainStoryId; - } - - /** - * repeated uint32 main_story_id = 8; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public RepeatedInt getMutableMainStoryId() { - bitField0_ |= 0x00000002; - return mainStoryId; - } - - /** - * repeated uint32 main_story_id = 8; - * @param value the mainStoryId to add - * @return this - */ - public ChessRogueQuery addMainStoryId(final int value) { - bitField0_ |= 0x00000002; - mainStoryId.add(value); - return this; - } - - /** - * repeated uint32 main_story_id = 8; - * @param values the mainStoryId to add - * @return this - */ - public ChessRogueQuery addAllMainStoryId(final int... values) { - bitField0_ |= 0x00000002; - mainStoryId.addAll(values); - return this; - } - - /** - * repeated .ChessRogueQuery.EKLAFMBHNIPEntry EKLAFMBHNIP = 6; - * @return whether the eKLAFMBHNIP field is set - */ - public boolean hasEKLAFMBHNIP() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * repeated .ChessRogueQuery.EKLAFMBHNIPEntry EKLAFMBHNIP = 6; - * @return this - */ - public ChessRogueQuery clearEKLAFMBHNIP() { - bitField0_ &= ~0x00000004; - eKLAFMBHNIP.clear(); - return this; - } - - /** - * repeated .ChessRogueQuery.EKLAFMBHNIPEntry EKLAFMBHNIP = 6; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * Use {@link #getMutableEKLAFMBHNIP()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedMessage getEKLAFMBHNIP() { - return eKLAFMBHNIP; - } - - /** - * repeated .ChessRogueQuery.EKLAFMBHNIPEntry EKLAFMBHNIP = 6; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public RepeatedMessage getMutableEKLAFMBHNIP() { - bitField0_ |= 0x00000004; - return eKLAFMBHNIP; - } - - /** - * repeated .ChessRogueQuery.EKLAFMBHNIPEntry EKLAFMBHNIP = 6; - * @param value the eKLAFMBHNIP to add - * @return this - */ - public ChessRogueQuery addEKLAFMBHNIP(final EKLAFMBHNIPEntry value) { - bitField0_ |= 0x00000004; - eKLAFMBHNIP.add(value); - return this; - } - - /** - * repeated .ChessRogueQuery.EKLAFMBHNIPEntry EKLAFMBHNIP = 6; - * @param values the eKLAFMBHNIP to add - * @return this - */ - public ChessRogueQuery addAllEKLAFMBHNIP(final EKLAFMBHNIPEntry... values) { - bitField0_ |= 0x00000004; - eKLAFMBHNIP.addAll(values); - return this; - } - - /** - * repeated .ChessRogueNousDiceInfo dice_info = 12; - * @return whether the diceInfo field is set - */ - public boolean hasDiceInfo() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * repeated .ChessRogueNousDiceInfo dice_info = 12; - * @return this - */ - public ChessRogueQuery clearDiceInfo() { - bitField0_ &= ~0x00000008; - diceInfo.clear(); - return this; - } - - /** - * repeated .ChessRogueNousDiceInfo dice_info = 12; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * Use {@link #getMutableDiceInfo()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedMessage getDiceInfo() { - return diceInfo; - } - - /** - * repeated .ChessRogueNousDiceInfo dice_info = 12; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public RepeatedMessage getMutableDiceInfo( - ) { - bitField0_ |= 0x00000008; - return diceInfo; - } - - /** - * repeated .ChessRogueNousDiceInfo dice_info = 12; - * @param value the diceInfo to add - * @return this - */ - public ChessRogueQuery addDiceInfo( - final ChessRogueNousDiceInfoOuterClass.ChessRogueNousDiceInfo value) { - bitField0_ |= 0x00000008; - diceInfo.add(value); - return this; - } - - /** - * repeated .ChessRogueNousDiceInfo dice_info = 12; - * @param values the diceInfo to add - * @return this - */ - public ChessRogueQuery addAllDiceInfo( - final ChessRogueNousDiceInfoOuterClass.ChessRogueNousDiceInfo... values) { - bitField0_ |= 0x00000008; - diceInfo.addAll(values); - return this; - } - - @Override - public ChessRogueQuery copyFrom(final ChessRogueQuery other) { - cachedSize = other.cachedSize; - if ((bitField0_ | other.bitField0_) != 0) { - bitField0_ = other.bitField0_; - phase = other.phase; - mainStoryId.copyFrom(other.mainStoryId); - eKLAFMBHNIP.copyFrom(other.eKLAFMBHNIP); - diceInfo.copyFrom(other.diceInfo); - } - return this; - } - - @Override - public ChessRogueQuery mergeFrom(final ChessRogueQuery other) { - if (other.isEmpty()) { - return this; - } - cachedSize = -1; - if (other.hasPhase()) { - setPhaseValue(other.phase); - } - if (other.hasMainStoryId()) { - getMutableMainStoryId().addAll(other.mainStoryId); - } - if (other.hasEKLAFMBHNIP()) { - getMutableEKLAFMBHNIP().addAll(other.eKLAFMBHNIP); - } - if (other.hasDiceInfo()) { - getMutableDiceInfo().addAll(other.diceInfo); - } - return this; - } - - @Override - public ChessRogueQuery clear() { - if (isEmpty()) { - return this; - } - cachedSize = -1; - bitField0_ = 0; - phase = 0; - mainStoryId.clear(); - eKLAFMBHNIP.clear(); - diceInfo.clear(); - return this; - } - - @Override - public ChessRogueQuery clearQuick() { - if (isEmpty()) { - return this; - } - cachedSize = -1; - bitField0_ = 0; - mainStoryId.clear(); - eKLAFMBHNIP.clearQuick(); - diceInfo.clearQuick(); - return this; - } - - @Override - public boolean equals(Object o) { - if (o == this) { - return true; - } - if (!(o instanceof ChessRogueQuery)) { - return false; - } - ChessRogueQuery other = (ChessRogueQuery) o; - return bitField0_ == other.bitField0_ - && (!hasPhase() || phase == other.phase) - && (!hasMainStoryId() || mainStoryId.equals(other.mainStoryId)) - && (!hasEKLAFMBHNIP() || eKLAFMBHNIP.equals(other.eKLAFMBHNIP)) - && (!hasDiceInfo() || diceInfo.equals(other.diceInfo)); - } - - @Override - public void writeTo(final ProtoSink output) throws IOException { - if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 80); - output.writeEnumNoTag(phase); - } - if ((bitField0_ & 0x00000002) != 0) { - for (int i = 0; i < mainStoryId.length(); i++) { - output.writeRawByte((byte) 64); - output.writeUInt32NoTag(mainStoryId.array()[i]); - } - } - if ((bitField0_ & 0x00000004) != 0) { - for (int i = 0; i < eKLAFMBHNIP.length(); i++) { - output.writeRawByte((byte) 50); - output.writeMessageNoTag(eKLAFMBHNIP.get(i)); - } - } - if ((bitField0_ & 0x00000008) != 0) { - for (int i = 0; i < diceInfo.length(); i++) { - output.writeRawByte((byte) 98); - output.writeMessageNoTag(diceInfo.get(i)); - } - } - } - - @Override - protected int computeSerializedSize() { - int size = 0; - if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeEnumSizeNoTag(phase); - } - if ((bitField0_ & 0x00000002) != 0) { - size += (1 * mainStoryId.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(mainStoryId); - } - if ((bitField0_ & 0x00000004) != 0) { - size += (1 * eKLAFMBHNIP.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(eKLAFMBHNIP); - } - if ((bitField0_ & 0x00000008) != 0) { - size += (1 * diceInfo.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(diceInfo); - } - return size; - } - - @Override - @SuppressWarnings("fallthrough") - public ChessRogueQuery mergeFrom(final ProtoSource input) throws IOException { - // Enabled Fall-Through Optimization (QuickBuffers) - int tag = input.readTag(); - while (true) { - switch (tag) { - case 80: { - // phase - final int value = input.readInt32(); - if (ChessRoguePhaseOuterClass.ChessRoguePhase.forNumber(value) != null) { - phase = value; - bitField0_ |= 0x00000001; - } - tag = input.readTag(); - if (tag != 66) { - break; - } - } - case 66: { - // mainStoryId [packed=true] - input.readPackedUInt32(mainStoryId, tag); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 50) { - break; - } - } - case 50: { - // eKLAFMBHNIP - tag = input.readRepeatedMessage(eKLAFMBHNIP, tag); - bitField0_ |= 0x00000004; - if (tag != 98) { - break; - } - } - case 98: { - // diceInfo - tag = input.readRepeatedMessage(diceInfo, tag); - bitField0_ |= 0x00000008; - if (tag != 0) { - break; - } - } - case 0: { - return this; - } - default: { - if (!input.skipField(tag)) { - return this; - } - tag = input.readTag(); - break; - } - case 64: { - // mainStoryId [packed=false] - tag = input.readRepeatedUInt32(mainStoryId, tag); - bitField0_ |= 0x00000002; - break; - } - } - } - } - - @Override - public void writeTo(final JsonSink output) throws IOException { - output.beginObject(); - if ((bitField0_ & 0x00000001) != 0) { - output.writeEnum(FieldNames.phase, phase, ChessRoguePhaseOuterClass.ChessRoguePhase.converter()); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRepeatedUInt32(FieldNames.mainStoryId, mainStoryId); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRepeatedMessage(FieldNames.eKLAFMBHNIP, eKLAFMBHNIP); - } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRepeatedMessage(FieldNames.diceInfo, diceInfo); - } - output.endObject(); - } - - @Override - public ChessRogueQuery mergeFrom(final JsonSource input) throws IOException { - if (!input.beginObject()) { - return this; - } - while (!input.isAtEnd()) { - switch (input.readFieldHash()) { - case 106629499: { - if (input.isAtField(FieldNames.phase)) { - if (!input.trySkipNullValue()) { - final ChessRoguePhaseOuterClass.ChessRoguePhase value = input.readEnum(ChessRoguePhaseOuterClass.ChessRoguePhase.converter()); - if (value != null) { - phase = value.getNumber(); - bitField0_ |= 0x00000001; - } else { - input.skipUnknownEnumValue(); - } - } - } else { - input.skipUnknownField(); - } - break; - } - case 1525676279: - case -314743701: { - if (input.isAtField(FieldNames.mainStoryId)) { - if (!input.trySkipNullValue()) { - input.readRepeatedUInt32(mainStoryId); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } - case 365100685: { - if (input.isAtField(FieldNames.eKLAFMBHNIP)) { - if (!input.trySkipNullValue()) { - input.readRepeatedMessage(eKLAFMBHNIP); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } - case -184174347: - case -1394261434: { - if (input.isAtField(FieldNames.diceInfo)) { - if (!input.trySkipNullValue()) { - input.readRepeatedMessage(diceInfo); - bitField0_ |= 0x00000008; - } - } else { - input.skipUnknownField(); - } - break; - } - default: { - input.skipUnknownField(); - break; - } - } - } - input.endObject(); - return this; - } - - @Override - public ChessRogueQuery clone() { - return new ChessRogueQuery().copyFrom(this); - } - - @Override - public boolean isEmpty() { - return ((bitField0_) == 0); - } - - public static ChessRogueQuery parseFrom(final byte[] data) throws - InvalidProtocolBufferException { - return ProtoMessage.mergeFrom(new ChessRogueQuery(), data).checkInitialized(); - } - - public static ChessRogueQuery parseFrom(final ProtoSource input) throws IOException { - return ProtoMessage.mergeFrom(new ChessRogueQuery(), input).checkInitialized(); - } - - public static ChessRogueQuery parseFrom(final JsonSource input) throws IOException { - return ProtoMessage.mergeFrom(new ChessRogueQuery(), input).checkInitialized(); - } - - /** - * @return factory for creating ChessRogueQuery messages - */ - public static MessageFactory getFactory() { - return ChessRogueQueryFactory.INSTANCE; - } - - /** - * Protobuf type {@code EKLAFMBHNIPEntry} - */ - public static final class EKLAFMBHNIPEntry extends ProtoMessage implements Cloneable { - private static final long serialVersionUID = 0L; - - /** - * optional uint32 key = 1; - */ - private int key; - - /** - * optional bool value = 2; - */ - private boolean value_; - - private EKLAFMBHNIPEntry() { - } - - /** - * @return a new empty instance of {@code EKLAFMBHNIPEntry} - */ - public static EKLAFMBHNIPEntry newInstance() { - return new EKLAFMBHNIPEntry(); - } - - /** - * optional uint32 key = 1; - * @return whether the key field is set - */ - public boolean hasKey() { - return (bitField0_ & 0x00000001) != 0; - } - - /** - * optional uint32 key = 1; - * @return this - */ - public EKLAFMBHNIPEntry clearKey() { - bitField0_ &= ~0x00000001; - key = 0; - return this; - } - - /** - * optional uint32 key = 1; - * @return the key - */ - public int getKey() { - return key; - } - - /** - * optional uint32 key = 1; - * @param value the key to set - * @return this - */ - public EKLAFMBHNIPEntry setKey(final int value) { - bitField0_ |= 0x00000001; - key = value; - return this; - } - - /** - * optional bool value = 2; - * @return whether the value_ field is set - */ - public boolean hasValue() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional bool value = 2; - * @return this - */ - public EKLAFMBHNIPEntry clearValue() { - bitField0_ &= ~0x00000002; - value_ = false; - return this; - } - - /** - * optional bool value = 2; - * @return the value_ - */ - public boolean getValue() { - return value_; - } - - /** - * optional bool value = 2; - * @param value the value_ to set - * @return this - */ - public EKLAFMBHNIPEntry setValue(final boolean value) { - bitField0_ |= 0x00000002; - value_ = value; - return this; - } - - @Override - public EKLAFMBHNIPEntry copyFrom(final EKLAFMBHNIPEntry other) { - cachedSize = other.cachedSize; - if ((bitField0_ | other.bitField0_) != 0) { - bitField0_ = other.bitField0_; - key = other.key; - value_ = other.value_; - } - return this; - } - - @Override - public EKLAFMBHNIPEntry mergeFrom(final EKLAFMBHNIPEntry other) { - if (other.isEmpty()) { - return this; - } - cachedSize = -1; - if (other.hasKey()) { - setKey(other.key); - } - if (other.hasValue()) { - setValue(other.value_); - } - return this; - } - - @Override - public EKLAFMBHNIPEntry clear() { - if (isEmpty()) { - return this; - } - cachedSize = -1; - bitField0_ = 0; - key = 0; - value_ = false; - return this; - } - - @Override - public EKLAFMBHNIPEntry clearQuick() { - if (isEmpty()) { - return this; - } - cachedSize = -1; - bitField0_ = 0; - return this; - } - - @Override - public boolean equals(Object o) { - if (o == this) { - return true; - } - if (!(o instanceof EKLAFMBHNIPEntry)) { - return false; - } - EKLAFMBHNIPEntry other = (EKLAFMBHNIPEntry) o; - return bitField0_ == other.bitField0_ - && (!hasKey() || key == other.key) - && (!hasValue() || value_ == other.value_); - } - - @Override - public void writeTo(final ProtoSink output) throws IOException { - if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); - output.writeUInt32NoTag(key); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 16); - output.writeBoolNoTag(value_); - } - } - - @Override - protected int computeSerializedSize() { - int size = 0; - if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(key); - } - if ((bitField0_ & 0x00000002) != 0) { - size += 2; - } - return size; - } - - @Override - @SuppressWarnings("fallthrough") - public EKLAFMBHNIPEntry mergeFrom(final ProtoSource input) throws IOException { - // Enabled Fall-Through Optimization (QuickBuffers) - int tag = input.readTag(); - while (true) { - switch (tag) { - case 8: { - // key - key = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 16) { - break; - } - } - case 16: { - // value_ - value_ = input.readBool(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 0) { - break; - } - } - case 0: { - return this; - } - default: { - if (!input.skipField(tag)) { - return this; - } - tag = input.readTag(); - break; - } - } - } - } - - @Override - public void writeTo(final JsonSink output) throws IOException { - output.beginObject(); - if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.key, key); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeBool(FieldNames.value_, value_); - } - output.endObject(); - } - - @Override - public EKLAFMBHNIPEntry mergeFrom(final JsonSource input) throws IOException { - if (!input.beginObject()) { - return this; - } - while (!input.isAtEnd()) { - switch (input.readFieldHash()) { - case 106079: { - if (input.isAtField(FieldNames.key)) { - if (!input.trySkipNullValue()) { - key = input.readUInt32(); - bitField0_ |= 0x00000001; - } - } else { - input.skipUnknownField(); - } - break; - } - case 111972721: { - if (input.isAtField(FieldNames.value_)) { - if (!input.trySkipNullValue()) { - value_ = input.readBool(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } - default: { - input.skipUnknownField(); - break; - } - } - } - input.endObject(); - return this; - } - - @Override - public EKLAFMBHNIPEntry clone() { - return new EKLAFMBHNIPEntry().copyFrom(this); - } - - @Override - public boolean isEmpty() { - return ((bitField0_) == 0); - } - - public static EKLAFMBHNIPEntry parseFrom(final byte[] data) throws - InvalidProtocolBufferException { - return ProtoMessage.mergeFrom(new EKLAFMBHNIPEntry(), data).checkInitialized(); - } - - public static EKLAFMBHNIPEntry parseFrom(final ProtoSource input) throws IOException { - return ProtoMessage.mergeFrom(new EKLAFMBHNIPEntry(), input).checkInitialized(); - } - - public static EKLAFMBHNIPEntry parseFrom(final JsonSource input) throws IOException { - return ProtoMessage.mergeFrom(new EKLAFMBHNIPEntry(), input).checkInitialized(); - } - - /** - * @return factory for creating EKLAFMBHNIPEntry messages - */ - public static MessageFactory getFactory() { - return EKLAFMBHNIPEntryFactory.INSTANCE; - } - - private enum EKLAFMBHNIPEntryFactory implements MessageFactory { - INSTANCE; - - @Override - public EKLAFMBHNIPEntry create() { - return EKLAFMBHNIPEntry.newInstance(); - } - } - - /** - * Contains name constants used for serializing JSON - */ - static class FieldNames { - static final FieldName key = FieldName.forField("key"); - - static final FieldName value_ = FieldName.forField("value"); - } - } - - private enum ChessRogueQueryFactory implements MessageFactory { - INSTANCE; - - @Override - public ChessRogueQuery create() { - return ChessRogueQuery.newInstance(); - } - } - - /** - * Contains name constants used for serializing JSON - */ - static class FieldNames { - static final FieldName phase = FieldName.forField("phase"); - - static final FieldName mainStoryId = FieldName.forField("mainStoryId", "main_story_id"); - - static final FieldName eKLAFMBHNIP = FieldName.forField("EKLAFMBHNIP"); - - static final FieldName diceInfo = FieldName.forField("diceInfo", "dice_info"); - } - } -} diff --git a/src/generated/main/emu/lunarcore/proto/ChessRogueQueryScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChessRogueQueryScRspOuterClass.java deleted file mode 100644 index b0ae37ae6..000000000 --- a/src/generated/main/emu/lunarcore/proto/ChessRogueQueryScRspOuterClass.java +++ /dev/null @@ -1,597 +0,0 @@ -// Code generated by protocol buffer compiler. Do not edit! -package emu.lunarcore.proto; - -import java.io.IOException; -import us.hebi.quickbuf.FieldName; -import us.hebi.quickbuf.InvalidProtocolBufferException; -import us.hebi.quickbuf.JsonSink; -import us.hebi.quickbuf.JsonSource; -import us.hebi.quickbuf.MessageFactory; -import us.hebi.quickbuf.ProtoMessage; -import us.hebi.quickbuf.ProtoSink; -import us.hebi.quickbuf.ProtoSource; - -public final class ChessRogueQueryScRspOuterClass { - /** - * Protobuf type {@code ChessRogueQueryScRsp} - */ - public static final class ChessRogueQueryScRsp extends ProtoMessage implements Cloneable { - private static final long serialVersionUID = 0L; - - /** - * optional uint32 retcode = 3; - */ - private int retcode; - - /** - * 
-     * HLODEEONDBF OBGFEMEOJCE = 15;
-     * HFKELKECMJE MKCLHOMEICF = 4;
-     *
- * - * optional .ChessRogueQueryInfo NOGDNLNLMJH = 9; - */ - private final ChessRogueQueryInfoOuterClass.ChessRogueQueryInfo nOGDNLNLMJH = ChessRogueQueryInfoOuterClass.ChessRogueQueryInfo.newInstance(); - - /** - * optional .ChessRogueNousQueryInfo rogue_nous = 10; - */ - private final ChessRogueNousQueryInfoOuterClass.ChessRogueNousQueryInfo rogueNous = ChessRogueNousQueryInfoOuterClass.ChessRogueNousQueryInfo.newInstance(); - - /** - * optional .ChessRogueCurrentInfo current_info = 12; - */ - private final ChessRogueCurrentInfoOuterClass.ChessRogueCurrentInfo currentInfo = ChessRogueCurrentInfoOuterClass.ChessRogueCurrentInfo.newInstance(); - - private ChessRogueQueryScRsp() { - } - - /** - * @return a new empty instance of {@code ChessRogueQueryScRsp} - */ - public static ChessRogueQueryScRsp newInstance() { - return new ChessRogueQueryScRsp(); - } - - /** - * optional uint32 retcode = 3; - * @return whether the retcode field is set - */ - public boolean hasRetcode() { - return (bitField0_ & 0x00000001) != 0; - } - - /** - * optional uint32 retcode = 3; - * @return this - */ - public ChessRogueQueryScRsp clearRetcode() { - bitField0_ &= ~0x00000001; - retcode = 0; - return this; - } - - /** - * optional uint32 retcode = 3; - * @return the retcode - */ - public int getRetcode() { - return retcode; - } - - /** - * optional uint32 retcode = 3; - * @param value the retcode to set - * @return this - */ - public ChessRogueQueryScRsp setRetcode(final int value) { - bitField0_ |= 0x00000001; - retcode = value; - return this; - } - - /** - * 
-     * HLODEEONDBF OBGFEMEOJCE = 15;
-     * HFKELKECMJE MKCLHOMEICF = 4;
-     *
- * - * optional .ChessRogueQueryInfo NOGDNLNLMJH = 9; - * @return whether the nOGDNLNLMJH field is set - */ - public boolean hasNOGDNLNLMJH() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * 
-     * HLODEEONDBF OBGFEMEOJCE = 15;
-     * HFKELKECMJE MKCLHOMEICF = 4;
-     *
- * - * optional .ChessRogueQueryInfo NOGDNLNLMJH = 9; - * @return this - */ - public ChessRogueQueryScRsp clearNOGDNLNLMJH() { - bitField0_ &= ~0x00000002; - nOGDNLNLMJH.clear(); - return this; - } - - /** - * 
-     * HLODEEONDBF OBGFEMEOJCE = 15;
-     * HFKELKECMJE MKCLHOMEICF = 4;
-     *
- * - * optional .ChessRogueQueryInfo NOGDNLNLMJH = 9; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * Use {@link #getMutableNOGDNLNLMJH()} if you want to modify it. - * - * @return internal storage object for reading - */ - public ChessRogueQueryInfoOuterClass.ChessRogueQueryInfo getNOGDNLNLMJH() { - return nOGDNLNLMJH; - } - - /** - * 
-     * HLODEEONDBF OBGFEMEOJCE = 15;
-     * HFKELKECMJE MKCLHOMEICF = 4;
-     *
- * - * optional .ChessRogueQueryInfo NOGDNLNLMJH = 9; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public ChessRogueQueryInfoOuterClass.ChessRogueQueryInfo getMutableNOGDNLNLMJH() { - bitField0_ |= 0x00000002; - return nOGDNLNLMJH; - } - - /** - * 
-     * HLODEEONDBF OBGFEMEOJCE = 15;
-     * HFKELKECMJE MKCLHOMEICF = 4;
-     *
- * - * optional .ChessRogueQueryInfo NOGDNLNLMJH = 9; - * @param value the nOGDNLNLMJH to set - * @return this - */ - public ChessRogueQueryScRsp setNOGDNLNLMJH( - final ChessRogueQueryInfoOuterClass.ChessRogueQueryInfo value) { - bitField0_ |= 0x00000002; - nOGDNLNLMJH.copyFrom(value); - return this; - } - - /** - * optional .ChessRogueNousQueryInfo rogue_nous = 10; - * @return whether the rogueNous field is set - */ - public boolean hasRogueNous() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional .ChessRogueNousQueryInfo rogue_nous = 10; - * @return this - */ - public ChessRogueQueryScRsp clearRogueNous() { - bitField0_ &= ~0x00000004; - rogueNous.clear(); - return this; - } - - /** - * optional .ChessRogueNousQueryInfo rogue_nous = 10; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * Use {@link #getMutableRogueNous()} if you want to modify it. - * - * @return internal storage object for reading - */ - public ChessRogueNousQueryInfoOuterClass.ChessRogueNousQueryInfo getRogueNous() { - return rogueNous; - } - - /** - * optional .ChessRogueNousQueryInfo rogue_nous = 10; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public ChessRogueNousQueryInfoOuterClass.ChessRogueNousQueryInfo getMutableRogueNous() { - bitField0_ |= 0x00000004; - return rogueNous; - } - - /** - * optional .ChessRogueNousQueryInfo rogue_nous = 10; - * @param value the rogueNous to set - * @return this - */ - public ChessRogueQueryScRsp setRogueNous( - final ChessRogueNousQueryInfoOuterClass.ChessRogueNousQueryInfo value) { - bitField0_ |= 0x00000004; - rogueNous.copyFrom(value); - return this; - } - - /** - * optional .ChessRogueCurrentInfo current_info = 12; - * @return whether the currentInfo field is set - */ - public boolean hasCurrentInfo() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional .ChessRogueCurrentInfo current_info = 12; - * @return this - */ - public ChessRogueQueryScRsp clearCurrentInfo() { - bitField0_ &= ~0x00000008; - currentInfo.clear(); - return this; - } - - /** - * optional .ChessRogueCurrentInfo current_info = 12; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * Use {@link #getMutableCurrentInfo()} if you want to modify it. - * - * @return internal storage object for reading - */ - public ChessRogueCurrentInfoOuterClass.ChessRogueCurrentInfo getCurrentInfo() { - return currentInfo; - } - - /** - * optional .ChessRogueCurrentInfo current_info = 12; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public ChessRogueCurrentInfoOuterClass.ChessRogueCurrentInfo getMutableCurrentInfo() { - bitField0_ |= 0x00000008; - return currentInfo; - } - - /** - * optional .ChessRogueCurrentInfo current_info = 12; - * @param value the currentInfo to set - * @return this - */ - public ChessRogueQueryScRsp setCurrentInfo( - final ChessRogueCurrentInfoOuterClass.ChessRogueCurrentInfo value) { - bitField0_ |= 0x00000008; - currentInfo.copyFrom(value); - return this; - } - - @Override - public ChessRogueQueryScRsp copyFrom(final ChessRogueQueryScRsp other) { - cachedSize = other.cachedSize; - if ((bitField0_ | other.bitField0_) != 0) { - bitField0_ = other.bitField0_; - retcode = other.retcode; - nOGDNLNLMJH.copyFrom(other.nOGDNLNLMJH); - rogueNous.copyFrom(other.rogueNous); - currentInfo.copyFrom(other.currentInfo); - } - return this; - } - - @Override - public ChessRogueQueryScRsp mergeFrom(final ChessRogueQueryScRsp other) { - if (other.isEmpty()) { - return this; - } - cachedSize = -1; - if (other.hasRetcode()) { - setRetcode(other.retcode); - } - if (other.hasNOGDNLNLMJH()) { - getMutableNOGDNLNLMJH().mergeFrom(other.nOGDNLNLMJH); - } - if (other.hasRogueNous()) { - getMutableRogueNous().mergeFrom(other.rogueNous); - } - if (other.hasCurrentInfo()) { - getMutableCurrentInfo().mergeFrom(other.currentInfo); - } - return this; - } - - @Override - public ChessRogueQueryScRsp clear() { - if (isEmpty()) { - return this; - } - cachedSize = -1; - bitField0_ = 0; - retcode = 0; - nOGDNLNLMJH.clear(); - rogueNous.clear(); - currentInfo.clear(); - return this; - } - - @Override - public ChessRogueQueryScRsp clearQuick() { - if (isEmpty()) { - return this; - } - cachedSize = -1; - bitField0_ = 0; - nOGDNLNLMJH.clearQuick(); - rogueNous.clearQuick(); - currentInfo.clearQuick(); - return this; - } - - @Override - public boolean equals(Object o) { - if (o == this) { - return true; - } - if (!(o instanceof ChessRogueQueryScRsp)) { - return false; - } - ChessRogueQueryScRsp other = (ChessRogueQueryScRsp) o; - return bitField0_ == other.bitField0_ - && (!hasRetcode() || retcode == other.retcode) - && (!hasNOGDNLNLMJH() || nOGDNLNLMJH.equals(other.nOGDNLNLMJH)) - && (!hasRogueNous() || rogueNous.equals(other.rogueNous)) - && (!hasCurrentInfo() || currentInfo.equals(other.currentInfo)); - } - - @Override - public void writeTo(final ProtoSink output) throws IOException { - if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); - output.writeUInt32NoTag(retcode); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 74); - output.writeMessageNoTag(nOGDNLNLMJH); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 82); - output.writeMessageNoTag(rogueNous); - } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 98); - output.writeMessageNoTag(currentInfo); - } - } - - @Override - protected int computeSerializedSize() { - int size = 0; - if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); - } - if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(nOGDNLNLMJH); - } - if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(rogueNous); - } - if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(currentInfo); - } - return size; - } - - @Override - @SuppressWarnings("fallthrough") - public ChessRogueQueryScRsp mergeFrom(final ProtoSource input) throws IOException { - // Enabled Fall-Through Optimization (QuickBuffers) - int tag = input.readTag(); - while (true) { - switch (tag) { - case 24: { - // retcode - retcode = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 74) { - break; - } - } - case 74: { - // nOGDNLNLMJH - input.readMessage(nOGDNLNLMJH); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 82) { - break; - } - } - case 82: { - // rogueNous - input.readMessage(rogueNous); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 98) { - break; - } - } - case 98: { - // currentInfo - input.readMessage(currentInfo); - bitField0_ |= 0x00000008; - tag = input.readTag(); - if (tag != 0) { - break; - } - } - case 0: { - return this; - } - default: { - if (!input.skipField(tag)) { - return this; - } - tag = input.readTag(); - break; - } - } - } - } - - @Override - public void writeTo(final JsonSink output) throws IOException { - output.beginObject(); - if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeMessage(FieldNames.nOGDNLNLMJH, nOGDNLNLMJH); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeMessage(FieldNames.rogueNous, rogueNous); - } - if ((bitField0_ & 0x00000008) != 0) { - output.writeMessage(FieldNames.currentInfo, currentInfo); - } - output.endObject(); - } - - @Override - public ChessRogueQueryScRsp mergeFrom(final JsonSource input) throws IOException { - if (!input.beginObject()) { - return this; - } - while (!input.isAtEnd()) { - switch (input.readFieldHash()) { - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { - if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); - bitField0_ |= 0x00000001; - } - } else { - input.skipUnknownField(); - } - break; - } - case 459821233: { - if (input.isAtField(FieldNames.nOGDNLNLMJH)) { - if (!input.trySkipNullValue()) { - input.readMessage(nOGDNLNLMJH); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } - case 655959321: - case -1124433052: { - if (input.isAtField(FieldNames.rogueNous)) { - if (!input.trySkipNullValue()) { - input.readMessage(rogueNous); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } - case 600912327: - case 1468588980: { - if (input.isAtField(FieldNames.currentInfo)) { - if (!input.trySkipNullValue()) { - input.readMessage(currentInfo); - bitField0_ |= 0x00000008; - } - } else { - input.skipUnknownField(); - } - break; - } - default: { - input.skipUnknownField(); - break; - } - } - } - input.endObject(); - return this; - } - - @Override - public ChessRogueQueryScRsp clone() { - return new ChessRogueQueryScRsp().copyFrom(this); - } - - @Override - public boolean isEmpty() { - return ((bitField0_) == 0); - } - - public static ChessRogueQueryScRsp parseFrom(final byte[] data) throws - InvalidProtocolBufferException { - return ProtoMessage.mergeFrom(new ChessRogueQueryScRsp(), data).checkInitialized(); - } - - public static ChessRogueQueryScRsp parseFrom(final ProtoSource input) throws IOException { - return ProtoMessage.mergeFrom(new ChessRogueQueryScRsp(), input).checkInitialized(); - } - - public static ChessRogueQueryScRsp parseFrom(final JsonSource input) throws IOException { - return ProtoMessage.mergeFrom(new ChessRogueQueryScRsp(), input).checkInitialized(); - } - - /** - * @return factory for creating ChessRogueQueryScRsp messages - */ - public static MessageFactory getFactory() { - return ChessRogueQueryScRspFactory.INSTANCE; - } - - private enum ChessRogueQueryScRspFactory implements MessageFactory { - INSTANCE; - - @Override - public ChessRogueQueryScRsp create() { - return ChessRogueQueryScRsp.newInstance(); - } - } - - /** - * Contains name constants used for serializing JSON - */ - static class FieldNames { - static final FieldName retcode = FieldName.forField("retcode"); - - static final FieldName nOGDNLNLMJH = FieldName.forField("NOGDNLNLMJH"); - - static final FieldName rogueNous = FieldName.forField("rogueNous", "rogue_nous"); - - static final FieldName currentInfo = FieldName.forField("currentInfo", "current_info"); - } - } -} diff --git a/src/generated/main/emu/lunarcore/proto/ClientMailOuterClass.java b/src/generated/main/emu/lunarcore/proto/ClientMailOuterClass.java index 66e9fe87a..9696745ea 100644 --- a/src/generated/main/emu/lunarcore/proto/ClientMailOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ClientMailOuterClass.java @@ -21,52 +21,52 @@ public static final class ClientMail extends ProtoMessage implements private static final long serialVersionUID = 0L; /** - * optional int64 expire_time = 3; + * optional int64 expire_time = 14; */ private long expireTime; /** - * optional int64 time = 4; + * optional int64 time = 15; */ private long time; /** - * optional uint32 id = 13; + * optional uint32 id = 1; */ private int id; /** - * optional uint32 template_id = 14; + * optional uint32 template_id = 9; */ private int templateId; /** - * optional bool is_read = 10; + * optional bool is_read = 2; */ private boolean isRead; /** - * optional .ItemList attachment = 5; + * optional .ItemList attachment = 11; */ private final ItemListOuterClass.ItemList attachment = ItemListOuterClass.ItemList.newInstance(); /** - * optional string title = 8; + * optional string sender = 5; */ - private final Utf8String title = Utf8String.newEmptyInstance(); + private final Utf8String sender = Utf8String.newEmptyInstance(); /** - * optional string content = 11; + * optional string content = 6; */ private final Utf8String content = Utf8String.newEmptyInstance(); /** - * optional string sender = 15; + * optional string title = 7; */ - private final Utf8String sender = Utf8String.newEmptyInstance(); + private final Utf8String title = Utf8String.newEmptyInstance(); /** - * repeated string para_list = 1; + * repeated string para_list = 4; */ private final RepeatedString paraList = RepeatedString.newEmptyInstance(); @@ -81,7 +81,7 @@ public static ClientMail newInstance() { } /** - * optional int64 expire_time = 3; + * optional int64 expire_time = 14; * @return whether the expireTime field is set */ public boolean hasExpireTime() { @@ -89,7 +89,7 @@ public boolean hasExpireTime() { } /** - * optional int64 expire_time = 3; + * optional int64 expire_time = 14; * @return this */ public ClientMail clearExpireTime() { @@ -99,7 +99,7 @@ public ClientMail clearExpireTime() { } /** - * optional int64 expire_time = 3; + * optional int64 expire_time = 14; * @return the expireTime */ public long getExpireTime() { @@ -107,7 +107,7 @@ public long getExpireTime() { } /** - * optional int64 expire_time = 3; + * optional int64 expire_time = 14; * @param value the expireTime to set * @return this */ @@ -118,7 +118,7 @@ public ClientMail setExpireTime(final long value) { } /** - * optional int64 time = 4; + * optional int64 time = 15; * @return whether the time field is set */ public boolean hasTime() { @@ -126,7 +126,7 @@ public boolean hasTime() { } /** - * optional int64 time = 4; + * optional int64 time = 15; * @return this */ public ClientMail clearTime() { @@ -136,7 +136,7 @@ public ClientMail clearTime() { } /** - * optional int64 time = 4; + * optional int64 time = 15; * @return the time */ public long getTime() { @@ -144,7 +144,7 @@ public long getTime() { } /** - * optional int64 time = 4; + * optional int64 time = 15; * @param value the time to set * @return this */ @@ -155,7 +155,7 @@ public ClientMail setTime(final long value) { } /** - * optional uint32 id = 13; + * optional uint32 id = 1; * @return whether the id field is set */ public boolean hasId() { @@ -163,7 +163,7 @@ public boolean hasId() { } /** - * optional uint32 id = 13; + * optional uint32 id = 1; * @return this */ public ClientMail clearId() { @@ -173,7 +173,7 @@ public ClientMail clearId() { } /** - * optional uint32 id = 13; + * optional uint32 id = 1; * @return the id */ public int getId() { @@ -181,7 +181,7 @@ public int getId() { } /** - * optional uint32 id = 13; + * optional uint32 id = 1; * @param value the id to set * @return this */ @@ -192,7 +192,7 @@ public ClientMail setId(final int value) { } /** - * optional uint32 template_id = 14; + * optional uint32 template_id = 9; * @return whether the templateId field is set */ public boolean hasTemplateId() { @@ -200,7 +200,7 @@ public boolean hasTemplateId() { } /** - * optional uint32 template_id = 14; + * optional uint32 template_id = 9; * @return this */ public ClientMail clearTemplateId() { @@ -210,7 +210,7 @@ public ClientMail clearTemplateId() { } /** - * optional uint32 template_id = 14; + * optional uint32 template_id = 9; * @return the templateId */ public int getTemplateId() { @@ -218,7 +218,7 @@ public int getTemplateId() { } /** - * optional uint32 template_id = 14; + * optional uint32 template_id = 9; * @param value the templateId to set * @return this */ @@ -229,7 +229,7 @@ public ClientMail setTemplateId(final int value) { } /** - * optional bool is_read = 10; + * optional bool is_read = 2; * @return whether the isRead field is set */ public boolean hasIsRead() { @@ -237,7 +237,7 @@ public boolean hasIsRead() { } /** - * optional bool is_read = 10; + * optional bool is_read = 2; * @return this */ public ClientMail clearIsRead() { @@ -247,7 +247,7 @@ public ClientMail clearIsRead() { } /** - * optional bool is_read = 10; + * optional bool is_read = 2; * @return the isRead */ public boolean getIsRead() { @@ -255,7 +255,7 @@ public boolean getIsRead() { } /** - * optional bool is_read = 10; + * optional bool is_read = 2; * @param value the isRead to set * @return this */ @@ -266,7 +266,7 @@ public ClientMail setIsRead(final boolean value) { } /** - * optional .ItemList attachment = 5; + * optional .ItemList attachment = 11; * @return whether the attachment field is set */ public boolean hasAttachment() { @@ -274,7 +274,7 @@ public boolean hasAttachment() { } /** - * optional .ItemList attachment = 5; + * optional .ItemList attachment = 11; * @return this */ public ClientMail clearAttachment() { @@ -284,7 +284,7 @@ public ClientMail clearAttachment() { } /** - * optional .ItemList attachment = 5; + * optional .ItemList attachment = 11; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -298,7 +298,7 @@ public ItemListOuterClass.ItemList getAttachment() { } /** - * optional .ItemList attachment = 5; + * optional .ItemList attachment = 11; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -312,7 +312,7 @@ public ItemListOuterClass.ItemList getMutableAttachment() { } /** - * optional .ItemList attachment = 5; + * optional .ItemList attachment = 11; * @param value the attachment to set * @return this */ @@ -323,72 +323,72 @@ public ClientMail setAttachment(final ItemListOuterClass.ItemList value) { } /** - * optional string title = 8; - * @return whether the title field is set + * optional string sender = 5; + * @return whether the sender field is set */ - public boolean hasTitle() { + public boolean hasSender() { return (bitField0_ & 0x00000040) != 0; } /** - * optional string title = 8; + * optional string sender = 5; * @return this */ - public ClientMail clearTitle() { + public ClientMail clearSender() { bitField0_ &= ~0x00000040; - title.clear(); + sender.clear(); return this; } /** - * optional string title = 8; - * @return the title + * optional string sender = 5; + * @return the sender */ - public String getTitle() { - return title.getString(); + public String getSender() { + return sender.getString(); } /** - * optional string title = 8; - * @return internal {@code Utf8String} representation of title for reading + * optional string sender = 5; + * @return internal {@code Utf8String} representation of sender for reading */ - public Utf8String getTitleBytes() { - return this.title; + public Utf8String getSenderBytes() { + return this.sender; } /** - * optional string title = 8; - * @return internal {@code Utf8String} representation of title for modifications + * optional string sender = 5; + * @return internal {@code Utf8String} representation of sender for modifications */ - public Utf8String getMutableTitleBytes() { + public Utf8String getMutableSenderBytes() { bitField0_ |= 0x00000040; - return this.title; + return this.sender; } /** - * optional string title = 8; - * @param value the title to set + * optional string sender = 5; + * @param value the sender to set * @return this */ - public ClientMail setTitle(final CharSequence value) { + public ClientMail setSender(final CharSequence value) { bitField0_ |= 0x00000040; - title.copyFrom(value); + sender.copyFrom(value); return this; } /** - * optional string title = 8; - * @param value the title to set + * optional string sender = 5; + * @param value the sender to set * @return this */ - public ClientMail setTitle(final Utf8String value) { + public ClientMail setSender(final Utf8String value) { bitField0_ |= 0x00000040; - title.copyFrom(value); + sender.copyFrom(value); return this; } /** - * optional string content = 11; + * optional string content = 6; * @return whether the content field is set */ public boolean hasContent() { @@ -396,7 +396,7 @@ public boolean hasContent() { } /** - * optional string content = 11; + * optional string content = 6; * @return this */ public ClientMail clearContent() { @@ -406,7 +406,7 @@ public ClientMail clearContent() { } /** - * optional string content = 11; + * optional string content = 6; * @return the content */ public String getContent() { @@ -414,7 +414,7 @@ public String getContent() { } /** - * optional string content = 11; + * optional string content = 6; * @return internal {@code Utf8String} representation of content for reading */ public Utf8String getContentBytes() { @@ -422,7 +422,7 @@ public Utf8String getContentBytes() { } /** - * optional string content = 11; + * optional string content = 6; * @return internal {@code Utf8String} representation of content for modifications */ public Utf8String getMutableContentBytes() { @@ -431,7 +431,7 @@ public Utf8String getMutableContentBytes() { } /** - * optional string content = 11; + * optional string content = 6; * @param value the content to set * @return this */ @@ -442,7 +442,7 @@ public ClientMail setContent(final CharSequence value) { } /** - * optional string content = 11; + * optional string content = 6; * @param value the content to set * @return this */ @@ -453,72 +453,72 @@ public ClientMail setContent(final Utf8String value) { } /** - * optional string sender = 15; - * @return whether the sender field is set + * optional string title = 7; + * @return whether the title field is set */ - public boolean hasSender() { + public boolean hasTitle() { return (bitField0_ & 0x00000100) != 0; } /** - * optional string sender = 15; + * optional string title = 7; * @return this */ - public ClientMail clearSender() { + public ClientMail clearTitle() { bitField0_ &= ~0x00000100; - sender.clear(); + title.clear(); return this; } /** - * optional string sender = 15; - * @return the sender + * optional string title = 7; + * @return the title */ - public String getSender() { - return sender.getString(); + public String getTitle() { + return title.getString(); } /** - * optional string sender = 15; - * @return internal {@code Utf8String} representation of sender for reading + * optional string title = 7; + * @return internal {@code Utf8String} representation of title for reading */ - public Utf8String getSenderBytes() { - return this.sender; + public Utf8String getTitleBytes() { + return this.title; } /** - * optional string sender = 15; - * @return internal {@code Utf8String} representation of sender for modifications + * optional string title = 7; + * @return internal {@code Utf8String} representation of title for modifications */ - public Utf8String getMutableSenderBytes() { + public Utf8String getMutableTitleBytes() { bitField0_ |= 0x00000100; - return this.sender; + return this.title; } /** - * optional string sender = 15; - * @param value the sender to set + * optional string title = 7; + * @param value the title to set * @return this */ - public ClientMail setSender(final CharSequence value) { + public ClientMail setTitle(final CharSequence value) { bitField0_ |= 0x00000100; - sender.copyFrom(value); + title.copyFrom(value); return this; } /** - * optional string sender = 15; - * @param value the sender to set + * optional string title = 7; + * @param value the title to set * @return this */ - public ClientMail setSender(final Utf8String value) { + public ClientMail setTitle(final Utf8String value) { bitField0_ |= 0x00000100; - sender.copyFrom(value); + title.copyFrom(value); return this; } /** - * repeated string para_list = 1; + * repeated string para_list = 4; * @return whether the paraList field is set */ public boolean hasParaList() { @@ -526,7 +526,7 @@ public boolean hasParaList() { } /** - * repeated string para_list = 1; + * repeated string para_list = 4; * @return this */ public ClientMail clearParaList() { @@ -536,7 +536,7 @@ public ClientMail clearParaList() { } /** - * repeated string para_list = 1; + * repeated string para_list = 4; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -550,7 +550,7 @@ public RepeatedString getParaList() { } /** - * repeated string para_list = 1; + * repeated string para_list = 4; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -564,7 +564,7 @@ public RepeatedString getMutableParaList() { } /** - * repeated string para_list = 1; + * repeated string para_list = 4; * @param value the paraList to add * @return this */ @@ -575,7 +575,7 @@ public ClientMail addParaList(final CharSequence value) { } /** - * repeated string para_list = 1; + * repeated string para_list = 4; * @param values the paraList to add * @return this */ @@ -596,9 +596,9 @@ public ClientMail copyFrom(final ClientMail other) { templateId = other.templateId; isRead = other.isRead; attachment.copyFrom(other.attachment); - title.copyFrom(other.title); - content.copyFrom(other.content); sender.copyFrom(other.sender); + content.copyFrom(other.content); + title.copyFrom(other.title); paraList.copyFrom(other.paraList); } return this; @@ -628,14 +628,14 @@ public ClientMail mergeFrom(final ClientMail other) { if (other.hasAttachment()) { getMutableAttachment().mergeFrom(other.attachment); } - if (other.hasTitle()) { - getMutableTitleBytes().copyFrom(other.title); + if (other.hasSender()) { + getMutableSenderBytes().copyFrom(other.sender); } if (other.hasContent()) { getMutableContentBytes().copyFrom(other.content); } - if (other.hasSender()) { - getMutableSenderBytes().copyFrom(other.sender); + if (other.hasTitle()) { + getMutableTitleBytes().copyFrom(other.title); } if (other.hasParaList()) { getMutableParaList().addAll(other.paraList); @@ -656,9 +656,9 @@ public ClientMail clear() { templateId = 0; isRead = false; attachment.clear(); - title.clear(); - content.clear(); sender.clear(); + content.clear(); + title.clear(); paraList.clear(); return this; } @@ -671,9 +671,9 @@ public ClientMail clearQuick() { cachedSize = -1; bitField0_ = 0; attachment.clearQuick(); - title.clear(); - content.clear(); sender.clear(); + content.clear(); + title.clear(); paraList.clear(); return this; } @@ -694,53 +694,53 @@ public boolean equals(Object o) { && (!hasTemplateId() || templateId == other.templateId) && (!hasIsRead() || isRead == other.isRead) && (!hasAttachment() || attachment.equals(other.attachment)) - && (!hasTitle() || title.equals(other.title)) - && (!hasContent() || content.equals(other.content)) && (!hasSender() || sender.equals(other.sender)) + && (!hasContent() || content.equals(other.content)) + && (!hasTitle() || title.equals(other.title)) && (!hasParaList() || paraList.equals(other.paraList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 112); output.writeInt64NoTag(expireTime); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 120); output.writeInt64NoTag(time); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(id); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(templateId); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 16); output.writeBoolNoTag(isRead); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 42); + output.writeRawByte((byte) 90); output.writeMessageNoTag(attachment); } if ((bitField0_ & 0x00000040) != 0) { - output.writeRawByte((byte) 66); - output.writeStringNoTag(title); + output.writeRawByte((byte) 42); + output.writeStringNoTag(sender); } if ((bitField0_ & 0x00000080) != 0) { - output.writeRawByte((byte) 90); + output.writeRawByte((byte) 50); output.writeStringNoTag(content); } if ((bitField0_ & 0x00000100) != 0) { - output.writeRawByte((byte) 122); - output.writeStringNoTag(sender); + output.writeRawByte((byte) 58); + output.writeStringNoTag(title); } if ((bitField0_ & 0x00000200) != 0) { for (int i = 0; i < paraList.length(); i++) { - output.writeRawByte((byte) 10); + output.writeRawByte((byte) 34); output.writeStringNoTag(paraList.get(i)); } } @@ -768,13 +768,13 @@ protected int computeSerializedSize() { size += 1 + ProtoSink.computeMessageSizeNoTag(attachment); } if ((bitField0_ & 0x00000040) != 0) { - size += 1 + ProtoSink.computeStringSizeNoTag(title); + size += 1 + ProtoSink.computeStringSizeNoTag(sender); } if ((bitField0_ & 0x00000080) != 0) { size += 1 + ProtoSink.computeStringSizeNoTag(content); } if ((bitField0_ & 0x00000100) != 0) { - size += 1 + ProtoSink.computeStringSizeNoTag(sender); + size += 1 + ProtoSink.computeStringSizeNoTag(title); } if ((bitField0_ & 0x00000200) != 0) { size += (1 * paraList.length()) + ProtoSink.computeRepeatedStringSizeNoTag(paraList); @@ -789,88 +789,88 @@ public ClientMail mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { + case 112: { // expireTime expireTime = input.readInt64(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 32) { + if (tag != 120) { break; } } - case 32: { + case 120: { // time time = input.readInt64(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 104) { + if (tag != 8) { break; } } - case 104: { + case 8: { // id id = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 112) { + if (tag != 72) { break; } } - case 112: { + case 72: { // templateId templateId = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 80) { + if (tag != 16) { break; } } - case 80: { + case 16: { // isRead isRead = input.readBool(); bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 42) { + if (tag != 90) { break; } } - case 42: { + case 90: { // attachment input.readMessage(attachment); bitField0_ |= 0x00000020; tag = input.readTag(); - if (tag != 66) { + if (tag != 42) { break; } } - case 66: { - // title - input.readString(title); + case 42: { + // sender + input.readString(sender); bitField0_ |= 0x00000040; tag = input.readTag(); - if (tag != 90) { + if (tag != 50) { break; } } - case 90: { + case 50: { // content input.readString(content); bitField0_ |= 0x00000080; tag = input.readTag(); - if (tag != 122) { + if (tag != 58) { break; } } - case 122: { - // sender - input.readString(sender); + case 58: { + // title + input.readString(title); bitField0_ |= 0x00000100; tag = input.readTag(); - if (tag != 10) { + if (tag != 34) { break; } } - case 10: { + case 34: { // paraList tag = input.readRepeatedString(paraList, tag); bitField0_ |= 0x00000200; @@ -914,13 +914,13 @@ public void writeTo(final JsonSink output) throws IOException { output.writeMessage(FieldNames.attachment, attachment); } if ((bitField0_ & 0x00000040) != 0) { - output.writeString(FieldNames.title, title); + output.writeString(FieldNames.sender, sender); } if ((bitField0_ & 0x00000080) != 0) { output.writeString(FieldNames.content, content); } if ((bitField0_ & 0x00000100) != 0) { - output.writeString(FieldNames.sender, sender); + output.writeString(FieldNames.title, title); } if ((bitField0_ & 0x00000200) != 0) { output.writeRepeatedString(FieldNames.paraList, paraList); @@ -1004,10 +1004,10 @@ public ClientMail mergeFrom(final JsonSource input) throws IOException { } break; } - case 110371416: { - if (input.isAtField(FieldNames.title)) { + case -905962955: { + if (input.isAtField(FieldNames.sender)) { if (!input.trySkipNullValue()) { - input.readString(title); + input.readString(sender); bitField0_ |= 0x00000040; } } else { @@ -1026,10 +1026,10 @@ public ClientMail mergeFrom(final JsonSource input) throws IOException { } break; } - case -905962955: { - if (input.isAtField(FieldNames.sender)) { + case 110371416: { + if (input.isAtField(FieldNames.title)) { if (!input.trySkipNullValue()) { - input.readString(sender); + input.readString(title); bitField0_ |= 0x00000100; } } else { @@ -1113,11 +1113,11 @@ static class FieldNames { static final FieldName attachment = FieldName.forField("attachment"); - static final FieldName title = FieldName.forField("title"); + static final FieldName sender = FieldName.forField("sender"); static final FieldName content = FieldName.forField("content"); - static final FieldName sender = FieldName.forField("sender"); + static final FieldName title = FieldName.forField("title"); static final FieldName paraList = FieldName.forField("paraList", "para_list"); } diff --git a/src/generated/main/emu/lunarcore/proto/CommonRogueQueryOuterClass.java b/src/generated/main/emu/lunarcore/proto/CommonRogueQueryOuterClass.java deleted file mode 100644 index fd00bfc8a..000000000 --- a/src/generated/main/emu/lunarcore/proto/CommonRogueQueryOuterClass.java +++ /dev/null @@ -1,383 +0,0 @@ -// Code generated by protocol buffer compiler. Do not edit! -package emu.lunarcore.proto; - -import java.io.IOException; -import us.hebi.quickbuf.FieldName; -import us.hebi.quickbuf.InvalidProtocolBufferException; -import us.hebi.quickbuf.JsonSink; -import us.hebi.quickbuf.JsonSource; -import us.hebi.quickbuf.MessageFactory; -import us.hebi.quickbuf.ProtoMessage; -import us.hebi.quickbuf.ProtoSink; -import us.hebi.quickbuf.ProtoSource; - -public final class CommonRogueQueryOuterClass { - /** - * Protobuf type {@code CommonRogueQuery} - */ - public static final class CommonRogueQuery extends ProtoMessage implements Cloneable { - private static final long serialVersionUID = 0L; - - /** - * optional .RogueQuery rogue_query = 2; - */ - private final RogueQueryOuterClass.RogueQuery rogueQuery = RogueQueryOuterClass.RogueQuery.newInstance(); - - /** - * optional .RogueUpdate rogue_update = 6; - */ - private final RogueUpdateOuterClass.RogueUpdate rogueUpdate = RogueUpdateOuterClass.RogueUpdate.newInstance(); - - private CommonRogueQuery() { - } - - /** - * @return a new empty instance of {@code CommonRogueQuery} - */ - public static CommonRogueQuery newInstance() { - return new CommonRogueQuery(); - } - - /** - * optional .RogueQuery rogue_query = 2; - * @return whether the rogueQuery field is set - */ - public boolean hasRogueQuery() { - return (bitField0_ & 0x00000001) != 0; - } - - /** - * optional .RogueQuery rogue_query = 2; - * @return this - */ - public CommonRogueQuery clearRogueQuery() { - bitField0_ &= ~0x00000001; - rogueQuery.clear(); - return this; - } - - /** - * optional .RogueQuery rogue_query = 2; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * Use {@link #getMutableRogueQuery()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RogueQueryOuterClass.RogueQuery getRogueQuery() { - return rogueQuery; - } - - /** - * optional .RogueQuery rogue_query = 2; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public RogueQueryOuterClass.RogueQuery getMutableRogueQuery() { - bitField0_ |= 0x00000001; - return rogueQuery; - } - - /** - * optional .RogueQuery rogue_query = 2; - * @param value the rogueQuery to set - * @return this - */ - public CommonRogueQuery setRogueQuery(final RogueQueryOuterClass.RogueQuery value) { - bitField0_ |= 0x00000001; - rogueQuery.copyFrom(value); - return this; - } - - /** - * optional .RogueUpdate rogue_update = 6; - * @return whether the rogueUpdate field is set - */ - public boolean hasRogueUpdate() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional .RogueUpdate rogue_update = 6; - * @return this - */ - public CommonRogueQuery clearRogueUpdate() { - bitField0_ &= ~0x00000002; - rogueUpdate.clear(); - return this; - } - - /** - * optional .RogueUpdate rogue_update = 6; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * Use {@link #getMutableRogueUpdate()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RogueUpdateOuterClass.RogueUpdate getRogueUpdate() { - return rogueUpdate; - } - - /** - * optional .RogueUpdate rogue_update = 6; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public RogueUpdateOuterClass.RogueUpdate getMutableRogueUpdate() { - bitField0_ |= 0x00000002; - return rogueUpdate; - } - - /** - * optional .RogueUpdate rogue_update = 6; - * @param value the rogueUpdate to set - * @return this - */ - public CommonRogueQuery setRogueUpdate(final RogueUpdateOuterClass.RogueUpdate value) { - bitField0_ |= 0x00000002; - rogueUpdate.copyFrom(value); - return this; - } - - @Override - public CommonRogueQuery copyFrom(final CommonRogueQuery other) { - cachedSize = other.cachedSize; - if ((bitField0_ | other.bitField0_) != 0) { - bitField0_ = other.bitField0_; - rogueQuery.copyFrom(other.rogueQuery); - rogueUpdate.copyFrom(other.rogueUpdate); - } - return this; - } - - @Override - public CommonRogueQuery mergeFrom(final CommonRogueQuery other) { - if (other.isEmpty()) { - return this; - } - cachedSize = -1; - if (other.hasRogueQuery()) { - getMutableRogueQuery().mergeFrom(other.rogueQuery); - } - if (other.hasRogueUpdate()) { - getMutableRogueUpdate().mergeFrom(other.rogueUpdate); - } - return this; - } - - @Override - public CommonRogueQuery clear() { - if (isEmpty()) { - return this; - } - cachedSize = -1; - bitField0_ = 0; - rogueQuery.clear(); - rogueUpdate.clear(); - return this; - } - - @Override - public CommonRogueQuery clearQuick() { - if (isEmpty()) { - return this; - } - cachedSize = -1; - bitField0_ = 0; - rogueQuery.clearQuick(); - rogueUpdate.clearQuick(); - return this; - } - - @Override - public boolean equals(Object o) { - if (o == this) { - return true; - } - if (!(o instanceof CommonRogueQuery)) { - return false; - } - CommonRogueQuery other = (CommonRogueQuery) o; - return bitField0_ == other.bitField0_ - && (!hasRogueQuery() || rogueQuery.equals(other.rogueQuery)) - && (!hasRogueUpdate() || rogueUpdate.equals(other.rogueUpdate)); - } - - @Override - public void writeTo(final ProtoSink output) throws IOException { - if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 18); - output.writeMessageNoTag(rogueQuery); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 50); - output.writeMessageNoTag(rogueUpdate); - } - } - - @Override - protected int computeSerializedSize() { - int size = 0; - if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(rogueQuery); - } - if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(rogueUpdate); - } - return size; - } - - @Override - @SuppressWarnings("fallthrough") - public CommonRogueQuery mergeFrom(final ProtoSource input) throws IOException { - // Enabled Fall-Through Optimization (QuickBuffers) - int tag = input.readTag(); - while (true) { - switch (tag) { - case 18: { - // rogueQuery - input.readMessage(rogueQuery); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 50) { - break; - } - } - case 50: { - // rogueUpdate - input.readMessage(rogueUpdate); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 0) { - break; - } - } - case 0: { - return this; - } - default: { - if (!input.skipField(tag)) { - return this; - } - tag = input.readTag(); - break; - } - } - } - } - - @Override - public void writeTo(final JsonSink output) throws IOException { - output.beginObject(); - if ((bitField0_ & 0x00000001) != 0) { - output.writeMessage(FieldNames.rogueQuery, rogueQuery); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeMessage(FieldNames.rogueUpdate, rogueUpdate); - } - output.endObject(); - } - - @Override - public CommonRogueQuery mergeFrom(final JsonSource input) throws IOException { - if (!input.beginObject()) { - return this; - } - while (!input.isAtEnd()) { - switch (input.readFieldHash()) { - case -1137163506: - case -494752221: { - if (input.isAtField(FieldNames.rogueQuery)) { - if (!input.trySkipNullValue()) { - input.readMessage(rogueQuery); - bitField0_ |= 0x00000001; - } - } else { - input.skipUnknownField(); - } - break; - } - case -782477501: - case 1952403150: { - if (input.isAtField(FieldNames.rogueUpdate)) { - if (!input.trySkipNullValue()) { - input.readMessage(rogueUpdate); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } - default: { - input.skipUnknownField(); - break; - } - } - } - input.endObject(); - return this; - } - - @Override - public CommonRogueQuery clone() { - return new CommonRogueQuery().copyFrom(this); - } - - @Override - public boolean isEmpty() { - return ((bitField0_) == 0); - } - - public static CommonRogueQuery parseFrom(final byte[] data) throws - InvalidProtocolBufferException { - return ProtoMessage.mergeFrom(new CommonRogueQuery(), data).checkInitialized(); - } - - public static CommonRogueQuery parseFrom(final ProtoSource input) throws IOException { - return ProtoMessage.mergeFrom(new CommonRogueQuery(), input).checkInitialized(); - } - - public static CommonRogueQuery parseFrom(final JsonSource input) throws IOException { - return ProtoMessage.mergeFrom(new CommonRogueQuery(), input).checkInitialized(); - } - - /** - * @return factory for creating CommonRogueQuery messages - */ - public static MessageFactory getFactory() { - return CommonRogueQueryFactory.INSTANCE; - } - - private enum CommonRogueQueryFactory implements MessageFactory { - INSTANCE; - - @Override - public CommonRogueQuery create() { - return CommonRogueQuery.newInstance(); - } - } - - /** - * Contains name constants used for serializing JSON - */ - static class FieldNames { - static final FieldName rogueQuery = FieldName.forField("rogueQuery", "rogue_query"); - - static final FieldName rogueUpdate = FieldName.forField("rogueUpdate", "rogue_update"); - } - } -} diff --git a/src/generated/main/emu/lunarcore/proto/CommonRogueQueryScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/CommonRogueQueryScRspOuterClass.java deleted file mode 100644 index 8ba347333..000000000 --- a/src/generated/main/emu/lunarcore/proto/CommonRogueQueryScRspOuterClass.java +++ /dev/null @@ -1,362 +0,0 @@ -// Code generated by protocol buffer compiler. Do not edit! -package emu.lunarcore.proto; - -import java.io.IOException; -import us.hebi.quickbuf.FieldName; -import us.hebi.quickbuf.InvalidProtocolBufferException; -import us.hebi.quickbuf.JsonSink; -import us.hebi.quickbuf.JsonSource; -import us.hebi.quickbuf.MessageFactory; -import us.hebi.quickbuf.ProtoMessage; -import us.hebi.quickbuf.ProtoSink; -import us.hebi.quickbuf.ProtoSource; - -public final class CommonRogueQueryScRspOuterClass { - /** - * Protobuf type {@code CommonRogueQueryScRsp} - */ - public static final class CommonRogueQueryScRsp extends ProtoMessage implements Cloneable { - private static final long serialVersionUID = 0L; - - /** - * optional uint32 retcode = 3; - */ - private int retcode; - - /** - * optional .CommonRogueQuery common_rogue_query = 4; - */ - private final CommonRogueQueryOuterClass.CommonRogueQuery commonRogueQuery = CommonRogueQueryOuterClass.CommonRogueQuery.newInstance(); - - private CommonRogueQueryScRsp() { - } - - /** - * @return a new empty instance of {@code CommonRogueQueryScRsp} - */ - public static CommonRogueQueryScRsp newInstance() { - return new CommonRogueQueryScRsp(); - } - - /** - * optional uint32 retcode = 3; - * @return whether the retcode field is set - */ - public boolean hasRetcode() { - return (bitField0_ & 0x00000001) != 0; - } - - /** - * optional uint32 retcode = 3; - * @return this - */ - public CommonRogueQueryScRsp clearRetcode() { - bitField0_ &= ~0x00000001; - retcode = 0; - return this; - } - - /** - * optional uint32 retcode = 3; - * @return the retcode - */ - public int getRetcode() { - return retcode; - } - - /** - * optional uint32 retcode = 3; - * @param value the retcode to set - * @return this - */ - public CommonRogueQueryScRsp setRetcode(final int value) { - bitField0_ |= 0x00000001; - retcode = value; - return this; - } - - /** - * optional .CommonRogueQuery common_rogue_query = 4; - * @return whether the commonRogueQuery field is set - */ - public boolean hasCommonRogueQuery() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional .CommonRogueQuery common_rogue_query = 4; - * @return this - */ - public CommonRogueQueryScRsp clearCommonRogueQuery() { - bitField0_ &= ~0x00000002; - commonRogueQuery.clear(); - return this; - } - - /** - * optional .CommonRogueQuery common_rogue_query = 4; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * Use {@link #getMutableCommonRogueQuery()} if you want to modify it. - * - * @return internal storage object for reading - */ - public CommonRogueQueryOuterClass.CommonRogueQuery getCommonRogueQuery() { - return commonRogueQuery; - } - - /** - * optional .CommonRogueQuery common_rogue_query = 4; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public CommonRogueQueryOuterClass.CommonRogueQuery getMutableCommonRogueQuery() { - bitField0_ |= 0x00000002; - return commonRogueQuery; - } - - /** - * optional .CommonRogueQuery common_rogue_query = 4; - * @param value the commonRogueQuery to set - * @return this - */ - public CommonRogueQueryScRsp setCommonRogueQuery( - final CommonRogueQueryOuterClass.CommonRogueQuery value) { - bitField0_ |= 0x00000002; - commonRogueQuery.copyFrom(value); - return this; - } - - @Override - public CommonRogueQueryScRsp copyFrom(final CommonRogueQueryScRsp other) { - cachedSize = other.cachedSize; - if ((bitField0_ | other.bitField0_) != 0) { - bitField0_ = other.bitField0_; - retcode = other.retcode; - commonRogueQuery.copyFrom(other.commonRogueQuery); - } - return this; - } - - @Override - public CommonRogueQueryScRsp mergeFrom(final CommonRogueQueryScRsp other) { - if (other.isEmpty()) { - return this; - } - cachedSize = -1; - if (other.hasRetcode()) { - setRetcode(other.retcode); - } - if (other.hasCommonRogueQuery()) { - getMutableCommonRogueQuery().mergeFrom(other.commonRogueQuery); - } - return this; - } - - @Override - public CommonRogueQueryScRsp clear() { - if (isEmpty()) { - return this; - } - cachedSize = -1; - bitField0_ = 0; - retcode = 0; - commonRogueQuery.clear(); - return this; - } - - @Override - public CommonRogueQueryScRsp clearQuick() { - if (isEmpty()) { - return this; - } - cachedSize = -1; - bitField0_ = 0; - commonRogueQuery.clearQuick(); - return this; - } - - @Override - public boolean equals(Object o) { - if (o == this) { - return true; - } - if (!(o instanceof CommonRogueQueryScRsp)) { - return false; - } - CommonRogueQueryScRsp other = (CommonRogueQueryScRsp) o; - return bitField0_ == other.bitField0_ - && (!hasRetcode() || retcode == other.retcode) - && (!hasCommonRogueQuery() || commonRogueQuery.equals(other.commonRogueQuery)); - } - - @Override - public void writeTo(final ProtoSink output) throws IOException { - if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); - output.writeUInt32NoTag(retcode); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 34); - output.writeMessageNoTag(commonRogueQuery); - } - } - - @Override - protected int computeSerializedSize() { - int size = 0; - if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); - } - if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(commonRogueQuery); - } - return size; - } - - @Override - @SuppressWarnings("fallthrough") - public CommonRogueQueryScRsp mergeFrom(final ProtoSource input) throws IOException { - // Enabled Fall-Through Optimization (QuickBuffers) - int tag = input.readTag(); - while (true) { - switch (tag) { - case 24: { - // retcode - retcode = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 34) { - break; - } - } - case 34: { - // commonRogueQuery - input.readMessage(commonRogueQuery); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 0) { - break; - } - } - case 0: { - return this; - } - default: { - if (!input.skipField(tag)) { - return this; - } - tag = input.readTag(); - break; - } - } - } - } - - @Override - public void writeTo(final JsonSink output) throws IOException { - output.beginObject(); - if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeMessage(FieldNames.commonRogueQuery, commonRogueQuery); - } - output.endObject(); - } - - @Override - public CommonRogueQueryScRsp mergeFrom(final JsonSource input) throws IOException { - if (!input.beginObject()) { - return this; - } - while (!input.isAtEnd()) { - switch (input.readFieldHash()) { - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { - if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); - bitField0_ |= 0x00000001; - } - } else { - input.skipUnknownField(); - } - break; - } - case 1847205721: - case 1954524623: { - if (input.isAtField(FieldNames.commonRogueQuery)) { - if (!input.trySkipNullValue()) { - input.readMessage(commonRogueQuery); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } - default: { - input.skipUnknownField(); - break; - } - } - } - input.endObject(); - return this; - } - - @Override - public CommonRogueQueryScRsp clone() { - return new CommonRogueQueryScRsp().copyFrom(this); - } - - @Override - public boolean isEmpty() { - return ((bitField0_) == 0); - } - - public static CommonRogueQueryScRsp parseFrom(final byte[] data) throws - InvalidProtocolBufferException { - return ProtoMessage.mergeFrom(new CommonRogueQueryScRsp(), data).checkInitialized(); - } - - public static CommonRogueQueryScRsp parseFrom(final ProtoSource input) throws IOException { - return ProtoMessage.mergeFrom(new CommonRogueQueryScRsp(), input).checkInitialized(); - } - - public static CommonRogueQueryScRsp parseFrom(final JsonSource input) throws IOException { - return ProtoMessage.mergeFrom(new CommonRogueQueryScRsp(), input).checkInitialized(); - } - - /** - * @return factory for creating CommonRogueQueryScRsp messages - */ - public static MessageFactory getFactory() { - return CommonRogueQueryScRspFactory.INSTANCE; - } - - private enum CommonRogueQueryScRspFactory implements MessageFactory { - INSTANCE; - - @Override - public CommonRogueQueryScRsp create() { - return CommonRogueQueryScRsp.newInstance(); - } - } - - /** - * Contains name constants used for serializing JSON - */ - static class FieldNames { - static final FieldName retcode = FieldName.forField("retcode"); - - static final FieldName commonRogueQuery = FieldName.forField("commonRogueQuery", "common_rogue_query"); - } - } -} diff --git a/src/generated/main/emu/lunarcore/proto/ComposeItemCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/ComposeItemCsReqOuterClass.java index 415e308c4..d198ca621 100644 --- a/src/generated/main/emu/lunarcore/proto/ComposeItemCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ComposeItemCsReqOuterClass.java @@ -19,17 +19,17 @@ public static final class ComposeItemCsReq extends ProtoMessageoptional uint32 count = 12; + * optional uint32 compose_id = 8; */ - private int count; + private int composeId; /** - * optional uint32 compose_id = 13; + * optional uint32 count = 9; */ - private int composeId; + private int count; /** - * optional .ItemCostList compose_item_list = 1; + * optional .ItemCostList compose_item_list = 3; */ private final ItemCostListOuterClass.ItemCostList composeItemList = ItemCostListOuterClass.ItemCostList.newInstance(); @@ -44,81 +44,81 @@ public static ComposeItemCsReq newInstance() { } /** - * optional uint32 count = 12; - * @return whether the count field is set + * optional uint32 compose_id = 8; + * @return whether the composeId field is set */ - public boolean hasCount() { + public boolean hasComposeId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 count = 12; + * optional uint32 compose_id = 8; * @return this */ - public ComposeItemCsReq clearCount() { + public ComposeItemCsReq clearComposeId() { bitField0_ &= ~0x00000001; - count = 0; + composeId = 0; return this; } /** - * optional uint32 count = 12; - * @return the count + * optional uint32 compose_id = 8; + * @return the composeId */ - public int getCount() { - return count; + public int getComposeId() { + return composeId; } /** - * optional uint32 count = 12; - * @param value the count to set + * optional uint32 compose_id = 8; + * @param value the composeId to set * @return this */ - public ComposeItemCsReq setCount(final int value) { + public ComposeItemCsReq setComposeId(final int value) { bitField0_ |= 0x00000001; - count = value; + composeId = value; return this; } /** - * optional uint32 compose_id = 13; - * @return whether the composeId field is set + * optional uint32 count = 9; + * @return whether the count field is set */ - public boolean hasComposeId() { + public boolean hasCount() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 compose_id = 13; + * optional uint32 count = 9; * @return this */ - public ComposeItemCsReq clearComposeId() { + public ComposeItemCsReq clearCount() { bitField0_ &= ~0x00000002; - composeId = 0; + count = 0; return this; } /** - * optional uint32 compose_id = 13; - * @return the composeId + * optional uint32 count = 9; + * @return the count */ - public int getComposeId() { - return composeId; + public int getCount() { + return count; } /** - * optional uint32 compose_id = 13; - * @param value the composeId to set + * optional uint32 count = 9; + * @param value the count to set * @return this */ - public ComposeItemCsReq setComposeId(final int value) { + public ComposeItemCsReq setCount(final int value) { bitField0_ |= 0x00000002; - composeId = value; + count = value; return this; } /** - * optional .ItemCostList compose_item_list = 1; + * optional .ItemCostList compose_item_list = 3; * @return whether the composeItemList field is set */ public boolean hasComposeItemList() { @@ -126,7 +126,7 @@ public boolean hasComposeItemList() { } /** - * optional .ItemCostList compose_item_list = 1; + * optional .ItemCostList compose_item_list = 3; * @return this */ public ComposeItemCsReq clearComposeItemList() { @@ -136,7 +136,7 @@ public ComposeItemCsReq clearComposeItemList() { } /** - * optional .ItemCostList compose_item_list = 1; + * optional .ItemCostList compose_item_list = 3; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -150,7 +150,7 @@ public ItemCostListOuterClass.ItemCostList getComposeItemList() { } /** - * optional .ItemCostList compose_item_list = 1; + * optional .ItemCostList compose_item_list = 3; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -164,7 +164,7 @@ public ItemCostListOuterClass.ItemCostList getMutableComposeItemList() { } /** - * optional .ItemCostList compose_item_list = 1; + * optional .ItemCostList compose_item_list = 3; * @param value the composeItemList to set * @return this */ @@ -179,8 +179,8 @@ public ComposeItemCsReq copyFrom(final ComposeItemCsReq other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - count = other.count; composeId = other.composeId; + count = other.count; composeItemList.copyFrom(other.composeItemList); } return this; @@ -192,12 +192,12 @@ public ComposeItemCsReq mergeFrom(final ComposeItemCsReq other) { return this; } cachedSize = -1; - if (other.hasCount()) { - setCount(other.count); - } if (other.hasComposeId()) { setComposeId(other.composeId); } + if (other.hasCount()) { + setCount(other.count); + } if (other.hasComposeItemList()) { getMutableComposeItemList().mergeFrom(other.composeItemList); } @@ -211,8 +211,8 @@ public ComposeItemCsReq clear() { } cachedSize = -1; bitField0_ = 0; - count = 0; composeId = 0; + count = 0; composeItemList.clear(); return this; } @@ -238,23 +238,23 @@ public boolean equals(Object o) { } ComposeItemCsReq other = (ComposeItemCsReq) o; return bitField0_ == other.bitField0_ - && (!hasCount() || count == other.count) && (!hasComposeId() || composeId == other.composeId) + && (!hasCount() || count == other.count) && (!hasComposeItemList() || composeItemList.equals(other.composeItemList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 96); - output.writeUInt32NoTag(count); + output.writeRawByte((byte) 64); + output.writeUInt32NoTag(composeId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 104); - output.writeUInt32NoTag(composeId); + output.writeRawByte((byte) 72); + output.writeUInt32NoTag(count); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 10); + output.writeRawByte((byte) 26); output.writeMessageNoTag(composeItemList); } } @@ -263,10 +263,10 @@ public void writeTo(final ProtoSink output) throws IOException { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(count); + size += 1 + ProtoSink.computeUInt32SizeNoTag(composeId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(composeId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(count); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(composeItemList); @@ -281,25 +281,25 @@ public ComposeItemCsReq mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 96: { - // count - count = input.readUInt32(); + case 64: { + // composeId + composeId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 104) { + if (tag != 72) { break; } } - case 104: { - // composeId - composeId = input.readUInt32(); + case 72: { + // count + count = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 10) { + if (tag != 26) { break; } } - case 10: { + case 26: { // composeItemList input.readMessage(composeItemList); bitField0_ |= 0x00000004; @@ -326,10 +326,10 @@ public ComposeItemCsReq mergeFrom(final ProtoSource input) throws IOException { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.count, count); + output.writeUInt32(FieldNames.composeId, composeId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.composeId, composeId); + output.writeUInt32(FieldNames.count, count); } if ((bitField0_ & 0x00000004) != 0) { output.writeMessage(FieldNames.composeItemList, composeItemList); @@ -344,10 +344,11 @@ public ComposeItemCsReq mergeFrom(final JsonSource input) throws IOException { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 94851343: { - if (input.isAtField(FieldNames.count)) { + case -1399759283: + case -442843416: { + if (input.isAtField(FieldNames.composeId)) { if (!input.trySkipNullValue()) { - count = input.readUInt32(); + composeId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -355,11 +356,10 @@ public ComposeItemCsReq mergeFrom(final JsonSource input) throws IOException { } break; } - case -1399759283: - case -442843416: { - if (input.isAtField(FieldNames.composeId)) { + case 94851343: { + if (input.isAtField(FieldNames.count)) { if (!input.trySkipNullValue()) { - composeId = input.readUInt32(); + count = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -432,10 +432,10 @@ public ComposeItemCsReq create() { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName count = FieldName.forField("count"); - static final FieldName composeId = FieldName.forField("composeId", "compose_id"); + static final FieldName count = FieldName.forField("count"); + static final FieldName composeItemList = FieldName.forField("composeItemList", "compose_item_list"); } } diff --git a/src/generated/main/emu/lunarcore/proto/ComposeItemScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/ComposeItemScRspOuterClass.java index a5a40b1dd..0d6a4c37f 100644 --- a/src/generated/main/emu/lunarcore/proto/ComposeItemScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ComposeItemScRspOuterClass.java @@ -19,22 +19,22 @@ public static final class ComposeItemScRsp extends ProtoMessageoptional uint32 compose_id = 1; + * optional uint32 retcode = 2; */ - private int composeId; + private int retcode; /** - * optional uint32 retcode = 5; + * optional uint32 compose_id = 7; */ - private int retcode; + private int composeId; /** - * optional uint32 count = 9; + * optional uint32 count = 14; */ private int count; /** - * optional .ItemList return_item_list = 3; + * optional .ItemList return_item_list = 9; */ private final ItemListOuterClass.ItemList returnItemList = ItemListOuterClass.ItemList.newInstance(); @@ -49,81 +49,81 @@ public static ComposeItemScRsp newInstance() { } /** - * optional uint32 compose_id = 1; - * @return whether the composeId field is set + * optional uint32 retcode = 2; + * @return whether the retcode field is set */ - public boolean hasComposeId() { + public boolean hasRetcode() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 compose_id = 1; + * optional uint32 retcode = 2; * @return this */ - public ComposeItemScRsp clearComposeId() { + public ComposeItemScRsp clearRetcode() { bitField0_ &= ~0x00000001; - composeId = 0; + retcode = 0; return this; } /** - * optional uint32 compose_id = 1; - * @return the composeId + * optional uint32 retcode = 2; + * @return the retcode */ - public int getComposeId() { - return composeId; + public int getRetcode() { + return retcode; } /** - * optional uint32 compose_id = 1; - * @param value the composeId to set + * optional uint32 retcode = 2; + * @param value the retcode to set * @return this */ - public ComposeItemScRsp setComposeId(final int value) { + public ComposeItemScRsp setRetcode(final int value) { bitField0_ |= 0x00000001; - composeId = value; + retcode = value; return this; } /** - * optional uint32 retcode = 5; - * @return whether the retcode field is set + * optional uint32 compose_id = 7; + * @return whether the composeId field is set */ - public boolean hasRetcode() { + public boolean hasComposeId() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 retcode = 5; + * optional uint32 compose_id = 7; * @return this */ - public ComposeItemScRsp clearRetcode() { + public ComposeItemScRsp clearComposeId() { bitField0_ &= ~0x00000002; - retcode = 0; + composeId = 0; return this; } /** - * optional uint32 retcode = 5; - * @return the retcode + * optional uint32 compose_id = 7; + * @return the composeId */ - public int getRetcode() { - return retcode; + public int getComposeId() { + return composeId; } /** - * optional uint32 retcode = 5; - * @param value the retcode to set + * optional uint32 compose_id = 7; + * @param value the composeId to set * @return this */ - public ComposeItemScRsp setRetcode(final int value) { + public ComposeItemScRsp setComposeId(final int value) { bitField0_ |= 0x00000002; - retcode = value; + composeId = value; return this; } /** - * optional uint32 count = 9; + * optional uint32 count = 14; * @return whether the count field is set */ public boolean hasCount() { @@ -131,7 +131,7 @@ public boolean hasCount() { } /** - * optional uint32 count = 9; + * optional uint32 count = 14; * @return this */ public ComposeItemScRsp clearCount() { @@ -141,7 +141,7 @@ public ComposeItemScRsp clearCount() { } /** - * optional uint32 count = 9; + * optional uint32 count = 14; * @return the count */ public int getCount() { @@ -149,7 +149,7 @@ public int getCount() { } /** - * optional uint32 count = 9; + * optional uint32 count = 14; * @param value the count to set * @return this */ @@ -160,7 +160,7 @@ public ComposeItemScRsp setCount(final int value) { } /** - * optional .ItemList return_item_list = 3; + * optional .ItemList return_item_list = 9; * @return whether the returnItemList field is set */ public boolean hasReturnItemList() { @@ -168,7 +168,7 @@ public boolean hasReturnItemList() { } /** - * optional .ItemList return_item_list = 3; + * optional .ItemList return_item_list = 9; * @return this */ public ComposeItemScRsp clearReturnItemList() { @@ -178,7 +178,7 @@ public ComposeItemScRsp clearReturnItemList() { } /** - * optional .ItemList return_item_list = 3; + * optional .ItemList return_item_list = 9; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -192,7 +192,7 @@ public ItemListOuterClass.ItemList getReturnItemList() { } /** - * optional .ItemList return_item_list = 3; + * optional .ItemList return_item_list = 9; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -206,7 +206,7 @@ public ItemListOuterClass.ItemList getMutableReturnItemList() { } /** - * optional .ItemList return_item_list = 3; + * optional .ItemList return_item_list = 9; * @param value the returnItemList to set * @return this */ @@ -221,8 +221,8 @@ public ComposeItemScRsp copyFrom(final ComposeItemScRsp other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - composeId = other.composeId; retcode = other.retcode; + composeId = other.composeId; count = other.count; returnItemList.copyFrom(other.returnItemList); } @@ -235,12 +235,12 @@ public ComposeItemScRsp mergeFrom(final ComposeItemScRsp other) { return this; } cachedSize = -1; - if (other.hasComposeId()) { - setComposeId(other.composeId); - } if (other.hasRetcode()) { setRetcode(other.retcode); } + if (other.hasComposeId()) { + setComposeId(other.composeId); + } if (other.hasCount()) { setCount(other.count); } @@ -257,8 +257,8 @@ public ComposeItemScRsp clear() { } cachedSize = -1; bitField0_ = 0; - composeId = 0; retcode = 0; + composeId = 0; count = 0; returnItemList.clear(); return this; @@ -285,8 +285,8 @@ public boolean equals(Object o) { } ComposeItemScRsp other = (ComposeItemScRsp) o; return bitField0_ == other.bitField0_ - && (!hasComposeId() || composeId == other.composeId) && (!hasRetcode() || retcode == other.retcode) + && (!hasComposeId() || composeId == other.composeId) && (!hasCount() || count == other.count) && (!hasReturnItemList() || returnItemList.equals(other.returnItemList)); } @@ -294,19 +294,19 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); - output.writeUInt32NoTag(composeId); + output.writeRawByte((byte) 16); + output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 40); - output.writeUInt32NoTag(retcode); + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(composeId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(count); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 26); + output.writeRawByte((byte) 74); output.writeMessageNoTag(returnItemList); } } @@ -315,10 +315,10 @@ public void writeTo(final ProtoSink output) throws IOException { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(composeId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(composeId); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(count); @@ -336,34 +336,34 @@ public ComposeItemScRsp mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { - // composeId - composeId = input.readUInt32(); + case 16: { + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 40) { + if (tag != 56) { break; } } - case 40: { - // retcode - retcode = input.readUInt32(); + case 56: { + // composeId + composeId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 72) { + if (tag != 112) { break; } } - case 72: { + case 112: { // count count = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 26) { + if (tag != 74) { break; } } - case 26: { + case 74: { // returnItemList input.readMessage(returnItemList); bitField0_ |= 0x00000008; @@ -390,10 +390,10 @@ public ComposeItemScRsp mergeFrom(final ProtoSource input) throws IOException { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.composeId, composeId); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.composeId, composeId); } if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.count, count); @@ -411,11 +411,10 @@ public ComposeItemScRsp mergeFrom(final JsonSource input) throws IOException { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1399759283: - case -442843416: { - if (input.isAtField(FieldNames.composeId)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - composeId = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -423,10 +422,11 @@ public ComposeItemScRsp mergeFrom(final JsonSource input) throws IOException { } break; } - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case -1399759283: + case -442843416: { + if (input.isAtField(FieldNames.composeId)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + composeId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -510,10 +510,10 @@ public ComposeItemScRsp create() { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName composeId = FieldName.forField("composeId", "compose_id"); - static final FieldName retcode = FieldName.forField("retcode"); + static final FieldName composeId = FieldName.forField("composeId", "compose_id"); + static final FieldName count = FieldName.forField("count"); static final FieldName returnItemList = FieldName.forField("returnItemList", "return_item_list"); diff --git a/src/generated/main/emu/lunarcore/proto/ComposeSelectedRelicCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/ComposeSelectedRelicCsReqOuterClass.java index f3efc6bb7..e4f21fa01 100644 --- a/src/generated/main/emu/lunarcore/proto/ComposeSelectedRelicCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ComposeSelectedRelicCsReqOuterClass.java @@ -19,27 +19,27 @@ public static final class ComposeSelectedRelicCsReq extends ProtoMessageoptional uint32 compose_relic_id = 3; + * optional uint32 count = 9; */ - private int composeRelicId; + private int count; /** - * optional uint32 compose_id = 5; + * optional uint32 compose_id = 10; */ private int composeId; /** - * optional uint32 count = 11; + * optional uint32 main_affix_id = 13; */ - private int count; + private int mainAffixId; /** - * optional uint32 main_affix_id = 13; + * optional uint32 compose_relic_id = 14; */ - private int mainAffixId; + private int composeRelicId; /** - * optional .ItemCostList compose_item_list = 9; + * optional .ItemCostList compose_item_list = 6; */ private final ItemCostListOuterClass.ItemCostList composeItemList = ItemCostListOuterClass.ItemCostList.newInstance(); @@ -54,44 +54,44 @@ public static ComposeSelectedRelicCsReq newInstance() { } /** - * optional uint32 compose_relic_id = 3; - * @return whether the composeRelicId field is set + * optional uint32 count = 9; + * @return whether the count field is set */ - public boolean hasComposeRelicId() { + public boolean hasCount() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 compose_relic_id = 3; + * optional uint32 count = 9; * @return this */ - public ComposeSelectedRelicCsReq clearComposeRelicId() { + public ComposeSelectedRelicCsReq clearCount() { bitField0_ &= ~0x00000001; - composeRelicId = 0; + count = 0; return this; } /** - * optional uint32 compose_relic_id = 3; - * @return the composeRelicId + * optional uint32 count = 9; + * @return the count */ - public int getComposeRelicId() { - return composeRelicId; + public int getCount() { + return count; } /** - * optional uint32 compose_relic_id = 3; - * @param value the composeRelicId to set + * optional uint32 count = 9; + * @param value the count to set * @return this */ - public ComposeSelectedRelicCsReq setComposeRelicId(final int value) { + public ComposeSelectedRelicCsReq setCount(final int value) { bitField0_ |= 0x00000001; - composeRelicId = value; + count = value; return this; } /** - * optional uint32 compose_id = 5; + * optional uint32 compose_id = 10; * @return whether the composeId field is set */ public boolean hasComposeId() { @@ -99,7 +99,7 @@ public boolean hasComposeId() { } /** - * optional uint32 compose_id = 5; + * optional uint32 compose_id = 10; * @return this */ public ComposeSelectedRelicCsReq clearComposeId() { @@ -109,7 +109,7 @@ public ComposeSelectedRelicCsReq clearComposeId() { } /** - * optional uint32 compose_id = 5; + * optional uint32 compose_id = 10; * @return the composeId */ public int getComposeId() { @@ -117,7 +117,7 @@ public int getComposeId() { } /** - * optional uint32 compose_id = 5; + * optional uint32 compose_id = 10; * @param value the composeId to set * @return this */ @@ -128,81 +128,81 @@ public ComposeSelectedRelicCsReq setComposeId(final int value) { } /** - * optional uint32 count = 11; - * @return whether the count field is set + * optional uint32 main_affix_id = 13; + * @return whether the mainAffixId field is set */ - public boolean hasCount() { + public boolean hasMainAffixId() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 count = 11; + * optional uint32 main_affix_id = 13; * @return this */ - public ComposeSelectedRelicCsReq clearCount() { + public ComposeSelectedRelicCsReq clearMainAffixId() { bitField0_ &= ~0x00000004; - count = 0; + mainAffixId = 0; return this; } /** - * optional uint32 count = 11; - * @return the count + * optional uint32 main_affix_id = 13; + * @return the mainAffixId */ - public int getCount() { - return count; + public int getMainAffixId() { + return mainAffixId; } /** - * optional uint32 count = 11; - * @param value the count to set + * optional uint32 main_affix_id = 13; + * @param value the mainAffixId to set * @return this */ - public ComposeSelectedRelicCsReq setCount(final int value) { + public ComposeSelectedRelicCsReq setMainAffixId(final int value) { bitField0_ |= 0x00000004; - count = value; + mainAffixId = value; return this; } /** - * optional uint32 main_affix_id = 13; - * @return whether the mainAffixId field is set + * optional uint32 compose_relic_id = 14; + * @return whether the composeRelicId field is set */ - public boolean hasMainAffixId() { + public boolean hasComposeRelicId() { return (bitField0_ & 0x00000008) != 0; } /** - * optional uint32 main_affix_id = 13; + * optional uint32 compose_relic_id = 14; * @return this */ - public ComposeSelectedRelicCsReq clearMainAffixId() { + public ComposeSelectedRelicCsReq clearComposeRelicId() { bitField0_ &= ~0x00000008; - mainAffixId = 0; + composeRelicId = 0; return this; } /** - * optional uint32 main_affix_id = 13; - * @return the mainAffixId + * optional uint32 compose_relic_id = 14; + * @return the composeRelicId */ - public int getMainAffixId() { - return mainAffixId; + public int getComposeRelicId() { + return composeRelicId; } /** - * optional uint32 main_affix_id = 13; - * @param value the mainAffixId to set + * optional uint32 compose_relic_id = 14; + * @param value the composeRelicId to set * @return this */ - public ComposeSelectedRelicCsReq setMainAffixId(final int value) { + public ComposeSelectedRelicCsReq setComposeRelicId(final int value) { bitField0_ |= 0x00000008; - mainAffixId = value; + composeRelicId = value; return this; } /** - * optional .ItemCostList compose_item_list = 9; + * optional .ItemCostList compose_item_list = 6; * @return whether the composeItemList field is set */ public boolean hasComposeItemList() { @@ -210,7 +210,7 @@ public boolean hasComposeItemList() { } /** - * optional .ItemCostList compose_item_list = 9; + * optional .ItemCostList compose_item_list = 6; * @return this */ public ComposeSelectedRelicCsReq clearComposeItemList() { @@ -220,7 +220,7 @@ public ComposeSelectedRelicCsReq clearComposeItemList() { } /** - * optional .ItemCostList compose_item_list = 9; + * optional .ItemCostList compose_item_list = 6; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -234,7 +234,7 @@ public ItemCostListOuterClass.ItemCostList getComposeItemList() { } /** - * optional .ItemCostList compose_item_list = 9; + * optional .ItemCostList compose_item_list = 6; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -248,7 +248,7 @@ public ItemCostListOuterClass.ItemCostList getMutableComposeItemList() { } /** - * optional .ItemCostList compose_item_list = 9; + * optional .ItemCostList compose_item_list = 6; * @param value the composeItemList to set * @return this */ @@ -264,10 +264,10 @@ public ComposeSelectedRelicCsReq copyFrom(final ComposeSelectedRelicCsReq other) cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - composeRelicId = other.composeRelicId; - composeId = other.composeId; count = other.count; + composeId = other.composeId; mainAffixId = other.mainAffixId; + composeRelicId = other.composeRelicId; composeItemList.copyFrom(other.composeItemList); } return this; @@ -279,18 +279,18 @@ public ComposeSelectedRelicCsReq mergeFrom(final ComposeSelectedRelicCsReq other return this; } cachedSize = -1; - if (other.hasComposeRelicId()) { - setComposeRelicId(other.composeRelicId); + if (other.hasCount()) { + setCount(other.count); } if (other.hasComposeId()) { setComposeId(other.composeId); } - if (other.hasCount()) { - setCount(other.count); - } if (other.hasMainAffixId()) { setMainAffixId(other.mainAffixId); } + if (other.hasComposeRelicId()) { + setComposeRelicId(other.composeRelicId); + } if (other.hasComposeItemList()) { getMutableComposeItemList().mergeFrom(other.composeItemList); } @@ -304,10 +304,10 @@ public ComposeSelectedRelicCsReq clear() { } cachedSize = -1; bitField0_ = 0; - composeRelicId = 0; - composeId = 0; count = 0; + composeId = 0; mainAffixId = 0; + composeRelicId = 0; composeItemList.clear(); return this; } @@ -333,33 +333,33 @@ public boolean equals(Object o) { } ComposeSelectedRelicCsReq other = (ComposeSelectedRelicCsReq) o; return bitField0_ == other.bitField0_ - && (!hasComposeRelicId() || composeRelicId == other.composeRelicId) - && (!hasComposeId() || composeId == other.composeId) && (!hasCount() || count == other.count) + && (!hasComposeId() || composeId == other.composeId) && (!hasMainAffixId() || mainAffixId == other.mainAffixId) + && (!hasComposeRelicId() || composeRelicId == other.composeRelicId) && (!hasComposeItemList() || composeItemList.equals(other.composeItemList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); - output.writeUInt32NoTag(composeRelicId); + output.writeRawByte((byte) 72); + output.writeUInt32NoTag(count); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(composeId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 88); - output.writeUInt32NoTag(count); - } - if ((bitField0_ & 0x00000008) != 0) { output.writeRawByte((byte) 104); output.writeUInt32NoTag(mainAffixId); } + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(composeRelicId); + } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 74); + output.writeRawByte((byte) 50); output.writeMessageNoTag(composeItemList); } } @@ -368,16 +368,16 @@ public void writeTo(final ProtoSink output) throws IOException { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(composeRelicId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(count); } if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(composeId); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(count); + size += 1 + ProtoSink.computeUInt32SizeNoTag(mainAffixId); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(mainAffixId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(composeRelicId); } if ((bitField0_ & 0x00000010) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(composeItemList); @@ -392,43 +392,43 @@ public ComposeSelectedRelicCsReq mergeFrom(final ProtoSource input) throws IOExc int tag = input.readTag(); while (true) { switch (tag) { - case 24: { - // composeRelicId - composeRelicId = input.readUInt32(); + case 72: { + // count + count = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 40) { + if (tag != 80) { break; } } - case 40: { + case 80: { // composeId composeId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 88) { + if (tag != 104) { break; } } - case 88: { - // count - count = input.readUInt32(); + case 104: { + // mainAffixId + mainAffixId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 104) { + if (tag != 112) { break; } } - case 104: { - // mainAffixId - mainAffixId = input.readUInt32(); + case 112: { + // composeRelicId + composeRelicId = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 74) { + if (tag != 50) { break; } } - case 74: { + case 50: { // composeItemList input.readMessage(composeItemList); bitField0_ |= 0x00000010; @@ -455,16 +455,16 @@ public ComposeSelectedRelicCsReq mergeFrom(final ProtoSource input) throws IOExc public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.composeRelicId, composeRelicId); + output.writeUInt32(FieldNames.count, count); } if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.composeId, composeId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.count, count); + output.writeUInt32(FieldNames.mainAffixId, mainAffixId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.mainAffixId, mainAffixId); + output.writeUInt32(FieldNames.composeRelicId, composeRelicId); } if ((bitField0_ & 0x00000010) != 0) { output.writeMessage(FieldNames.composeItemList, composeItemList); @@ -479,11 +479,10 @@ public ComposeSelectedRelicCsReq mergeFrom(final JsonSource input) throws IOExce } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1424923132: - case 885799284: { - if (input.isAtField(FieldNames.composeRelicId)) { + case 94851343: { + if (input.isAtField(FieldNames.count)) { if (!input.trySkipNullValue()) { - composeRelicId = input.readUInt32(); + count = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -503,10 +502,11 @@ public ComposeSelectedRelicCsReq mergeFrom(final JsonSource input) throws IOExce } break; } - case 94851343: { - if (input.isAtField(FieldNames.count)) { + case -1973876974: + case -1426712144: { + if (input.isAtField(FieldNames.mainAffixId)) { if (!input.trySkipNullValue()) { - count = input.readUInt32(); + mainAffixId = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -514,11 +514,11 @@ public ComposeSelectedRelicCsReq mergeFrom(final JsonSource input) throws IOExce } break; } - case -1973876974: - case -1426712144: { - if (input.isAtField(FieldNames.mainAffixId)) { + case 1424923132: + case 885799284: { + if (input.isAtField(FieldNames.composeRelicId)) { if (!input.trySkipNullValue()) { - mainAffixId = input.readUInt32(); + composeRelicId = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -591,14 +591,14 @@ public ComposeSelectedRelicCsReq create() { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName composeRelicId = FieldName.forField("composeRelicId", "compose_relic_id"); + static final FieldName count = FieldName.forField("count"); static final FieldName composeId = FieldName.forField("composeId", "compose_id"); - static final FieldName count = FieldName.forField("count"); - static final FieldName mainAffixId = FieldName.forField("mainAffixId", "main_affix_id"); + static final FieldName composeRelicId = FieldName.forField("composeRelicId", "compose_relic_id"); + static final FieldName composeItemList = FieldName.forField("composeItemList", "compose_item_list"); } } diff --git a/src/generated/main/emu/lunarcore/proto/ComposeSelectedRelicScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/ComposeSelectedRelicScRspOuterClass.java index f8cc52f55..b01995b3d 100644 --- a/src/generated/main/emu/lunarcore/proto/ComposeSelectedRelicScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ComposeSelectedRelicScRspOuterClass.java @@ -19,17 +19,17 @@ public static final class ComposeSelectedRelicScRsp extends ProtoMessageoptional uint32 retcode = 1; + * optional uint32 compose_id = 5; */ - private int retcode; + private int composeId; /** - * optional uint32 compose_id = 8; + * optional uint32 retcode = 7; */ - private int composeId; + private int retcode; /** - * optional .ItemList return_item_list = 2; + * optional .ItemList return_item_list = 14; */ private final ItemListOuterClass.ItemList returnItemList = ItemListOuterClass.ItemList.newInstance(); @@ -44,81 +44,81 @@ public static ComposeSelectedRelicScRsp newInstance() { } /** - * optional uint32 retcode = 1; - * @return whether the retcode field is set + * optional uint32 compose_id = 5; + * @return whether the composeId field is set */ - public boolean hasRetcode() { + public boolean hasComposeId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 retcode = 1; + * optional uint32 compose_id = 5; * @return this */ - public ComposeSelectedRelicScRsp clearRetcode() { + public ComposeSelectedRelicScRsp clearComposeId() { bitField0_ &= ~0x00000001; - retcode = 0; + composeId = 0; return this; } /** - * optional uint32 retcode = 1; - * @return the retcode + * optional uint32 compose_id = 5; + * @return the composeId */ - public int getRetcode() { - return retcode; + public int getComposeId() { + return composeId; } /** - * optional uint32 retcode = 1; - * @param value the retcode to set + * optional uint32 compose_id = 5; + * @param value the composeId to set * @return this */ - public ComposeSelectedRelicScRsp setRetcode(final int value) { + public ComposeSelectedRelicScRsp setComposeId(final int value) { bitField0_ |= 0x00000001; - retcode = value; + composeId = value; return this; } /** - * optional uint32 compose_id = 8; - * @return whether the composeId field is set + * optional uint32 retcode = 7; + * @return whether the retcode field is set */ - public boolean hasComposeId() { + public boolean hasRetcode() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 compose_id = 8; + * optional uint32 retcode = 7; * @return this */ - public ComposeSelectedRelicScRsp clearComposeId() { + public ComposeSelectedRelicScRsp clearRetcode() { bitField0_ &= ~0x00000002; - composeId = 0; + retcode = 0; return this; } /** - * optional uint32 compose_id = 8; - * @return the composeId + * optional uint32 retcode = 7; + * @return the retcode */ - public int getComposeId() { - return composeId; + public int getRetcode() { + return retcode; } /** - * optional uint32 compose_id = 8; - * @param value the composeId to set + * optional uint32 retcode = 7; + * @param value the retcode to set * @return this */ - public ComposeSelectedRelicScRsp setComposeId(final int value) { + public ComposeSelectedRelicScRsp setRetcode(final int value) { bitField0_ |= 0x00000002; - composeId = value; + retcode = value; return this; } /** - * optional .ItemList return_item_list = 2; + * optional .ItemList return_item_list = 14; * @return whether the returnItemList field is set */ public boolean hasReturnItemList() { @@ -126,7 +126,7 @@ public boolean hasReturnItemList() { } /** - * optional .ItemList return_item_list = 2; + * optional .ItemList return_item_list = 14; * @return this */ public ComposeSelectedRelicScRsp clearReturnItemList() { @@ -136,7 +136,7 @@ public ComposeSelectedRelicScRsp clearReturnItemList() { } /** - * optional .ItemList return_item_list = 2; + * optional .ItemList return_item_list = 14; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -150,7 +150,7 @@ public ItemListOuterClass.ItemList getReturnItemList() { } /** - * optional .ItemList return_item_list = 2; + * optional .ItemList return_item_list = 14; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -164,7 +164,7 @@ public ItemListOuterClass.ItemList getMutableReturnItemList() { } /** - * optional .ItemList return_item_list = 2; + * optional .ItemList return_item_list = 14; * @param value the returnItemList to set * @return this */ @@ -179,8 +179,8 @@ public ComposeSelectedRelicScRsp copyFrom(final ComposeSelectedRelicScRsp other) cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - retcode = other.retcode; composeId = other.composeId; + retcode = other.retcode; returnItemList.copyFrom(other.returnItemList); } return this; @@ -192,12 +192,12 @@ public ComposeSelectedRelicScRsp mergeFrom(final ComposeSelectedRelicScRsp other return this; } cachedSize = -1; - if (other.hasRetcode()) { - setRetcode(other.retcode); - } if (other.hasComposeId()) { setComposeId(other.composeId); } + if (other.hasRetcode()) { + setRetcode(other.retcode); + } if (other.hasReturnItemList()) { getMutableReturnItemList().mergeFrom(other.returnItemList); } @@ -211,8 +211,8 @@ public ComposeSelectedRelicScRsp clear() { } cachedSize = -1; bitField0_ = 0; - retcode = 0; composeId = 0; + retcode = 0; returnItemList.clear(); return this; } @@ -238,23 +238,23 @@ public boolean equals(Object o) { } ComposeSelectedRelicScRsp other = (ComposeSelectedRelicScRsp) o; return bitField0_ == other.bitField0_ - && (!hasRetcode() || retcode == other.retcode) && (!hasComposeId() || composeId == other.composeId) + && (!hasRetcode() || retcode == other.retcode) && (!hasReturnItemList() || returnItemList.equals(other.returnItemList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); - output.writeUInt32NoTag(retcode); + output.writeRawByte((byte) 40); + output.writeUInt32NoTag(composeId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 64); - output.writeUInt32NoTag(composeId); + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 18); + output.writeRawByte((byte) 114); output.writeMessageNoTag(returnItemList); } } @@ -263,10 +263,10 @@ public void writeTo(final ProtoSink output) throws IOException { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(composeId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(composeId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(returnItemList); @@ -281,25 +281,25 @@ public ComposeSelectedRelicScRsp mergeFrom(final ProtoSource input) throws IOExc int tag = input.readTag(); while (true) { switch (tag) { - case 8: { - // retcode - retcode = input.readUInt32(); + case 40: { + // composeId + composeId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 64) { + if (tag != 56) { break; } } - case 64: { - // composeId - composeId = input.readUInt32(); + case 56: { + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 18) { + if (tag != 114) { break; } } - case 18: { + case 114: { // returnItemList input.readMessage(returnItemList); bitField0_ |= 0x00000004; @@ -326,10 +326,10 @@ public ComposeSelectedRelicScRsp mergeFrom(final ProtoSource input) throws IOExc public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.composeId, composeId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.composeId, composeId); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000004) != 0) { output.writeMessage(FieldNames.returnItemList, returnItemList); @@ -344,10 +344,11 @@ public ComposeSelectedRelicScRsp mergeFrom(final JsonSource input) throws IOExce } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case -1399759283: + case -442843416: { + if (input.isAtField(FieldNames.composeId)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + composeId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -355,11 +356,10 @@ public ComposeSelectedRelicScRsp mergeFrom(final JsonSource input) throws IOExce } break; } - case -1399759283: - case -442843416: { - if (input.isAtField(FieldNames.composeId)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - composeId = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -432,10 +432,10 @@ public ComposeSelectedRelicScRsp create() { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName composeId = FieldName.forField("composeId", "compose_id"); + static final FieldName retcode = FieldName.forField("retcode"); + static final FieldName returnItemList = FieldName.forField("returnItemList", "return_item_list"); } } diff --git a/src/generated/main/emu/lunarcore/proto/DailyActiveInfoNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/DailyActiveInfoNotifyOuterClass.java index f7442e6af..54c33a586 100644 --- a/src/generated/main/emu/lunarcore/proto/DailyActiveInfoNotifyOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/DailyActiveInfoNotifyOuterClass.java @@ -21,17 +21,17 @@ public static final class DailyActiveInfoNotify extends ProtoMessageoptional uint32 daily_active_point = 12; + * optional uint32 daily_active_point = 14; */ private int dailyActivePoint; /** - * repeated uint32 daily_active_quest_id_list = 1; + * repeated uint32 daily_active_quest_id_list = 12; */ private final RepeatedInt dailyActiveQuestIdList = RepeatedInt.newEmptyInstance(); /** - * repeated .DailyActivityInfo daily_active_level_list = 2; + * repeated .DailyActivityInfo daily_active_level_list = 15; */ private final RepeatedMessage dailyActiveLevelList = RepeatedMessage.newEmptyInstance(DailyActivityInfoOuterClass.DailyActivityInfo.getFactory()); @@ -46,7 +46,7 @@ public static DailyActiveInfoNotify newInstance() { } /** - * optional uint32 daily_active_point = 12; + * optional uint32 daily_active_point = 14; * @return whether the dailyActivePoint field is set */ public boolean hasDailyActivePoint() { @@ -54,7 +54,7 @@ public boolean hasDailyActivePoint() { } /** - * optional uint32 daily_active_point = 12; + * optional uint32 daily_active_point = 14; * @return this */ public DailyActiveInfoNotify clearDailyActivePoint() { @@ -64,7 +64,7 @@ public DailyActiveInfoNotify clearDailyActivePoint() { } /** - * optional uint32 daily_active_point = 12; + * optional uint32 daily_active_point = 14; * @return the dailyActivePoint */ public int getDailyActivePoint() { @@ -72,7 +72,7 @@ public int getDailyActivePoint() { } /** - * optional uint32 daily_active_point = 12; + * optional uint32 daily_active_point = 14; * @param value the dailyActivePoint to set * @return this */ @@ -83,7 +83,7 @@ public DailyActiveInfoNotify setDailyActivePoint(final int value) { } /** - * repeated uint32 daily_active_quest_id_list = 1; + * repeated uint32 daily_active_quest_id_list = 12; * @return whether the dailyActiveQuestIdList field is set */ public boolean hasDailyActiveQuestIdList() { @@ -91,7 +91,7 @@ public boolean hasDailyActiveQuestIdList() { } /** - * repeated uint32 daily_active_quest_id_list = 1; + * repeated uint32 daily_active_quest_id_list = 12; * @return this */ public DailyActiveInfoNotify clearDailyActiveQuestIdList() { @@ -101,7 +101,7 @@ public DailyActiveInfoNotify clearDailyActiveQuestIdList() { } /** - * repeated uint32 daily_active_quest_id_list = 1; + * repeated uint32 daily_active_quest_id_list = 12; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -115,7 +115,7 @@ public RepeatedInt getDailyActiveQuestIdList() { } /** - * repeated uint32 daily_active_quest_id_list = 1; + * repeated uint32 daily_active_quest_id_list = 12; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -129,7 +129,7 @@ public RepeatedInt getMutableDailyActiveQuestIdList() { } /** - * repeated uint32 daily_active_quest_id_list = 1; + * repeated uint32 daily_active_quest_id_list = 12; * @param value the dailyActiveQuestIdList to add * @return this */ @@ -140,7 +140,7 @@ public DailyActiveInfoNotify addDailyActiveQuestIdList(final int value) { } /** - * repeated uint32 daily_active_quest_id_list = 1; + * repeated uint32 daily_active_quest_id_list = 12; * @param values the dailyActiveQuestIdList to add * @return this */ @@ -151,7 +151,7 @@ public DailyActiveInfoNotify addAllDailyActiveQuestIdList(final int... values) { } /** - * repeated .DailyActivityInfo daily_active_level_list = 2; + * repeated .DailyActivityInfo daily_active_level_list = 15; * @return whether the dailyActiveLevelList field is set */ public boolean hasDailyActiveLevelList() { @@ -159,7 +159,7 @@ public boolean hasDailyActiveLevelList() { } /** - * repeated .DailyActivityInfo daily_active_level_list = 2; + * repeated .DailyActivityInfo daily_active_level_list = 15; * @return this */ public DailyActiveInfoNotify clearDailyActiveLevelList() { @@ -169,7 +169,7 @@ public DailyActiveInfoNotify clearDailyActiveLevelList() { } /** - * repeated .DailyActivityInfo daily_active_level_list = 2; + * repeated .DailyActivityInfo daily_active_level_list = 15; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -184,7 +184,7 @@ public RepeatedMessage getDailyAc } /** - * repeated .DailyActivityInfo daily_active_level_list = 2; + * repeated .DailyActivityInfo daily_active_level_list = 15; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -199,7 +199,7 @@ public RepeatedMessage getMutable } /** - * repeated .DailyActivityInfo daily_active_level_list = 2; + * repeated .DailyActivityInfo daily_active_level_list = 15; * @param value the dailyActiveLevelList to add * @return this */ @@ -211,7 +211,7 @@ public DailyActiveInfoNotify addDailyActiveLevelList( } /** - * repeated .DailyActivityInfo daily_active_level_list = 2; + * repeated .DailyActivityInfo daily_active_level_list = 15; * @param values the dailyActiveLevelList to add * @return this */ @@ -295,18 +295,18 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(dailyActivePoint); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < dailyActiveQuestIdList.length(); i++) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(dailyActiveQuestIdList.array()[i]); } } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < dailyActiveLevelList.length(); i++) { - output.writeRawByte((byte) 18); + output.writeRawByte((byte) 122); output.writeMessageNoTag(dailyActiveLevelList.get(i)); } } @@ -334,25 +334,25 @@ public DailyActiveInfoNotify mergeFrom(final ProtoSource input) throws IOExcepti int tag = input.readTag(); while (true) { switch (tag) { - case 96: { + case 112: { // dailyActivePoint dailyActivePoint = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 10) { + if (tag != 98) { break; } } - case 10: { + case 98: { // dailyActiveQuestIdList [packed=true] input.readPackedUInt32(dailyActiveQuestIdList, tag); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 18) { + if (tag != 122) { break; } } - case 18: { + case 122: { // dailyActiveLevelList tag = input.readRepeatedMessage(dailyActiveLevelList, tag); bitField0_ |= 0x00000004; @@ -370,7 +370,7 @@ public DailyActiveInfoNotify mergeFrom(final ProtoSource input) throws IOExcepti tag = input.readTag(); break; } - case 8: { + case 96: { // dailyActiveQuestIdList [packed=false] tag = input.readRepeatedUInt32(dailyActiveQuestIdList, tag); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/DailyActivityInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/DailyActivityInfoOuterClass.java index e5d52221d..ffdf03eec 100644 --- a/src/generated/main/emu/lunarcore/proto/DailyActivityInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/DailyActivityInfoOuterClass.java @@ -19,22 +19,22 @@ public static final class DailyActivityInfo extends ProtoMessageoptional uint32 daily_active_point = 2; + * optional uint32 daily_active_point = 6; */ private int dailyActivePoint; /** - * optional uint32 level = 10; + * optional uint32 level = 8; */ private int level; /** - * optional uint32 world_level = 12; + * optional uint32 world_level = 15; */ private int worldLevel; /** - * optional bool is_has_taken = 8; + * optional bool is_has_taken = 11; */ private boolean isHasTaken; @@ -49,7 +49,7 @@ public static DailyActivityInfo newInstance() { } /** - * optional uint32 daily_active_point = 2; + * optional uint32 daily_active_point = 6; * @return whether the dailyActivePoint field is set */ public boolean hasDailyActivePoint() { @@ -57,7 +57,7 @@ public boolean hasDailyActivePoint() { } /** - * optional uint32 daily_active_point = 2; + * optional uint32 daily_active_point = 6; * @return this */ public DailyActivityInfo clearDailyActivePoint() { @@ -67,7 +67,7 @@ public DailyActivityInfo clearDailyActivePoint() { } /** - * optional uint32 daily_active_point = 2; + * optional uint32 daily_active_point = 6; * @return the dailyActivePoint */ public int getDailyActivePoint() { @@ -75,7 +75,7 @@ public int getDailyActivePoint() { } /** - * optional uint32 daily_active_point = 2; + * optional uint32 daily_active_point = 6; * @param value the dailyActivePoint to set * @return this */ @@ -86,7 +86,7 @@ public DailyActivityInfo setDailyActivePoint(final int value) { } /** - * optional uint32 level = 10; + * optional uint32 level = 8; * @return whether the level field is set */ public boolean hasLevel() { @@ -94,7 +94,7 @@ public boolean hasLevel() { } /** - * optional uint32 level = 10; + * optional uint32 level = 8; * @return this */ public DailyActivityInfo clearLevel() { @@ -104,7 +104,7 @@ public DailyActivityInfo clearLevel() { } /** - * optional uint32 level = 10; + * optional uint32 level = 8; * @return the level */ public int getLevel() { @@ -112,7 +112,7 @@ public int getLevel() { } /** - * optional uint32 level = 10; + * optional uint32 level = 8; * @param value the level to set * @return this */ @@ -123,7 +123,7 @@ public DailyActivityInfo setLevel(final int value) { } /** - * optional uint32 world_level = 12; + * optional uint32 world_level = 15; * @return whether the worldLevel field is set */ public boolean hasWorldLevel() { @@ -131,7 +131,7 @@ public boolean hasWorldLevel() { } /** - * optional uint32 world_level = 12; + * optional uint32 world_level = 15; * @return this */ public DailyActivityInfo clearWorldLevel() { @@ -141,7 +141,7 @@ public DailyActivityInfo clearWorldLevel() { } /** - * optional uint32 world_level = 12; + * optional uint32 world_level = 15; * @return the worldLevel */ public int getWorldLevel() { @@ -149,7 +149,7 @@ public int getWorldLevel() { } /** - * optional uint32 world_level = 12; + * optional uint32 world_level = 15; * @param value the worldLevel to set * @return this */ @@ -160,7 +160,7 @@ public DailyActivityInfo setWorldLevel(final int value) { } /** - * optional bool is_has_taken = 8; + * optional bool is_has_taken = 11; * @return whether the isHasTaken field is set */ public boolean hasIsHasTaken() { @@ -168,7 +168,7 @@ public boolean hasIsHasTaken() { } /** - * optional bool is_has_taken = 8; + * optional bool is_has_taken = 11; * @return this */ public DailyActivityInfo clearIsHasTaken() { @@ -178,7 +178,7 @@ public DailyActivityInfo clearIsHasTaken() { } /** - * optional bool is_has_taken = 8; + * optional bool is_has_taken = 11; * @return the isHasTaken */ public boolean getIsHasTaken() { @@ -186,7 +186,7 @@ public boolean getIsHasTaken() { } /** - * optional bool is_has_taken = 8; + * optional bool is_has_taken = 11; * @param value the isHasTaken to set * @return this */ @@ -273,19 +273,19 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(dailyActivePoint); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(level); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(worldLevel); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 88); output.writeBoolNoTag(isHasTaken); } } @@ -315,34 +315,34 @@ public DailyActivityInfo mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { + case 48: { // dailyActivePoint dailyActivePoint = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 80) { + if (tag != 64) { break; } } - case 80: { + case 64: { // level level = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 96) { + if (tag != 120) { break; } } - case 96: { + case 120: { // worldLevel worldLevel = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 64) { + if (tag != 88) { break; } } - case 64: { + case 88: { // isHasTaken isHasTaken = input.readBool(); bitField0_ |= 0x00000008; diff --git a/src/generated/main/emu/lunarcore/proto/DeactivateFarmElementCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/DeactivateFarmElementCsReqOuterClass.java new file mode 100644 index 000000000..c5a581ebb --- /dev/null +++ b/src/generated/main/emu/lunarcore/proto/DeactivateFarmElementCsReqOuterClass.java @@ -0,0 +1,260 @@ +// Code generated by protocol buffer compiler. Do not edit! +package emu.lunarcore.proto; + +import java.io.IOException; +import us.hebi.quickbuf.FieldName; +import us.hebi.quickbuf.InvalidProtocolBufferException; +import us.hebi.quickbuf.JsonSink; +import us.hebi.quickbuf.JsonSource; +import us.hebi.quickbuf.MessageFactory; +import us.hebi.quickbuf.ProtoMessage; +import us.hebi.quickbuf.ProtoSink; +import us.hebi.quickbuf.ProtoSource; + +public final class DeactivateFarmElementCsReqOuterClass { + /** + * Protobuf type {@code DeactivateFarmElementCsReq} + */ + public static final class DeactivateFarmElementCsReq extends ProtoMessage implements Cloneable { + private static final long serialVersionUID = 0L; + + /** + * optional uint32 entity_id = 9; + */ + private int entityId; + + private DeactivateFarmElementCsReq() { + } + + /** + * @return a new empty instance of {@code DeactivateFarmElementCsReq} + */ + public static DeactivateFarmElementCsReq newInstance() { + return new DeactivateFarmElementCsReq(); + } + + /** + * optional uint32 entity_id = 9; + * @return whether the entityId field is set + */ + public boolean hasEntityId() { + return (bitField0_ & 0x00000001) != 0; + } + + /** + * optional uint32 entity_id = 9; + * @return this + */ + public DeactivateFarmElementCsReq clearEntityId() { + bitField0_ &= ~0x00000001; + entityId = 0; + return this; + } + + /** + * optional uint32 entity_id = 9; + * @return the entityId + */ + public int getEntityId() { + return entityId; + } + + /** + * optional uint32 entity_id = 9; + * @param value the entityId to set + * @return this + */ + public DeactivateFarmElementCsReq setEntityId(final int value) { + bitField0_ |= 0x00000001; + entityId = value; + return this; + } + + @Override + public DeactivateFarmElementCsReq copyFrom(final DeactivateFarmElementCsReq other) { + cachedSize = other.cachedSize; + if ((bitField0_ | other.bitField0_) != 0) { + bitField0_ = other.bitField0_; + entityId = other.entityId; + } + return this; + } + + @Override + public DeactivateFarmElementCsReq mergeFrom(final DeactivateFarmElementCsReq other) { + if (other.isEmpty()) { + return this; + } + cachedSize = -1; + if (other.hasEntityId()) { + setEntityId(other.entityId); + } + return this; + } + + @Override + public DeactivateFarmElementCsReq clear() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + entityId = 0; + return this; + } + + @Override + public DeactivateFarmElementCsReq clearQuick() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + return this; + } + + @Override + public boolean equals(Object o) { + if (o == this) { + return true; + } + if (!(o instanceof DeactivateFarmElementCsReq)) { + return false; + } + DeactivateFarmElementCsReq other = (DeactivateFarmElementCsReq) o; + return bitField0_ == other.bitField0_ + && (!hasEntityId() || entityId == other.entityId); + } + + @Override + public void writeTo(final ProtoSink output) throws IOException { + if ((bitField0_ & 0x00000001) != 0) { + output.writeRawByte((byte) 72); + output.writeUInt32NoTag(entityId); + } + } + + @Override + protected int computeSerializedSize() { + int size = 0; + if ((bitField0_ & 0x00000001) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(entityId); + } + return size; + } + + @Override + @SuppressWarnings("fallthrough") + public DeactivateFarmElementCsReq mergeFrom(final ProtoSource input) throws IOException { + // Enabled Fall-Through Optimization (QuickBuffers) + int tag = input.readTag(); + while (true) { + switch (tag) { + case 72: { + // entityId + entityId = input.readUInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 0) { + break; + } + } + case 0: { + return this; + } + default: { + if (!input.skipField(tag)) { + return this; + } + tag = input.readTag(); + break; + } + } + } + } + + @Override + public void writeTo(final JsonSink output) throws IOException { + output.beginObject(); + if ((bitField0_ & 0x00000001) != 0) { + output.writeUInt32(FieldNames.entityId, entityId); + } + output.endObject(); + } + + @Override + public DeactivateFarmElementCsReq mergeFrom(final JsonSource input) throws IOException { + if (!input.beginObject()) { + return this; + } + while (!input.isAtEnd()) { + switch (input.readFieldHash()) { + case -2102099874: + case -740565257: { + if (input.isAtField(FieldNames.entityId)) { + if (!input.trySkipNullValue()) { + entityId = input.readUInt32(); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } + default: { + input.skipUnknownField(); + break; + } + } + } + input.endObject(); + return this; + } + + @Override + public DeactivateFarmElementCsReq clone() { + return new DeactivateFarmElementCsReq().copyFrom(this); + } + + @Override + public boolean isEmpty() { + return ((bitField0_) == 0); + } + + public static DeactivateFarmElementCsReq parseFrom(final byte[] data) throws + InvalidProtocolBufferException { + return ProtoMessage.mergeFrom(new DeactivateFarmElementCsReq(), data).checkInitialized(); + } + + public static DeactivateFarmElementCsReq parseFrom(final ProtoSource input) throws IOException { + return ProtoMessage.mergeFrom(new DeactivateFarmElementCsReq(), input).checkInitialized(); + } + + public static DeactivateFarmElementCsReq parseFrom(final JsonSource input) throws IOException { + return ProtoMessage.mergeFrom(new DeactivateFarmElementCsReq(), input).checkInitialized(); + } + + /** + * @return factory for creating DeactivateFarmElementCsReq messages + */ + public static MessageFactory getFactory() { + return DeactivateFarmElementCsReqFactory.INSTANCE; + } + + private enum DeactivateFarmElementCsReqFactory implements MessageFactory { + INSTANCE; + + @Override + public DeactivateFarmElementCsReq create() { + return DeactivateFarmElementCsReq.newInstance(); + } + } + + /** + * Contains name constants used for serializing JSON + */ + static class FieldNames { + static final FieldName entityId = FieldName.forField("entityId", "entity_id"); + } + } +} diff --git a/src/generated/main/emu/lunarcore/proto/DeactivateFarmElementScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/DeactivateFarmElementScRspOuterClass.java new file mode 100644 index 000000000..7d67c9b9d --- /dev/null +++ b/src/generated/main/emu/lunarcore/proto/DeactivateFarmElementScRspOuterClass.java @@ -0,0 +1,340 @@ +// Code generated by protocol buffer compiler. Do not edit! +package emu.lunarcore.proto; + +import java.io.IOException; +import us.hebi.quickbuf.FieldName; +import us.hebi.quickbuf.InvalidProtocolBufferException; +import us.hebi.quickbuf.JsonSink; +import us.hebi.quickbuf.JsonSource; +import us.hebi.quickbuf.MessageFactory; +import us.hebi.quickbuf.ProtoMessage; +import us.hebi.quickbuf.ProtoSink; +import us.hebi.quickbuf.ProtoSource; + +public final class DeactivateFarmElementScRspOuterClass { + /** + * Protobuf type {@code DeactivateFarmElementScRsp} + */ + public static final class DeactivateFarmElementScRsp extends ProtoMessage implements Cloneable { + private static final long serialVersionUID = 0L; + + /** + * optional uint32 entity_id = 5; + */ + private int entityId; + + /** + * optional uint32 retcode = 15; + */ + private int retcode; + + private DeactivateFarmElementScRsp() { + } + + /** + * @return a new empty instance of {@code DeactivateFarmElementScRsp} + */ + public static DeactivateFarmElementScRsp newInstance() { + return new DeactivateFarmElementScRsp(); + } + + /** + * optional uint32 entity_id = 5; + * @return whether the entityId field is set + */ + public boolean hasEntityId() { + return (bitField0_ & 0x00000001) != 0; + } + + /** + * optional uint32 entity_id = 5; + * @return this + */ + public DeactivateFarmElementScRsp clearEntityId() { + bitField0_ &= ~0x00000001; + entityId = 0; + return this; + } + + /** + * optional uint32 entity_id = 5; + * @return the entityId + */ + public int getEntityId() { + return entityId; + } + + /** + * optional uint32 entity_id = 5; + * @param value the entityId to set + * @return this + */ + public DeactivateFarmElementScRsp setEntityId(final int value) { + bitField0_ |= 0x00000001; + entityId = value; + return this; + } + + /** + * optional uint32 retcode = 15; + * @return whether the retcode field is set + */ + public boolean hasRetcode() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 retcode = 15; + * @return this + */ + public DeactivateFarmElementScRsp clearRetcode() { + bitField0_ &= ~0x00000002; + retcode = 0; + return this; + } + + /** + * optional uint32 retcode = 15; + * @return the retcode + */ + public int getRetcode() { + return retcode; + } + + /** + * optional uint32 retcode = 15; + * @param value the retcode to set + * @return this + */ + public DeactivateFarmElementScRsp setRetcode(final int value) { + bitField0_ |= 0x00000002; + retcode = value; + return this; + } + + @Override + public DeactivateFarmElementScRsp copyFrom(final DeactivateFarmElementScRsp other) { + cachedSize = other.cachedSize; + if ((bitField0_ | other.bitField0_) != 0) { + bitField0_ = other.bitField0_; + entityId = other.entityId; + retcode = other.retcode; + } + return this; + } + + @Override + public DeactivateFarmElementScRsp mergeFrom(final DeactivateFarmElementScRsp other) { + if (other.isEmpty()) { + return this; + } + cachedSize = -1; + if (other.hasEntityId()) { + setEntityId(other.entityId); + } + if (other.hasRetcode()) { + setRetcode(other.retcode); + } + return this; + } + + @Override + public DeactivateFarmElementScRsp clear() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + entityId = 0; + retcode = 0; + return this; + } + + @Override + public DeactivateFarmElementScRsp clearQuick() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + return this; + } + + @Override + public boolean equals(Object o) { + if (o == this) { + return true; + } + if (!(o instanceof DeactivateFarmElementScRsp)) { + return false; + } + DeactivateFarmElementScRsp other = (DeactivateFarmElementScRsp) o; + return bitField0_ == other.bitField0_ + && (!hasEntityId() || entityId == other.entityId) + && (!hasRetcode() || retcode == other.retcode); + } + + @Override + public void writeTo(final ProtoSink output) throws IOException { + if ((bitField0_ & 0x00000001) != 0) { + output.writeRawByte((byte) 40); + output.writeUInt32NoTag(entityId); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 120); + output.writeUInt32NoTag(retcode); + } + } + + @Override + protected int computeSerializedSize() { + int size = 0; + if ((bitField0_ & 0x00000001) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(entityId); + } + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + } + return size; + } + + @Override + @SuppressWarnings("fallthrough") + public DeactivateFarmElementScRsp mergeFrom(final ProtoSource input) throws IOException { + // Enabled Fall-Through Optimization (QuickBuffers) + int tag = input.readTag(); + while (true) { + switch (tag) { + case 40: { + // entityId + entityId = input.readUInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 120) { + break; + } + } + case 120: { + // retcode + retcode = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 0) { + break; + } + } + case 0: { + return this; + } + default: { + if (!input.skipField(tag)) { + return this; + } + tag = input.readTag(); + break; + } + } + } + } + + @Override + public void writeTo(final JsonSink output) throws IOException { + output.beginObject(); + if ((bitField0_ & 0x00000001) != 0) { + output.writeUInt32(FieldNames.entityId, entityId); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeUInt32(FieldNames.retcode, retcode); + } + output.endObject(); + } + + @Override + public DeactivateFarmElementScRsp mergeFrom(final JsonSource input) throws IOException { + if (!input.beginObject()) { + return this; + } + while (!input.isAtEnd()) { + switch (input.readFieldHash()) { + case -2102099874: + case -740565257: { + if (input.isAtField(FieldNames.entityId)) { + if (!input.trySkipNullValue()) { + entityId = input.readUInt32(); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { + if (!input.trySkipNullValue()) { + retcode = input.readUInt32(); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + default: { + input.skipUnknownField(); + break; + } + } + } + input.endObject(); + return this; + } + + @Override + public DeactivateFarmElementScRsp clone() { + return new DeactivateFarmElementScRsp().copyFrom(this); + } + + @Override + public boolean isEmpty() { + return ((bitField0_) == 0); + } + + public static DeactivateFarmElementScRsp parseFrom(final byte[] data) throws + InvalidProtocolBufferException { + return ProtoMessage.mergeFrom(new DeactivateFarmElementScRsp(), data).checkInitialized(); + } + + public static DeactivateFarmElementScRsp parseFrom(final ProtoSource input) throws IOException { + return ProtoMessage.mergeFrom(new DeactivateFarmElementScRsp(), input).checkInitialized(); + } + + public static DeactivateFarmElementScRsp parseFrom(final JsonSource input) throws IOException { + return ProtoMessage.mergeFrom(new DeactivateFarmElementScRsp(), input).checkInitialized(); + } + + /** + * @return factory for creating DeactivateFarmElementScRsp messages + */ + public static MessageFactory getFactory() { + return DeactivateFarmElementScRspFactory.INSTANCE; + } + + private enum DeactivateFarmElementScRspFactory implements MessageFactory { + INSTANCE; + + @Override + public DeactivateFarmElementScRsp create() { + return DeactivateFarmElementScRsp.newInstance(); + } + } + + /** + * Contains name constants used for serializing JSON + */ + static class FieldNames { + static final FieldName entityId = FieldName.forField("entityId", "entity_id"); + + static final FieldName retcode = FieldName.forField("retcode"); + } + } +} diff --git a/src/generated/main/emu/lunarcore/proto/DelMailCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/DelMailCsReqOuterClass.java index fe622de93..17bb3a939 100644 --- a/src/generated/main/emu/lunarcore/proto/DelMailCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/DelMailCsReqOuterClass.java @@ -20,7 +20,7 @@ public static final class DelMailCsReq extends ProtoMessage implem private static final long serialVersionUID = 0L; /** - * repeated uint32 id_list = 13; + * repeated uint32 id_list = 8; */ private final RepeatedInt idList = RepeatedInt.newEmptyInstance(); @@ -35,7 +35,7 @@ public static DelMailCsReq newInstance() { } /** - * repeated uint32 id_list = 13; + * repeated uint32 id_list = 8; * @return whether the idList field is set */ public boolean hasIdList() { @@ -43,7 +43,7 @@ public boolean hasIdList() { } /** - * repeated uint32 id_list = 13; + * repeated uint32 id_list = 8; * @return this */ public DelMailCsReq clearIdList() { @@ -53,7 +53,7 @@ public DelMailCsReq clearIdList() { } /** - * repeated uint32 id_list = 13; + * repeated uint32 id_list = 8; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -67,7 +67,7 @@ public RepeatedInt getIdList() { } /** - * repeated uint32 id_list = 13; + * repeated uint32 id_list = 8; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -81,7 +81,7 @@ public RepeatedInt getMutableIdList() { } /** - * repeated uint32 id_list = 13; + * repeated uint32 id_list = 8; * @param value the idList to add * @return this */ @@ -92,7 +92,7 @@ public DelMailCsReq addIdList(final int value) { } /** - * repeated uint32 id_list = 13; + * repeated uint32 id_list = 8; * @param values the idList to add * @return this */ @@ -163,7 +163,7 @@ public boolean equals(Object o) { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { for (int i = 0; i < idList.length(); i++) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(idList.array()[i]); } } @@ -185,7 +185,7 @@ public DelMailCsReq mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 106: { + case 66: { // idList [packed=true] input.readPackedUInt32(idList, tag); bitField0_ |= 0x00000001; @@ -204,7 +204,7 @@ public DelMailCsReq mergeFrom(final ProtoSource input) throws IOException { tag = input.readTag(); break; } - case 104: { + case 64: { // idList [packed=false] tag = input.readRepeatedUInt32(idList, tag); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/DelMailScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/DelMailScRspOuterClass.java index e9cb96269..736301eef 100644 --- a/src/generated/main/emu/lunarcore/proto/DelMailScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/DelMailScRspOuterClass.java @@ -20,12 +20,12 @@ public static final class DelMailScRsp extends ProtoMessage implem private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 4; */ private int retcode; /** - * repeated uint32 id_list = 5; + * repeated uint32 id_list = 7; */ private final RepeatedInt idList = RepeatedInt.newEmptyInstance(); @@ -40,7 +40,7 @@ public static DelMailScRsp newInstance() { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 4; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -48,7 +48,7 @@ public boolean hasRetcode() { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 4; * @return this */ public DelMailScRsp clearRetcode() { @@ -58,7 +58,7 @@ public DelMailScRsp clearRetcode() { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 4; * @return the retcode */ public int getRetcode() { @@ -66,7 +66,7 @@ public int getRetcode() { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 4; * @param value the retcode to set * @return this */ @@ -77,7 +77,7 @@ public DelMailScRsp setRetcode(final int value) { } /** - * repeated uint32 id_list = 5; + * repeated uint32 id_list = 7; * @return whether the idList field is set */ public boolean hasIdList() { @@ -85,7 +85,7 @@ public boolean hasIdList() { } /** - * repeated uint32 id_list = 5; + * repeated uint32 id_list = 7; * @return this */ public DelMailScRsp clearIdList() { @@ -95,7 +95,7 @@ public DelMailScRsp clearIdList() { } /** - * repeated uint32 id_list = 5; + * repeated uint32 id_list = 7; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -109,7 +109,7 @@ public RepeatedInt getIdList() { } /** - * repeated uint32 id_list = 5; + * repeated uint32 id_list = 7; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -123,7 +123,7 @@ public RepeatedInt getMutableIdList() { } /** - * repeated uint32 id_list = 5; + * repeated uint32 id_list = 7; * @param value the idList to add * @return this */ @@ -134,7 +134,7 @@ public DelMailScRsp addIdList(final int value) { } /** - * repeated uint32 id_list = 5; + * repeated uint32 id_list = 7; * @param values the idList to add * @return this */ @@ -210,12 +210,12 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < idList.length(); i++) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(idList.array()[i]); } } @@ -240,16 +240,16 @@ public DelMailScRsp mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { + case 32: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 42) { + if (tag != 58) { break; } } - case 42: { + case 58: { // idList [packed=true] input.readPackedUInt32(idList, tag); bitField0_ |= 0x00000002; @@ -268,7 +268,7 @@ public DelMailScRsp mergeFrom(final ProtoSource input) throws IOException { tag = input.readTag(); break; } - case 40: { + case 56: { // idList [packed=false] tag = input.readRepeatedUInt32(idList, tag); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/DeleteFriendCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/DeleteFriendCsReqOuterClass.java index d468153e1..cb981b910 100644 --- a/src/generated/main/emu/lunarcore/proto/DeleteFriendCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/DeleteFriendCsReqOuterClass.java @@ -19,7 +19,7 @@ public static final class DeleteFriendCsReq extends ProtoMessageoptional uint32 uid = 2; + * optional uint32 uid = 3; */ private int uid; @@ -34,7 +34,7 @@ public static DeleteFriendCsReq newInstance() { } /** - * optional uint32 uid = 2; + * optional uint32 uid = 3; * @return whether the uid field is set */ public boolean hasUid() { @@ -42,7 +42,7 @@ public boolean hasUid() { } /** - * optional uint32 uid = 2; + * optional uint32 uid = 3; * @return this */ public DeleteFriendCsReq clearUid() { @@ -52,7 +52,7 @@ public DeleteFriendCsReq clearUid() { } /** - * optional uint32 uid = 2; + * optional uint32 uid = 3; * @return the uid */ public int getUid() { @@ -60,7 +60,7 @@ public int getUid() { } /** - * optional uint32 uid = 2; + * optional uint32 uid = 3; * @param value the uid to set * @return this */ @@ -129,7 +129,7 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(uid); } } @@ -150,7 +150,7 @@ public DeleteFriendCsReq mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { + case 24: { // uid uid = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/OFHBFINPHAGOuterClass.java b/src/generated/main/emu/lunarcore/proto/DeployRotaterCsReqOuterClass.java similarity index 50% rename from src/generated/main/emu/lunarcore/proto/OFHBFINPHAGOuterClass.java rename to src/generated/main/emu/lunarcore/proto/DeployRotaterCsReqOuterClass.java index c1150c940..72234064f 100644 --- a/src/generated/main/emu/lunarcore/proto/OFHBFINPHAGOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/DeployRotaterCsReqOuterClass.java @@ -10,64 +10,63 @@ import us.hebi.quickbuf.ProtoMessage; import us.hebi.quickbuf.ProtoSink; import us.hebi.quickbuf.ProtoSource; -import us.hebi.quickbuf.RepeatedInt; -public final class OFHBFINPHAGOuterClass { +public final class DeployRotaterCsReqOuterClass { /** - * Protobuf type {@code OFHBFINPHAG} + * Protobuf type {@code DeployRotaterCsReq} */ - public static final class OFHBFINPHAG extends ProtoMessage implements Cloneable { + public static final class DeployRotaterCsReq extends ProtoMessage implements Cloneable { private static final long serialVersionUID = 0L; /** - * repeated uint32 AALLCOBKIDB = 14; + * optional .RotaterData rotater_data = 4; */ - private final RepeatedInt aALLCOBKIDB = RepeatedInt.newEmptyInstance(); + private final RotaterDataOuterClass.RotaterData rotaterData = RotaterDataOuterClass.RotaterData.newInstance(); - private OFHBFINPHAG() { + private DeployRotaterCsReq() { } /** - * @return a new empty instance of {@code OFHBFINPHAG} + * @return a new empty instance of {@code DeployRotaterCsReq} */ - public static OFHBFINPHAG newInstance() { - return new OFHBFINPHAG(); + public static DeployRotaterCsReq newInstance() { + return new DeployRotaterCsReq(); } /** - * repeated uint32 AALLCOBKIDB = 14; - * @return whether the aALLCOBKIDB field is set + * optional .RotaterData rotater_data = 4; + * @return whether the rotaterData field is set */ - public boolean hasAALLCOBKIDB() { + public boolean hasRotaterData() { return (bitField0_ & 0x00000001) != 0; } /** - * repeated uint32 AALLCOBKIDB = 14; + * optional .RotaterData rotater_data = 4; * @return this */ - public OFHBFINPHAG clearAALLCOBKIDB() { + public DeployRotaterCsReq clearRotaterData() { bitField0_ &= ~0x00000001; - aALLCOBKIDB.clear(); + rotaterData.clear(); return this; } /** - * repeated uint32 AALLCOBKIDB = 14; + * optional .RotaterData rotater_data = 4; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. * - * Use {@link #getMutableAALLCOBKIDB()} if you want to modify it. + * Use {@link #getMutableRotaterData()} if you want to modify it. * * @return internal storage object for reading */ - public RepeatedInt getAALLCOBKIDB() { - return aALLCOBKIDB; + public RotaterDataOuterClass.RotaterData getRotaterData() { + return rotaterData; } /** - * repeated uint32 AALLCOBKIDB = 14; + * optional .RotaterData rotater_data = 4; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -75,74 +74,63 @@ public RepeatedInt getAALLCOBKIDB() { * * @return internal storage object for modifications */ - public RepeatedInt getMutableAALLCOBKIDB() { + public RotaterDataOuterClass.RotaterData getMutableRotaterData() { bitField0_ |= 0x00000001; - return aALLCOBKIDB; + return rotaterData; } /** - * repeated uint32 AALLCOBKIDB = 14; - * @param value the aALLCOBKIDB to add + * optional .RotaterData rotater_data = 4; + * @param value the rotaterData to set * @return this */ - public OFHBFINPHAG addAALLCOBKIDB(final int value) { + public DeployRotaterCsReq setRotaterData(final RotaterDataOuterClass.RotaterData value) { bitField0_ |= 0x00000001; - aALLCOBKIDB.add(value); - return this; - } - - /** - * repeated uint32 AALLCOBKIDB = 14; - * @param values the aALLCOBKIDB to add - * @return this - */ - public OFHBFINPHAG addAllAALLCOBKIDB(final int... values) { - bitField0_ |= 0x00000001; - aALLCOBKIDB.addAll(values); + rotaterData.copyFrom(value); return this; } @Override - public OFHBFINPHAG copyFrom(final OFHBFINPHAG other) { + public DeployRotaterCsReq copyFrom(final DeployRotaterCsReq other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - aALLCOBKIDB.copyFrom(other.aALLCOBKIDB); + rotaterData.copyFrom(other.rotaterData); } return this; } @Override - public OFHBFINPHAG mergeFrom(final OFHBFINPHAG other) { + public DeployRotaterCsReq mergeFrom(final DeployRotaterCsReq other) { if (other.isEmpty()) { return this; } cachedSize = -1; - if (other.hasAALLCOBKIDB()) { - getMutableAALLCOBKIDB().addAll(other.aALLCOBKIDB); + if (other.hasRotaterData()) { + getMutableRotaterData().mergeFrom(other.rotaterData); } return this; } @Override - public OFHBFINPHAG clear() { + public DeployRotaterCsReq clear() { if (isEmpty()) { return this; } cachedSize = -1; bitField0_ = 0; - aALLCOBKIDB.clear(); + rotaterData.clear(); return this; } @Override - public OFHBFINPHAG clearQuick() { + public DeployRotaterCsReq clearQuick() { if (isEmpty()) { return this; } cachedSize = -1; bitField0_ = 0; - aALLCOBKIDB.clear(); + rotaterData.clearQuick(); return this; } @@ -151,21 +139,19 @@ public boolean equals(Object o) { if (o == this) { return true; } - if (!(o instanceof OFHBFINPHAG)) { + if (!(o instanceof DeployRotaterCsReq)) { return false; } - OFHBFINPHAG other = (OFHBFINPHAG) o; + DeployRotaterCsReq other = (DeployRotaterCsReq) o; return bitField0_ == other.bitField0_ - && (!hasAALLCOBKIDB() || aALLCOBKIDB.equals(other.aALLCOBKIDB)); + && (!hasRotaterData() || rotaterData.equals(other.rotaterData)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - for (int i = 0; i < aALLCOBKIDB.length(); i++) { - output.writeRawByte((byte) 112); - output.writeUInt32NoTag(aALLCOBKIDB.array()[i]); - } + output.writeRawByte((byte) 34); + output.writeMessageNoTag(rotaterData); } } @@ -173,21 +159,21 @@ public void writeTo(final ProtoSink output) throws IOException { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += (1 * aALLCOBKIDB.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(aALLCOBKIDB); + size += 1 + ProtoSink.computeMessageSizeNoTag(rotaterData); } return size; } @Override @SuppressWarnings("fallthrough") - public OFHBFINPHAG mergeFrom(final ProtoSource input) throws IOException { + public DeployRotaterCsReq mergeFrom(final ProtoSource input) throws IOException { // Enabled Fall-Through Optimization (QuickBuffers) int tag = input.readTag(); while (true) { switch (tag) { - case 114: { - // aALLCOBKIDB [packed=true] - input.readPackedUInt32(aALLCOBKIDB, tag); + case 34: { + // rotaterData + input.readMessage(rotaterData); bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 0) { @@ -204,12 +190,6 @@ public OFHBFINPHAG mergeFrom(final ProtoSource input) throws IOException { tag = input.readTag(); break; } - case 112: { - // aALLCOBKIDB [packed=false] - tag = input.readRepeatedUInt32(aALLCOBKIDB, tag); - bitField0_ |= 0x00000001; - break; - } } } } @@ -218,22 +198,23 @@ public OFHBFINPHAG mergeFrom(final ProtoSource input) throws IOException { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeRepeatedUInt32(FieldNames.aALLCOBKIDB, aALLCOBKIDB); + output.writeMessage(FieldNames.rotaterData, rotaterData); } output.endObject(); } @Override - public OFHBFINPHAG mergeFrom(final JsonSource input) throws IOException { + public DeployRotaterCsReq mergeFrom(final JsonSource input) throws IOException { if (!input.beginObject()) { return this; } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 313982738: { - if (input.isAtField(FieldNames.aALLCOBKIDB)) { + case 1880563393: + case -1807070094: { + if (input.isAtField(FieldNames.rotaterData)) { if (!input.trySkipNullValue()) { - input.readRepeatedUInt32(aALLCOBKIDB); + input.readMessage(rotaterData); bitField0_ |= 0x00000001; } } else { @@ -252,8 +233,8 @@ public OFHBFINPHAG mergeFrom(final JsonSource input) throws IOException { } @Override - public OFHBFINPHAG clone() { - return new OFHBFINPHAG().copyFrom(this); + public DeployRotaterCsReq clone() { + return new DeployRotaterCsReq().copyFrom(this); } @Override @@ -261,31 +242,32 @@ public boolean isEmpty() { return ((bitField0_) == 0); } - public static OFHBFINPHAG parseFrom(final byte[] data) throws InvalidProtocolBufferException { - return ProtoMessage.mergeFrom(new OFHBFINPHAG(), data).checkInitialized(); + public static DeployRotaterCsReq parseFrom(final byte[] data) throws + InvalidProtocolBufferException { + return ProtoMessage.mergeFrom(new DeployRotaterCsReq(), data).checkInitialized(); } - public static OFHBFINPHAG parseFrom(final ProtoSource input) throws IOException { - return ProtoMessage.mergeFrom(new OFHBFINPHAG(), input).checkInitialized(); + public static DeployRotaterCsReq parseFrom(final ProtoSource input) throws IOException { + return ProtoMessage.mergeFrom(new DeployRotaterCsReq(), input).checkInitialized(); } - public static OFHBFINPHAG parseFrom(final JsonSource input) throws IOException { - return ProtoMessage.mergeFrom(new OFHBFINPHAG(), input).checkInitialized(); + public static DeployRotaterCsReq parseFrom(final JsonSource input) throws IOException { + return ProtoMessage.mergeFrom(new DeployRotaterCsReq(), input).checkInitialized(); } /** - * @return factory for creating OFHBFINPHAG messages + * @return factory for creating DeployRotaterCsReq messages */ - public static MessageFactory getFactory() { - return OFHBFINPHAGFactory.INSTANCE; + public static MessageFactory getFactory() { + return DeployRotaterCsReqFactory.INSTANCE; } - private enum OFHBFINPHAGFactory implements MessageFactory { + private enum DeployRotaterCsReqFactory implements MessageFactory { INSTANCE; @Override - public OFHBFINPHAG create() { - return OFHBFINPHAG.newInstance(); + public DeployRotaterCsReq create() { + return DeployRotaterCsReq.newInstance(); } } @@ -293,7 +275,7 @@ public OFHBFINPHAG create() { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName aALLCOBKIDB = FieldName.forField("AALLCOBKIDB"); + static final FieldName rotaterData = FieldName.forField("rotaterData", "rotater_data"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/DeployRotaterScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/DeployRotaterScRspOuterClass.java new file mode 100644 index 000000000..0ffc00a61 --- /dev/null +++ b/src/generated/main/emu/lunarcore/proto/DeployRotaterScRspOuterClass.java @@ -0,0 +1,789 @@ +// Code generated by protocol buffer compiler. Do not edit! +package emu.lunarcore.proto; + +import java.io.IOException; +import us.hebi.quickbuf.FieldName; +import us.hebi.quickbuf.InvalidProtocolBufferException; +import us.hebi.quickbuf.JsonSink; +import us.hebi.quickbuf.JsonSource; +import us.hebi.quickbuf.MessageFactory; +import us.hebi.quickbuf.ProtoMessage; +import us.hebi.quickbuf.ProtoSink; +import us.hebi.quickbuf.ProtoSource; + +public final class DeployRotaterScRspOuterClass { + /** + * Protobuf type {@code DeployRotaterScRsp} + */ + public static final class DeployRotaterScRsp extends ProtoMessage implements Cloneable { + private static final long serialVersionUID = 0L; + + /** + * optional uint32 retcode = 3; + */ + private int retcode; + + /** + * optional .DeployRotaterScRsp.EnergyInfo energy_info = 7; + */ + private final EnergyInfo energyInfo = EnergyInfo.newInstance(); + + /** + * optional .RotaterData rotater_data = 9; + */ + private final RotaterDataOuterClass.RotaterData rotaterData = RotaterDataOuterClass.RotaterData.newInstance(); + + private DeployRotaterScRsp() { + } + + /** + * @return a new empty instance of {@code DeployRotaterScRsp} + */ + public static DeployRotaterScRsp newInstance() { + return new DeployRotaterScRsp(); + } + + /** + * optional uint32 retcode = 3; + * @return whether the retcode field is set + */ + public boolean hasRetcode() { + return (bitField0_ & 0x00000001) != 0; + } + + /** + * optional uint32 retcode = 3; + * @return this + */ + public DeployRotaterScRsp clearRetcode() { + bitField0_ &= ~0x00000001; + retcode = 0; + return this; + } + + /** + * optional uint32 retcode = 3; + * @return the retcode + */ + public int getRetcode() { + return retcode; + } + + /** + * optional uint32 retcode = 3; + * @param value the retcode to set + * @return this + */ + public DeployRotaterScRsp setRetcode(final int value) { + bitField0_ |= 0x00000001; + retcode = value; + return this; + } + + /** + * optional .DeployRotaterScRsp.EnergyInfo energy_info = 7; + * @return whether the energyInfo field is set + */ + public boolean hasEnergyInfo() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional .DeployRotaterScRsp.EnergyInfo energy_info = 7; + * @return this + */ + public DeployRotaterScRsp clearEnergyInfo() { + bitField0_ &= ~0x00000002; + energyInfo.clear(); + return this; + } + + /** + * optional .DeployRotaterScRsp.EnergyInfo energy_info = 7; + * + * This method returns the internal storage object without modifying any has state. + * The returned object should not be modified and be treated as read-only. + * + * Use {@link #getMutableEnergyInfo()} if you want to modify it. + * + * @return internal storage object for reading + */ + public EnergyInfo getEnergyInfo() { + return energyInfo; + } + + /** + * optional .DeployRotaterScRsp.EnergyInfo energy_info = 7; + * + * This method returns the internal storage object and sets the corresponding + * has state. The returned object will become part of this message and its + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public EnergyInfo getMutableEnergyInfo() { + bitField0_ |= 0x00000002; + return energyInfo; + } + + /** + * optional .DeployRotaterScRsp.EnergyInfo energy_info = 7; + * @param value the energyInfo to set + * @return this + */ + public DeployRotaterScRsp setEnergyInfo(final EnergyInfo value) { + bitField0_ |= 0x00000002; + energyInfo.copyFrom(value); + return this; + } + + /** + * optional .RotaterData rotater_data = 9; + * @return whether the rotaterData field is set + */ + public boolean hasRotaterData() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional .RotaterData rotater_data = 9; + * @return this + */ + public DeployRotaterScRsp clearRotaterData() { + bitField0_ &= ~0x00000004; + rotaterData.clear(); + return this; + } + + /** + * optional .RotaterData rotater_data = 9; + * + * This method returns the internal storage object without modifying any has state. + * The returned object should not be modified and be treated as read-only. + * + * Use {@link #getMutableRotaterData()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RotaterDataOuterClass.RotaterData getRotaterData() { + return rotaterData; + } + + /** + * optional .RotaterData rotater_data = 9; + * + * This method returns the internal storage object and sets the corresponding + * has state. The returned object will become part of this message and its + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public RotaterDataOuterClass.RotaterData getMutableRotaterData() { + bitField0_ |= 0x00000004; + return rotaterData; + } + + /** + * optional .RotaterData rotater_data = 9; + * @param value the rotaterData to set + * @return this + */ + public DeployRotaterScRsp setRotaterData(final RotaterDataOuterClass.RotaterData value) { + bitField0_ |= 0x00000004; + rotaterData.copyFrom(value); + return this; + } + + @Override + public DeployRotaterScRsp copyFrom(final DeployRotaterScRsp other) { + cachedSize = other.cachedSize; + if ((bitField0_ | other.bitField0_) != 0) { + bitField0_ = other.bitField0_; + retcode = other.retcode; + energyInfo.copyFrom(other.energyInfo); + rotaterData.copyFrom(other.rotaterData); + } + return this; + } + + @Override + public DeployRotaterScRsp mergeFrom(final DeployRotaterScRsp other) { + if (other.isEmpty()) { + return this; + } + cachedSize = -1; + if (other.hasRetcode()) { + setRetcode(other.retcode); + } + if (other.hasEnergyInfo()) { + getMutableEnergyInfo().mergeFrom(other.energyInfo); + } + if (other.hasRotaterData()) { + getMutableRotaterData().mergeFrom(other.rotaterData); + } + return this; + } + + @Override + public DeployRotaterScRsp clear() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + retcode = 0; + energyInfo.clear(); + rotaterData.clear(); + return this; + } + + @Override + public DeployRotaterScRsp clearQuick() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + energyInfo.clearQuick(); + rotaterData.clearQuick(); + return this; + } + + @Override + public boolean equals(Object o) { + if (o == this) { + return true; + } + if (!(o instanceof DeployRotaterScRsp)) { + return false; + } + DeployRotaterScRsp other = (DeployRotaterScRsp) o; + return bitField0_ == other.bitField0_ + && (!hasRetcode() || retcode == other.retcode) + && (!hasEnergyInfo() || energyInfo.equals(other.energyInfo)) + && (!hasRotaterData() || rotaterData.equals(other.rotaterData)); + } + + @Override + public void writeTo(final ProtoSink output) throws IOException { + if ((bitField0_ & 0x00000001) != 0) { + output.writeRawByte((byte) 24); + output.writeUInt32NoTag(retcode); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 58); + output.writeMessageNoTag(energyInfo); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 74); + output.writeMessageNoTag(rotaterData); + } + } + + @Override + protected int computeSerializedSize() { + int size = 0; + if ((bitField0_ & 0x00000001) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + } + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeMessageSizeNoTag(energyInfo); + } + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeMessageSizeNoTag(rotaterData); + } + return size; + } + + @Override + @SuppressWarnings("fallthrough") + public DeployRotaterScRsp mergeFrom(final ProtoSource input) throws IOException { + // Enabled Fall-Through Optimization (QuickBuffers) + int tag = input.readTag(); + while (true) { + switch (tag) { + case 24: { + // retcode + retcode = input.readUInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 58) { + break; + } + } + case 58: { + // energyInfo + input.readMessage(energyInfo); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 74) { + break; + } + } + case 74: { + // rotaterData + input.readMessage(rotaterData); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 0) { + break; + } + } + case 0: { + return this; + } + default: { + if (!input.skipField(tag)) { + return this; + } + tag = input.readTag(); + break; + } + } + } + } + + @Override + public void writeTo(final JsonSink output) throws IOException { + output.beginObject(); + if ((bitField0_ & 0x00000001) != 0) { + output.writeUInt32(FieldNames.retcode, retcode); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeMessage(FieldNames.energyInfo, energyInfo); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeMessage(FieldNames.rotaterData, rotaterData); + } + output.endObject(); + } + + @Override + public DeployRotaterScRsp mergeFrom(final JsonSource input) throws IOException { + if (!input.beginObject()) { + return this; + } + while (!input.isAtEnd()) { + switch (input.readFieldHash()) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { + if (!input.trySkipNullValue()) { + retcode = input.readUInt32(); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } + case 1464698710: + case -1818804219: { + if (input.isAtField(FieldNames.energyInfo)) { + if (!input.trySkipNullValue()) { + input.readMessage(energyInfo); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + case 1880563393: + case -1807070094: { + if (input.isAtField(FieldNames.rotaterData)) { + if (!input.trySkipNullValue()) { + input.readMessage(rotaterData); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } + default: { + input.skipUnknownField(); + break; + } + } + } + input.endObject(); + return this; + } + + @Override + public DeployRotaterScRsp clone() { + return new DeployRotaterScRsp().copyFrom(this); + } + + @Override + public boolean isEmpty() { + return ((bitField0_) == 0); + } + + public static DeployRotaterScRsp parseFrom(final byte[] data) throws + InvalidProtocolBufferException { + return ProtoMessage.mergeFrom(new DeployRotaterScRsp(), data).checkInitialized(); + } + + public static DeployRotaterScRsp parseFrom(final ProtoSource input) throws IOException { + return ProtoMessage.mergeFrom(new DeployRotaterScRsp(), input).checkInitialized(); + } + + public static DeployRotaterScRsp parseFrom(final JsonSource input) throws IOException { + return ProtoMessage.mergeFrom(new DeployRotaterScRsp(), input).checkInitialized(); + } + + /** + * @return factory for creating DeployRotaterScRsp messages + */ + public static MessageFactory getFactory() { + return DeployRotaterScRspFactory.INSTANCE; + } + + /** + * Protobuf type {@code EnergyInfo} + */ + public static final class EnergyInfo extends ProtoMessage implements Cloneable { + private static final long serialVersionUID = 0L; + + /** + * optional uint32 cur_num = 3; + */ + private int curNum; + + /** + * optional uint32 max_num = 14; + */ + private int maxNum; + + private EnergyInfo() { + } + + /** + * @return a new empty instance of {@code EnergyInfo} + */ + public static EnergyInfo newInstance() { + return new EnergyInfo(); + } + + /** + * optional uint32 cur_num = 3; + * @return whether the curNum field is set + */ + public boolean hasCurNum() { + return (bitField0_ & 0x00000001) != 0; + } + + /** + * optional uint32 cur_num = 3; + * @return this + */ + public EnergyInfo clearCurNum() { + bitField0_ &= ~0x00000001; + curNum = 0; + return this; + } + + /** + * optional uint32 cur_num = 3; + * @return the curNum + */ + public int getCurNum() { + return curNum; + } + + /** + * optional uint32 cur_num = 3; + * @param value the curNum to set + * @return this + */ + public EnergyInfo setCurNum(final int value) { + bitField0_ |= 0x00000001; + curNum = value; + return this; + } + + /** + * optional uint32 max_num = 14; + * @return whether the maxNum field is set + */ + public boolean hasMaxNum() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 max_num = 14; + * @return this + */ + public EnergyInfo clearMaxNum() { + bitField0_ &= ~0x00000002; + maxNum = 0; + return this; + } + + /** + * optional uint32 max_num = 14; + * @return the maxNum + */ + public int getMaxNum() { + return maxNum; + } + + /** + * optional uint32 max_num = 14; + * @param value the maxNum to set + * @return this + */ + public EnergyInfo setMaxNum(final int value) { + bitField0_ |= 0x00000002; + maxNum = value; + return this; + } + + @Override + public EnergyInfo copyFrom(final EnergyInfo other) { + cachedSize = other.cachedSize; + if ((bitField0_ | other.bitField0_) != 0) { + bitField0_ = other.bitField0_; + curNum = other.curNum; + maxNum = other.maxNum; + } + return this; + } + + @Override + public EnergyInfo mergeFrom(final EnergyInfo other) { + if (other.isEmpty()) { + return this; + } + cachedSize = -1; + if (other.hasCurNum()) { + setCurNum(other.curNum); + } + if (other.hasMaxNum()) { + setMaxNum(other.maxNum); + } + return this; + } + + @Override + public EnergyInfo clear() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + curNum = 0; + maxNum = 0; + return this; + } + + @Override + public EnergyInfo clearQuick() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + return this; + } + + @Override + public boolean equals(Object o) { + if (o == this) { + return true; + } + if (!(o instanceof EnergyInfo)) { + return false; + } + EnergyInfo other = (EnergyInfo) o; + return bitField0_ == other.bitField0_ + && (!hasCurNum() || curNum == other.curNum) + && (!hasMaxNum() || maxNum == other.maxNum); + } + + @Override + public void writeTo(final ProtoSink output) throws IOException { + if ((bitField0_ & 0x00000001) != 0) { + output.writeRawByte((byte) 24); + output.writeUInt32NoTag(curNum); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(maxNum); + } + } + + @Override + protected int computeSerializedSize() { + int size = 0; + if ((bitField0_ & 0x00000001) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(curNum); + } + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(maxNum); + } + return size; + } + + @Override + @SuppressWarnings("fallthrough") + public EnergyInfo mergeFrom(final ProtoSource input) throws IOException { + // Enabled Fall-Through Optimization (QuickBuffers) + int tag = input.readTag(); + while (true) { + switch (tag) { + case 24: { + // curNum + curNum = input.readUInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 112) { + break; + } + } + case 112: { + // maxNum + maxNum = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 0) { + break; + } + } + case 0: { + return this; + } + default: { + if (!input.skipField(tag)) { + return this; + } + tag = input.readTag(); + break; + } + } + } + } + + @Override + public void writeTo(final JsonSink output) throws IOException { + output.beginObject(); + if ((bitField0_ & 0x00000001) != 0) { + output.writeUInt32(FieldNames.curNum, curNum); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeUInt32(FieldNames.maxNum, maxNum); + } + output.endObject(); + } + + @Override + public EnergyInfo mergeFrom(final JsonSource input) throws IOException { + if (!input.beginObject()) { + return this; + } + while (!input.isAtEnd()) { + switch (input.readFieldHash()) { + case -1349154522: + case 1126382855: { + if (input.isAtField(FieldNames.curNum)) { + if (!input.trySkipNullValue()) { + curNum = input.readUInt32(); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } + case -1081154686: + case 844443179: { + if (input.isAtField(FieldNames.maxNum)) { + if (!input.trySkipNullValue()) { + maxNum = input.readUInt32(); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + default: { + input.skipUnknownField(); + break; + } + } + } + input.endObject(); + return this; + } + + @Override + public EnergyInfo clone() { + return new EnergyInfo().copyFrom(this); + } + + @Override + public boolean isEmpty() { + return ((bitField0_) == 0); + } + + public static EnergyInfo parseFrom(final byte[] data) throws InvalidProtocolBufferException { + return ProtoMessage.mergeFrom(new EnergyInfo(), data).checkInitialized(); + } + + public static EnergyInfo parseFrom(final ProtoSource input) throws IOException { + return ProtoMessage.mergeFrom(new EnergyInfo(), input).checkInitialized(); + } + + public static EnergyInfo parseFrom(final JsonSource input) throws IOException { + return ProtoMessage.mergeFrom(new EnergyInfo(), input).checkInitialized(); + } + + /** + * @return factory for creating EnergyInfo messages + */ + public static MessageFactory getFactory() { + return EnergyInfoFactory.INSTANCE; + } + + private enum EnergyInfoFactory implements MessageFactory { + INSTANCE; + + @Override + public EnergyInfo create() { + return EnergyInfo.newInstance(); + } + } + + /** + * Contains name constants used for serializing JSON + */ + static class FieldNames { + static final FieldName curNum = FieldName.forField("curNum", "cur_num"); + + static final FieldName maxNum = FieldName.forField("maxNum", "max_num"); + } + } + + private enum DeployRotaterScRspFactory implements MessageFactory { + INSTANCE; + + @Override + public DeployRotaterScRsp create() { + return DeployRotaterScRsp.newInstance(); + } + } + + /** + * Contains name constants used for serializing JSON + */ + static class FieldNames { + static final FieldName retcode = FieldName.forField("retcode"); + + static final FieldName energyInfo = FieldName.forField("energyInfo", "energy_info"); + + static final FieldName rotaterData = FieldName.forField("rotaterData", "rotater_data"); + } + } +} diff --git a/src/generated/main/emu/lunarcore/proto/DisplayAvatarOuterClass.java b/src/generated/main/emu/lunarcore/proto/DisplayAvatarOuterClass.java index 9293a52b5..2d583826a 100644 --- a/src/generated/main/emu/lunarcore/proto/DisplayAvatarOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/DisplayAvatarOuterClass.java @@ -19,14 +19,14 @@ public static final class DisplayAvatar extends ProtoMessage impl private static final long serialVersionUID = 0L; /** - * optional uint32 avatar_id = 8; + * optional uint32 pos = 10; */ - private int avatarId; + private int pos; /** - * optional uint32 pos = 13; + * optional uint32 avatar_id = 14; */ - private int pos; + private int avatarId; private DisplayAvatar() { } @@ -39,76 +39,76 @@ public static DisplayAvatar newInstance() { } /** - * optional uint32 avatar_id = 8; - * @return whether the avatarId field is set + * optional uint32 pos = 10; + * @return whether the pos field is set */ - public boolean hasAvatarId() { + public boolean hasPos() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 avatar_id = 8; + * optional uint32 pos = 10; * @return this */ - public DisplayAvatar clearAvatarId() { + public DisplayAvatar clearPos() { bitField0_ &= ~0x00000001; - avatarId = 0; + pos = 0; return this; } /** - * optional uint32 avatar_id = 8; - * @return the avatarId + * optional uint32 pos = 10; + * @return the pos */ - public int getAvatarId() { - return avatarId; + public int getPos() { + return pos; } /** - * optional uint32 avatar_id = 8; - * @param value the avatarId to set + * optional uint32 pos = 10; + * @param value the pos to set * @return this */ - public DisplayAvatar setAvatarId(final int value) { + public DisplayAvatar setPos(final int value) { bitField0_ |= 0x00000001; - avatarId = value; + pos = value; return this; } /** - * optional uint32 pos = 13; - * @return whether the pos field is set + * optional uint32 avatar_id = 14; + * @return whether the avatarId field is set */ - public boolean hasPos() { + public boolean hasAvatarId() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 pos = 13; + * optional uint32 avatar_id = 14; * @return this */ - public DisplayAvatar clearPos() { + public DisplayAvatar clearAvatarId() { bitField0_ &= ~0x00000002; - pos = 0; + avatarId = 0; return this; } /** - * optional uint32 pos = 13; - * @return the pos + * optional uint32 avatar_id = 14; + * @return the avatarId */ - public int getPos() { - return pos; + public int getAvatarId() { + return avatarId; } /** - * optional uint32 pos = 13; - * @param value the pos to set + * optional uint32 avatar_id = 14; + * @param value the avatarId to set * @return this */ - public DisplayAvatar setPos(final int value) { + public DisplayAvatar setAvatarId(final int value) { bitField0_ |= 0x00000002; - pos = value; + avatarId = value; return this; } @@ -117,8 +117,8 @@ public DisplayAvatar copyFrom(final DisplayAvatar other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - avatarId = other.avatarId; pos = other.pos; + avatarId = other.avatarId; } return this; } @@ -129,12 +129,12 @@ public DisplayAvatar mergeFrom(final DisplayAvatar other) { return this; } cachedSize = -1; - if (other.hasAvatarId()) { - setAvatarId(other.avatarId); - } if (other.hasPos()) { setPos(other.pos); } + if (other.hasAvatarId()) { + setAvatarId(other.avatarId); + } return this; } @@ -145,8 +145,8 @@ public DisplayAvatar clear() { } cachedSize = -1; bitField0_ = 0; - avatarId = 0; pos = 0; + avatarId = 0; return this; } @@ -170,19 +170,19 @@ public boolean equals(Object o) { } DisplayAvatar other = (DisplayAvatar) o; return bitField0_ == other.bitField0_ - && (!hasAvatarId() || avatarId == other.avatarId) - && (!hasPos() || pos == other.pos); + && (!hasPos() || pos == other.pos) + && (!hasAvatarId() || avatarId == other.avatarId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 64); - output.writeUInt32NoTag(avatarId); + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(pos); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 104); - output.writeUInt32NoTag(pos); + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(avatarId); } } @@ -190,10 +190,10 @@ public void writeTo(final ProtoSink output) throws IOException { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(avatarId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(pos); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(pos); + size += 1 + ProtoSink.computeUInt32SizeNoTag(avatarId); } return size; } @@ -205,18 +205,18 @@ public DisplayAvatar mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { - // avatarId - avatarId = input.readUInt32(); + case 80: { + // pos + pos = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 104) { + if (tag != 112) { break; } } - case 104: { - // pos - pos = input.readUInt32(); + case 112: { + // avatarId + avatarId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -241,10 +241,10 @@ public DisplayAvatar mergeFrom(final ProtoSource input) throws IOException { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.avatarId, avatarId); + output.writeUInt32(FieldNames.pos, pos); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.pos, pos); + output.writeUInt32(FieldNames.avatarId, avatarId); } output.endObject(); } @@ -256,11 +256,10 @@ public DisplayAvatar mergeFrom(final JsonSource input) throws IOException { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1787287636: - case -428636735: { - if (input.isAtField(FieldNames.avatarId)) { + case 111188: { + if (input.isAtField(FieldNames.pos)) { if (!input.trySkipNullValue()) { - avatarId = input.readUInt32(); + pos = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -268,10 +267,11 @@ public DisplayAvatar mergeFrom(final JsonSource input) throws IOException { } break; } - case 111188: { - if (input.isAtField(FieldNames.pos)) { + case 1787287636: + case -428636735: { + if (input.isAtField(FieldNames.avatarId)) { if (!input.trySkipNullValue()) { - pos = input.readUInt32(); + avatarId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -331,9 +331,9 @@ public DisplayAvatar create() { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName avatarId = FieldName.forField("avatarId", "avatar_id"); - static final FieldName pos = FieldName.forField("pos"); + + static final FieldName avatarId = FieldName.forField("avatarId", "avatar_id"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/DisplayAvatarVecOuterClass.java b/src/generated/main/emu/lunarcore/proto/DisplayAvatarVecOuterClass.java index d41f09dcf..10ab331ff 100644 --- a/src/generated/main/emu/lunarcore/proto/DisplayAvatarVecOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/DisplayAvatarVecOuterClass.java @@ -20,12 +20,12 @@ public static final class DisplayAvatarVec extends ProtoMessageoptional bool is_display = 7; + * optional bool is_display = 3; */ private boolean isDisplay; /** - * repeated .DisplayAvatar display_avatar_list = 14; + * repeated .DisplayAvatar display_avatar_list = 15; */ private final RepeatedMessage displayAvatarList = RepeatedMessage.newEmptyInstance(DisplayAvatarOuterClass.DisplayAvatar.getFactory()); @@ -40,7 +40,7 @@ public static DisplayAvatarVec newInstance() { } /** - * optional bool is_display = 7; + * optional bool is_display = 3; * @return whether the isDisplay field is set */ public boolean hasIsDisplay() { @@ -48,7 +48,7 @@ public boolean hasIsDisplay() { } /** - * optional bool is_display = 7; + * optional bool is_display = 3; * @return this */ public DisplayAvatarVec clearIsDisplay() { @@ -58,7 +58,7 @@ public DisplayAvatarVec clearIsDisplay() { } /** - * optional bool is_display = 7; + * optional bool is_display = 3; * @return the isDisplay */ public boolean getIsDisplay() { @@ -66,7 +66,7 @@ public boolean getIsDisplay() { } /** - * optional bool is_display = 7; + * optional bool is_display = 3; * @param value the isDisplay to set * @return this */ @@ -77,7 +77,7 @@ public DisplayAvatarVec setIsDisplay(final boolean value) { } /** - * repeated .DisplayAvatar display_avatar_list = 14; + * repeated .DisplayAvatar display_avatar_list = 15; * @return whether the displayAvatarList field is set */ public boolean hasDisplayAvatarList() { @@ -85,7 +85,7 @@ public boolean hasDisplayAvatarList() { } /** - * repeated .DisplayAvatar display_avatar_list = 14; + * repeated .DisplayAvatar display_avatar_list = 15; * @return this */ public DisplayAvatarVec clearDisplayAvatarList() { @@ -95,7 +95,7 @@ public DisplayAvatarVec clearDisplayAvatarList() { } /** - * repeated .DisplayAvatar display_avatar_list = 14; + * repeated .DisplayAvatar display_avatar_list = 15; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -109,7 +109,7 @@ public RepeatedMessage getDisplayAvatarLi } /** - * repeated .DisplayAvatar display_avatar_list = 14; + * repeated .DisplayAvatar display_avatar_list = 15; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -123,7 +123,7 @@ public RepeatedMessage getMutableDisplayA } /** - * repeated .DisplayAvatar display_avatar_list = 14; + * repeated .DisplayAvatar display_avatar_list = 15; * @param value the displayAvatarList to add * @return this */ @@ -135,7 +135,7 @@ public DisplayAvatarVec addDisplayAvatarList( } /** - * repeated .DisplayAvatar display_avatar_list = 14; + * repeated .DisplayAvatar display_avatar_list = 15; * @param values the displayAvatarList to add * @return this */ @@ -212,12 +212,12 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 24); output.writeBoolNoTag(isDisplay); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < displayAvatarList.length(); i++) { - output.writeRawByte((byte) 114); + output.writeRawByte((byte) 122); output.writeMessageNoTag(displayAvatarList.get(i)); } } @@ -242,16 +242,16 @@ public DisplayAvatarVec mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { + case 24: { // isDisplay isDisplay = input.readBool(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 114) { + if (tag != 122) { break; } } - case 114: { + case 122: { // displayAvatarList tag = input.readRepeatedMessage(displayAvatarList, tag); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/DoGachaCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/DoGachaCsReqOuterClass.java index ca6ad8026..f7f94563c 100644 --- a/src/generated/main/emu/lunarcore/proto/DoGachaCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/DoGachaCsReqOuterClass.java @@ -19,24 +19,24 @@ public static final class DoGachaCsReq extends ProtoMessage implem private static final long serialVersionUID = 0L; /** - * optional uint32 gacha_num = 1; + * optional uint32 gacha_random = 3; */ - private int gachaNum; + private int gachaRandom; /** - * optional uint32 gacha_id = 9; + * optional uint32 gacha_id = 5; */ private int gachaId; /** - * optional uint32 simulate_magic = 10; + * optional uint32 gacha_num = 6; */ - private int simulateMagic; + private int gachaNum; /** - * optional uint32 gacha_random = 15; + * optional uint32 simulate_magic = 15; */ - private int gachaRandom; + private int simulateMagic; private DoGachaCsReq() { } @@ -49,44 +49,44 @@ public static DoGachaCsReq newInstance() { } /** - * optional uint32 gacha_num = 1; - * @return whether the gachaNum field is set + * optional uint32 gacha_random = 3; + * @return whether the gachaRandom field is set */ - public boolean hasGachaNum() { + public boolean hasGachaRandom() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 gacha_num = 1; + * optional uint32 gacha_random = 3; * @return this */ - public DoGachaCsReq clearGachaNum() { + public DoGachaCsReq clearGachaRandom() { bitField0_ &= ~0x00000001; - gachaNum = 0; + gachaRandom = 0; return this; } /** - * optional uint32 gacha_num = 1; - * @return the gachaNum + * optional uint32 gacha_random = 3; + * @return the gachaRandom */ - public int getGachaNum() { - return gachaNum; + public int getGachaRandom() { + return gachaRandom; } /** - * optional uint32 gacha_num = 1; - * @param value the gachaNum to set + * optional uint32 gacha_random = 3; + * @param value the gachaRandom to set * @return this */ - public DoGachaCsReq setGachaNum(final int value) { + public DoGachaCsReq setGachaRandom(final int value) { bitField0_ |= 0x00000001; - gachaNum = value; + gachaRandom = value; return this; } /** - * optional uint32 gacha_id = 9; + * optional uint32 gacha_id = 5; * @return whether the gachaId field is set */ public boolean hasGachaId() { @@ -94,7 +94,7 @@ public boolean hasGachaId() { } /** - * optional uint32 gacha_id = 9; + * optional uint32 gacha_id = 5; * @return this */ public DoGachaCsReq clearGachaId() { @@ -104,7 +104,7 @@ public DoGachaCsReq clearGachaId() { } /** - * optional uint32 gacha_id = 9; + * optional uint32 gacha_id = 5; * @return the gachaId */ public int getGachaId() { @@ -112,7 +112,7 @@ public int getGachaId() { } /** - * optional uint32 gacha_id = 9; + * optional uint32 gacha_id = 5; * @param value the gachaId to set * @return this */ @@ -123,76 +123,76 @@ public DoGachaCsReq setGachaId(final int value) { } /** - * optional uint32 simulate_magic = 10; - * @return whether the simulateMagic field is set + * optional uint32 gacha_num = 6; + * @return whether the gachaNum field is set */ - public boolean hasSimulateMagic() { + public boolean hasGachaNum() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 simulate_magic = 10; + * optional uint32 gacha_num = 6; * @return this */ - public DoGachaCsReq clearSimulateMagic() { + public DoGachaCsReq clearGachaNum() { bitField0_ &= ~0x00000004; - simulateMagic = 0; + gachaNum = 0; return this; } /** - * optional uint32 simulate_magic = 10; - * @return the simulateMagic + * optional uint32 gacha_num = 6; + * @return the gachaNum */ - public int getSimulateMagic() { - return simulateMagic; + public int getGachaNum() { + return gachaNum; } /** - * optional uint32 simulate_magic = 10; - * @param value the simulateMagic to set + * optional uint32 gacha_num = 6; + * @param value the gachaNum to set * @return this */ - public DoGachaCsReq setSimulateMagic(final int value) { + public DoGachaCsReq setGachaNum(final int value) { bitField0_ |= 0x00000004; - simulateMagic = value; + gachaNum = value; return this; } /** - * optional uint32 gacha_random = 15; - * @return whether the gachaRandom field is set + * optional uint32 simulate_magic = 15; + * @return whether the simulateMagic field is set */ - public boolean hasGachaRandom() { + public boolean hasSimulateMagic() { return (bitField0_ & 0x00000008) != 0; } /** - * optional uint32 gacha_random = 15; + * optional uint32 simulate_magic = 15; * @return this */ - public DoGachaCsReq clearGachaRandom() { + public DoGachaCsReq clearSimulateMagic() { bitField0_ &= ~0x00000008; - gachaRandom = 0; + simulateMagic = 0; return this; } /** - * optional uint32 gacha_random = 15; - * @return the gachaRandom + * optional uint32 simulate_magic = 15; + * @return the simulateMagic */ - public int getGachaRandom() { - return gachaRandom; + public int getSimulateMagic() { + return simulateMagic; } /** - * optional uint32 gacha_random = 15; - * @param value the gachaRandom to set + * optional uint32 simulate_magic = 15; + * @param value the simulateMagic to set * @return this */ - public DoGachaCsReq setGachaRandom(final int value) { + public DoGachaCsReq setSimulateMagic(final int value) { bitField0_ |= 0x00000008; - gachaRandom = value; + simulateMagic = value; return this; } @@ -201,10 +201,10 @@ public DoGachaCsReq copyFrom(final DoGachaCsReq other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - gachaNum = other.gachaNum; + gachaRandom = other.gachaRandom; gachaId = other.gachaId; + gachaNum = other.gachaNum; simulateMagic = other.simulateMagic; - gachaRandom = other.gachaRandom; } return this; } @@ -215,18 +215,18 @@ public DoGachaCsReq mergeFrom(final DoGachaCsReq other) { return this; } cachedSize = -1; - if (other.hasGachaNum()) { - setGachaNum(other.gachaNum); + if (other.hasGachaRandom()) { + setGachaRandom(other.gachaRandom); } if (other.hasGachaId()) { setGachaId(other.gachaId); } + if (other.hasGachaNum()) { + setGachaNum(other.gachaNum); + } if (other.hasSimulateMagic()) { setSimulateMagic(other.simulateMagic); } - if (other.hasGachaRandom()) { - setGachaRandom(other.gachaRandom); - } return this; } @@ -237,10 +237,10 @@ public DoGachaCsReq clear() { } cachedSize = -1; bitField0_ = 0; - gachaNum = 0; + gachaRandom = 0; gachaId = 0; + gachaNum = 0; simulateMagic = 0; - gachaRandom = 0; return this; } @@ -264,29 +264,29 @@ public boolean equals(Object o) { } DoGachaCsReq other = (DoGachaCsReq) o; return bitField0_ == other.bitField0_ - && (!hasGachaNum() || gachaNum == other.gachaNum) + && (!hasGachaRandom() || gachaRandom == other.gachaRandom) && (!hasGachaId() || gachaId == other.gachaId) - && (!hasSimulateMagic() || simulateMagic == other.simulateMagic) - && (!hasGachaRandom() || gachaRandom == other.gachaRandom); + && (!hasGachaNum() || gachaNum == other.gachaNum) + && (!hasSimulateMagic() || simulateMagic == other.simulateMagic); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); - output.writeUInt32NoTag(gachaNum); + output.writeRawByte((byte) 24); + output.writeUInt32NoTag(gachaRandom); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(gachaId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 80); - output.writeUInt32NoTag(simulateMagic); + output.writeRawByte((byte) 48); + output.writeUInt32NoTag(gachaNum); } if ((bitField0_ & 0x00000008) != 0) { output.writeRawByte((byte) 120); - output.writeUInt32NoTag(gachaRandom); + output.writeUInt32NoTag(simulateMagic); } } @@ -294,16 +294,16 @@ public void writeTo(final ProtoSink output) throws IOException { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaNum); + size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaRandom); } if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaId); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(simulateMagic); + size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaNum); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaRandom); + size += 1 + ProtoSink.computeUInt32SizeNoTag(simulateMagic); } return size; } @@ -315,27 +315,27 @@ public DoGachaCsReq mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { - // gachaNum - gachaNum = input.readUInt32(); + case 24: { + // gachaRandom + gachaRandom = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 72) { + if (tag != 40) { break; } } - case 72: { + case 40: { // gachaId gachaId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 80) { + if (tag != 48) { break; } } - case 80: { - // simulateMagic - simulateMagic = input.readUInt32(); + case 48: { + // gachaNum + gachaNum = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 120) { @@ -343,8 +343,8 @@ public DoGachaCsReq mergeFrom(final ProtoSource input) throws IOException { } } case 120: { - // gachaRandom - gachaRandom = input.readUInt32(); + // simulateMagic + simulateMagic = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); if (tag != 0) { @@ -369,16 +369,16 @@ public DoGachaCsReq mergeFrom(final ProtoSource input) throws IOException { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.gachaNum, gachaNum); + output.writeUInt32(FieldNames.gachaRandom, gachaRandom); } if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.gachaId, gachaId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.simulateMagic, simulateMagic); + output.writeUInt32(FieldNames.gachaNum, gachaNum); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.gachaRandom, gachaRandom); + output.writeUInt32(FieldNames.simulateMagic, simulateMagic); } output.endObject(); } @@ -390,11 +390,11 @@ public DoGachaCsReq mergeFrom(final JsonSource input) throws IOException { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -2052317532: - case 803166025: { - if (input.isAtField(FieldNames.gachaNum)) { + case -1635961627: + case -47579616: { + if (input.isAtField(FieldNames.gachaRandom)) { if (!input.trySkipNullValue()) { - gachaNum = input.readUInt32(); + gachaRandom = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -414,11 +414,11 @@ public DoGachaCsReq mergeFrom(final JsonSource input) throws IOException { } break; } - case -370053655: - case 1939465170: { - if (input.isAtField(FieldNames.simulateMagic)) { + case -2052317532: + case 803166025: { + if (input.isAtField(FieldNames.gachaNum)) { if (!input.trySkipNullValue()) { - simulateMagic = input.readUInt32(); + gachaNum = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -426,11 +426,11 @@ public DoGachaCsReq mergeFrom(final JsonSource input) throws IOException { } break; } - case -1635961627: - case -47579616: { - if (input.isAtField(FieldNames.gachaRandom)) { + case -370053655: + case 1939465170: { + if (input.isAtField(FieldNames.simulateMagic)) { if (!input.trySkipNullValue()) { - gachaRandom = input.readUInt32(); + simulateMagic = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -490,13 +490,13 @@ public DoGachaCsReq create() { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName gachaNum = FieldName.forField("gachaNum", "gacha_num"); + static final FieldName gachaRandom = FieldName.forField("gachaRandom", "gacha_random"); static final FieldName gachaId = FieldName.forField("gachaId", "gacha_id"); - static final FieldName simulateMagic = FieldName.forField("simulateMagic", "simulate_magic"); + static final FieldName gachaNum = FieldName.forField("gachaNum", "gacha_num"); - static final FieldName gachaRandom = FieldName.forField("gachaRandom", "gacha_random"); + static final FieldName simulateMagic = FieldName.forField("simulateMagic", "simulate_magic"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/DoGachaInRollShopCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/DoGachaInRollShopCsReqOuterClass.java new file mode 100644 index 000000000..5b802fec3 --- /dev/null +++ b/src/generated/main/emu/lunarcore/proto/DoGachaInRollShopCsReqOuterClass.java @@ -0,0 +1,340 @@ +// Code generated by protocol buffer compiler. Do not edit! +package emu.lunarcore.proto; + +import java.io.IOException; +import us.hebi.quickbuf.FieldName; +import us.hebi.quickbuf.InvalidProtocolBufferException; +import us.hebi.quickbuf.JsonSink; +import us.hebi.quickbuf.JsonSource; +import us.hebi.quickbuf.MessageFactory; +import us.hebi.quickbuf.ProtoMessage; +import us.hebi.quickbuf.ProtoSink; +import us.hebi.quickbuf.ProtoSource; + +public final class DoGachaInRollShopCsReqOuterClass { + /** + * Protobuf type {@code DoGachaInRollShopCsReq} + */ + public static final class DoGachaInRollShopCsReq extends ProtoMessage implements Cloneable { + private static final long serialVersionUID = 0L; + + /** + * optional uint32 BBJIJINJAFK = 5; + */ + private int bBJIJINJAFK; + + /** + * optional uint32 roll_shop_id = 10; + */ + private int rollShopId; + + private DoGachaInRollShopCsReq() { + } + + /** + * @return a new empty instance of {@code DoGachaInRollShopCsReq} + */ + public static DoGachaInRollShopCsReq newInstance() { + return new DoGachaInRollShopCsReq(); + } + + /** + * optional uint32 BBJIJINJAFK = 5; + * @return whether the bBJIJINJAFK field is set + */ + public boolean hasBBJIJINJAFK() { + return (bitField0_ & 0x00000001) != 0; + } + + /** + * optional uint32 BBJIJINJAFK = 5; + * @return this + */ + public DoGachaInRollShopCsReq clearBBJIJINJAFK() { + bitField0_ &= ~0x00000001; + bBJIJINJAFK = 0; + return this; + } + + /** + * optional uint32 BBJIJINJAFK = 5; + * @return the bBJIJINJAFK + */ + public int getBBJIJINJAFK() { + return bBJIJINJAFK; + } + + /** + * optional uint32 BBJIJINJAFK = 5; + * @param value the bBJIJINJAFK to set + * @return this + */ + public DoGachaInRollShopCsReq setBBJIJINJAFK(final int value) { + bitField0_ |= 0x00000001; + bBJIJINJAFK = value; + return this; + } + + /** + * optional uint32 roll_shop_id = 10; + * @return whether the rollShopId field is set + */ + public boolean hasRollShopId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 roll_shop_id = 10; + * @return this + */ + public DoGachaInRollShopCsReq clearRollShopId() { + bitField0_ &= ~0x00000002; + rollShopId = 0; + return this; + } + + /** + * optional uint32 roll_shop_id = 10; + * @return the rollShopId + */ + public int getRollShopId() { + return rollShopId; + } + + /** + * optional uint32 roll_shop_id = 10; + * @param value the rollShopId to set + * @return this + */ + public DoGachaInRollShopCsReq setRollShopId(final int value) { + bitField0_ |= 0x00000002; + rollShopId = value; + return this; + } + + @Override + public DoGachaInRollShopCsReq copyFrom(final DoGachaInRollShopCsReq other) { + cachedSize = other.cachedSize; + if ((bitField0_ | other.bitField0_) != 0) { + bitField0_ = other.bitField0_; + bBJIJINJAFK = other.bBJIJINJAFK; + rollShopId = other.rollShopId; + } + return this; + } + + @Override + public DoGachaInRollShopCsReq mergeFrom(final DoGachaInRollShopCsReq other) { + if (other.isEmpty()) { + return this; + } + cachedSize = -1; + if (other.hasBBJIJINJAFK()) { + setBBJIJINJAFK(other.bBJIJINJAFK); + } + if (other.hasRollShopId()) { + setRollShopId(other.rollShopId); + } + return this; + } + + @Override + public DoGachaInRollShopCsReq clear() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + bBJIJINJAFK = 0; + rollShopId = 0; + return this; + } + + @Override + public DoGachaInRollShopCsReq clearQuick() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + return this; + } + + @Override + public boolean equals(Object o) { + if (o == this) { + return true; + } + if (!(o instanceof DoGachaInRollShopCsReq)) { + return false; + } + DoGachaInRollShopCsReq other = (DoGachaInRollShopCsReq) o; + return bitField0_ == other.bitField0_ + && (!hasBBJIJINJAFK() || bBJIJINJAFK == other.bBJIJINJAFK) + && (!hasRollShopId() || rollShopId == other.rollShopId); + } + + @Override + public void writeTo(final ProtoSink output) throws IOException { + if ((bitField0_ & 0x00000001) != 0) { + output.writeRawByte((byte) 40); + output.writeUInt32NoTag(bBJIJINJAFK); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(rollShopId); + } + } + + @Override + protected int computeSerializedSize() { + int size = 0; + if ((bitField0_ & 0x00000001) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(bBJIJINJAFK); + } + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(rollShopId); + } + return size; + } + + @Override + @SuppressWarnings("fallthrough") + public DoGachaInRollShopCsReq mergeFrom(final ProtoSource input) throws IOException { + // Enabled Fall-Through Optimization (QuickBuffers) + int tag = input.readTag(); + while (true) { + switch (tag) { + case 40: { + // bBJIJINJAFK + bBJIJINJAFK = input.readUInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 80) { + break; + } + } + case 80: { + // rollShopId + rollShopId = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 0) { + break; + } + } + case 0: { + return this; + } + default: { + if (!input.skipField(tag)) { + return this; + } + tag = input.readTag(); + break; + } + } + } + } + + @Override + public void writeTo(final JsonSink output) throws IOException { + output.beginObject(); + if ((bitField0_ & 0x00000001) != 0) { + output.writeUInt32(FieldNames.bBJIJINJAFK, bBJIJINJAFK); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeUInt32(FieldNames.rollShopId, rollShopId); + } + output.endObject(); + } + + @Override + public DoGachaInRollShopCsReq mergeFrom(final JsonSource input) throws IOException { + if (!input.beginObject()) { + return this; + } + while (!input.isAtEnd()) { + switch (input.readFieldHash()) { + case -1536175796: { + if (input.isAtField(FieldNames.bBJIJINJAFK)) { + if (!input.trySkipNullValue()) { + bBJIJINJAFK = input.readUInt32(); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } + case -904898162: + case -1612413630: { + if (input.isAtField(FieldNames.rollShopId)) { + if (!input.trySkipNullValue()) { + rollShopId = input.readUInt32(); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + default: { + input.skipUnknownField(); + break; + } + } + } + input.endObject(); + return this; + } + + @Override + public DoGachaInRollShopCsReq clone() { + return new DoGachaInRollShopCsReq().copyFrom(this); + } + + @Override + public boolean isEmpty() { + return ((bitField0_) == 0); + } + + public static DoGachaInRollShopCsReq parseFrom(final byte[] data) throws + InvalidProtocolBufferException { + return ProtoMessage.mergeFrom(new DoGachaInRollShopCsReq(), data).checkInitialized(); + } + + public static DoGachaInRollShopCsReq parseFrom(final ProtoSource input) throws IOException { + return ProtoMessage.mergeFrom(new DoGachaInRollShopCsReq(), input).checkInitialized(); + } + + public static DoGachaInRollShopCsReq parseFrom(final JsonSource input) throws IOException { + return ProtoMessage.mergeFrom(new DoGachaInRollShopCsReq(), input).checkInitialized(); + } + + /** + * @return factory for creating DoGachaInRollShopCsReq messages + */ + public static MessageFactory getFactory() { + return DoGachaInRollShopCsReqFactory.INSTANCE; + } + + private enum DoGachaInRollShopCsReqFactory implements MessageFactory { + INSTANCE; + + @Override + public DoGachaInRollShopCsReq create() { + return DoGachaInRollShopCsReq.newInstance(); + } + } + + /** + * Contains name constants used for serializing JSON + */ + static class FieldNames { + static final FieldName bBJIJINJAFK = FieldName.forField("BBJIJINJAFK"); + + static final FieldName rollShopId = FieldName.forField("rollShopId", "roll_shop_id"); + } + } +} diff --git a/src/generated/main/emu/lunarcore/proto/DoGachaInRollShopScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/DoGachaInRollShopScRspOuterClass.java new file mode 100644 index 000000000..e6394bd3b --- /dev/null +++ b/src/generated/main/emu/lunarcore/proto/DoGachaInRollShopScRspOuterClass.java @@ -0,0 +1,601 @@ +// Code generated by protocol buffer compiler. Do not edit! +package emu.lunarcore.proto; + +import java.io.IOException; +import us.hebi.quickbuf.FieldName; +import us.hebi.quickbuf.InvalidProtocolBufferException; +import us.hebi.quickbuf.JsonSink; +import us.hebi.quickbuf.JsonSource; +import us.hebi.quickbuf.MessageFactory; +import us.hebi.quickbuf.ProtoMessage; +import us.hebi.quickbuf.ProtoSink; +import us.hebi.quickbuf.ProtoSource; + +public final class DoGachaInRollShopScRspOuterClass { + /** + * Protobuf type {@code DoGachaInRollShopScRsp} + */ + public static final class DoGachaInRollShopScRsp extends ProtoMessage implements Cloneable { + private static final long serialVersionUID = 0L; + + /** + * optional uint32 AFMPDBBHCHM = 2; + */ + private int aFMPDBBHCHM; + + /** + * optional uint32 LEJJOJGNIHK = 4; + */ + private int lEJJOJGNIHK; + + /** + * optional uint32 retcode = 7; + */ + private int retcode; + + /** + * optional uint32 roll_shop_id = 8; + */ + private int rollShopId; + + /** + * optional .ItemList reward = 9; + */ + private final ItemListOuterClass.ItemList reward = ItemListOuterClass.ItemList.newInstance(); + + private DoGachaInRollShopScRsp() { + } + + /** + * @return a new empty instance of {@code DoGachaInRollShopScRsp} + */ + public static DoGachaInRollShopScRsp newInstance() { + return new DoGachaInRollShopScRsp(); + } + + /** + * optional uint32 AFMPDBBHCHM = 2; + * @return whether the aFMPDBBHCHM field is set + */ + public boolean hasAFMPDBBHCHM() { + return (bitField0_ & 0x00000001) != 0; + } + + /** + * optional uint32 AFMPDBBHCHM = 2; + * @return this + */ + public DoGachaInRollShopScRsp clearAFMPDBBHCHM() { + bitField0_ &= ~0x00000001; + aFMPDBBHCHM = 0; + return this; + } + + /** + * optional uint32 AFMPDBBHCHM = 2; + * @return the aFMPDBBHCHM + */ + public int getAFMPDBBHCHM() { + return aFMPDBBHCHM; + } + + /** + * optional uint32 AFMPDBBHCHM = 2; + * @param value the aFMPDBBHCHM to set + * @return this + */ + public DoGachaInRollShopScRsp setAFMPDBBHCHM(final int value) { + bitField0_ |= 0x00000001; + aFMPDBBHCHM = value; + return this; + } + + /** + * optional uint32 LEJJOJGNIHK = 4; + * @return whether the lEJJOJGNIHK field is set + */ + public boolean hasLEJJOJGNIHK() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 LEJJOJGNIHK = 4; + * @return this + */ + public DoGachaInRollShopScRsp clearLEJJOJGNIHK() { + bitField0_ &= ~0x00000002; + lEJJOJGNIHK = 0; + return this; + } + + /** + * optional uint32 LEJJOJGNIHK = 4; + * @return the lEJJOJGNIHK + */ + public int getLEJJOJGNIHK() { + return lEJJOJGNIHK; + } + + /** + * optional uint32 LEJJOJGNIHK = 4; + * @param value the lEJJOJGNIHK to set + * @return this + */ + public DoGachaInRollShopScRsp setLEJJOJGNIHK(final int value) { + bitField0_ |= 0x00000002; + lEJJOJGNIHK = value; + return this; + } + + /** + * optional uint32 retcode = 7; + * @return whether the retcode field is set + */ + public boolean hasRetcode() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 retcode = 7; + * @return this + */ + public DoGachaInRollShopScRsp clearRetcode() { + bitField0_ &= ~0x00000004; + retcode = 0; + return this; + } + + /** + * optional uint32 retcode = 7; + * @return the retcode + */ + public int getRetcode() { + return retcode; + } + + /** + * optional uint32 retcode = 7; + * @param value the retcode to set + * @return this + */ + public DoGachaInRollShopScRsp setRetcode(final int value) { + bitField0_ |= 0x00000004; + retcode = value; + return this; + } + + /** + * optional uint32 roll_shop_id = 8; + * @return whether the rollShopId field is set + */ + public boolean hasRollShopId() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 roll_shop_id = 8; + * @return this + */ + public DoGachaInRollShopScRsp clearRollShopId() { + bitField0_ &= ~0x00000008; + rollShopId = 0; + return this; + } + + /** + * optional uint32 roll_shop_id = 8; + * @return the rollShopId + */ + public int getRollShopId() { + return rollShopId; + } + + /** + * optional uint32 roll_shop_id = 8; + * @param value the rollShopId to set + * @return this + */ + public DoGachaInRollShopScRsp setRollShopId(final int value) { + bitField0_ |= 0x00000008; + rollShopId = value; + return this; + } + + /** + * optional .ItemList reward = 9; + * @return whether the reward field is set + */ + public boolean hasReward() { + return (bitField0_ & 0x00000010) != 0; + } + + /** + * optional .ItemList reward = 9; + * @return this + */ + public DoGachaInRollShopScRsp clearReward() { + bitField0_ &= ~0x00000010; + reward.clear(); + return this; + } + + /** + * optional .ItemList reward = 9; + * + * This method returns the internal storage object without modifying any has state. + * The returned object should not be modified and be treated as read-only. + * + * Use {@link #getMutableReward()} if you want to modify it. + * + * @return internal storage object for reading + */ + public ItemListOuterClass.ItemList getReward() { + return reward; + } + + /** + * optional .ItemList reward = 9; + * + * This method returns the internal storage object and sets the corresponding + * has state. The returned object will become part of this message and its + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public ItemListOuterClass.ItemList getMutableReward() { + bitField0_ |= 0x00000010; + return reward; + } + + /** + * optional .ItemList reward = 9; + * @param value the reward to set + * @return this + */ + public DoGachaInRollShopScRsp setReward(final ItemListOuterClass.ItemList value) { + bitField0_ |= 0x00000010; + reward.copyFrom(value); + return this; + } + + @Override + public DoGachaInRollShopScRsp copyFrom(final DoGachaInRollShopScRsp other) { + cachedSize = other.cachedSize; + if ((bitField0_ | other.bitField0_) != 0) { + bitField0_ = other.bitField0_; + aFMPDBBHCHM = other.aFMPDBBHCHM; + lEJJOJGNIHK = other.lEJJOJGNIHK; + retcode = other.retcode; + rollShopId = other.rollShopId; + reward.copyFrom(other.reward); + } + return this; + } + + @Override + public DoGachaInRollShopScRsp mergeFrom(final DoGachaInRollShopScRsp other) { + if (other.isEmpty()) { + return this; + } + cachedSize = -1; + if (other.hasAFMPDBBHCHM()) { + setAFMPDBBHCHM(other.aFMPDBBHCHM); + } + if (other.hasLEJJOJGNIHK()) { + setLEJJOJGNIHK(other.lEJJOJGNIHK); + } + if (other.hasRetcode()) { + setRetcode(other.retcode); + } + if (other.hasRollShopId()) { + setRollShopId(other.rollShopId); + } + if (other.hasReward()) { + getMutableReward().mergeFrom(other.reward); + } + return this; + } + + @Override + public DoGachaInRollShopScRsp clear() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + aFMPDBBHCHM = 0; + lEJJOJGNIHK = 0; + retcode = 0; + rollShopId = 0; + reward.clear(); + return this; + } + + @Override + public DoGachaInRollShopScRsp clearQuick() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + reward.clearQuick(); + return this; + } + + @Override + public boolean equals(Object o) { + if (o == this) { + return true; + } + if (!(o instanceof DoGachaInRollShopScRsp)) { + return false; + } + DoGachaInRollShopScRsp other = (DoGachaInRollShopScRsp) o; + return bitField0_ == other.bitField0_ + && (!hasAFMPDBBHCHM() || aFMPDBBHCHM == other.aFMPDBBHCHM) + && (!hasLEJJOJGNIHK() || lEJJOJGNIHK == other.lEJJOJGNIHK) + && (!hasRetcode() || retcode == other.retcode) + && (!hasRollShopId() || rollShopId == other.rollShopId) + && (!hasReward() || reward.equals(other.reward)); + } + + @Override + public void writeTo(final ProtoSink output) throws IOException { + if ((bitField0_ & 0x00000001) != 0) { + output.writeRawByte((byte) 16); + output.writeUInt32NoTag(aFMPDBBHCHM); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 32); + output.writeUInt32NoTag(lEJJOJGNIHK); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(retcode); + } + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 64); + output.writeUInt32NoTag(rollShopId); + } + if ((bitField0_ & 0x00000010) != 0) { + output.writeRawByte((byte) 74); + output.writeMessageNoTag(reward); + } + } + + @Override + protected int computeSerializedSize() { + int size = 0; + if ((bitField0_ & 0x00000001) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(aFMPDBBHCHM); + } + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(lEJJOJGNIHK); + } + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + } + if ((bitField0_ & 0x00000008) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(rollShopId); + } + if ((bitField0_ & 0x00000010) != 0) { + size += 1 + ProtoSink.computeMessageSizeNoTag(reward); + } + return size; + } + + @Override + @SuppressWarnings("fallthrough") + public DoGachaInRollShopScRsp mergeFrom(final ProtoSource input) throws IOException { + // Enabled Fall-Through Optimization (QuickBuffers) + int tag = input.readTag(); + while (true) { + switch (tag) { + case 16: { + // aFMPDBBHCHM + aFMPDBBHCHM = input.readUInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 32) { + break; + } + } + case 32: { + // lEJJOJGNIHK + lEJJOJGNIHK = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 56) { + break; + } + } + case 56: { + // retcode + retcode = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 64) { + break; + } + } + case 64: { + // rollShopId + rollShopId = input.readUInt32(); + bitField0_ |= 0x00000008; + tag = input.readTag(); + if (tag != 74) { + break; + } + } + case 74: { + // reward + input.readMessage(reward); + bitField0_ |= 0x00000010; + tag = input.readTag(); + if (tag != 0) { + break; + } + } + case 0: { + return this; + } + default: { + if (!input.skipField(tag)) { + return this; + } + tag = input.readTag(); + break; + } + } + } + } + + @Override + public void writeTo(final JsonSink output) throws IOException { + output.beginObject(); + if ((bitField0_ & 0x00000001) != 0) { + output.writeUInt32(FieldNames.aFMPDBBHCHM, aFMPDBBHCHM); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeUInt32(FieldNames.lEJJOJGNIHK, lEJJOJGNIHK); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeUInt32(FieldNames.retcode, retcode); + } + if ((bitField0_ & 0x00000008) != 0) { + output.writeUInt32(FieldNames.rollShopId, rollShopId); + } + if ((bitField0_ & 0x00000010) != 0) { + output.writeMessage(FieldNames.reward, reward); + } + output.endObject(); + } + + @Override + public DoGachaInRollShopScRsp mergeFrom(final JsonSource input) throws IOException { + if (!input.beginObject()) { + return this; + } + while (!input.isAtEnd()) { + switch (input.readFieldHash()) { + case 715464508: { + if (input.isAtField(FieldNames.aFMPDBBHCHM)) { + if (!input.trySkipNullValue()) { + aFMPDBBHCHM = input.readUInt32(); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } + case -1007707855: { + if (input.isAtField(FieldNames.lEJJOJGNIHK)) { + if (!input.trySkipNullValue()) { + lEJJOJGNIHK = input.readUInt32(); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { + if (!input.trySkipNullValue()) { + retcode = input.readUInt32(); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } + case -904898162: + case -1612413630: { + if (input.isAtField(FieldNames.rollShopId)) { + if (!input.trySkipNullValue()) { + rollShopId = input.readUInt32(); + bitField0_ |= 0x00000008; + } + } else { + input.skipUnknownField(); + } + break; + } + case -934326481: { + if (input.isAtField(FieldNames.reward)) { + if (!input.trySkipNullValue()) { + input.readMessage(reward); + bitField0_ |= 0x00000010; + } + } else { + input.skipUnknownField(); + } + break; + } + default: { + input.skipUnknownField(); + break; + } + } + } + input.endObject(); + return this; + } + + @Override + public DoGachaInRollShopScRsp clone() { + return new DoGachaInRollShopScRsp().copyFrom(this); + } + + @Override + public boolean isEmpty() { + return ((bitField0_) == 0); + } + + public static DoGachaInRollShopScRsp parseFrom(final byte[] data) throws + InvalidProtocolBufferException { + return ProtoMessage.mergeFrom(new DoGachaInRollShopScRsp(), data).checkInitialized(); + } + + public static DoGachaInRollShopScRsp parseFrom(final ProtoSource input) throws IOException { + return ProtoMessage.mergeFrom(new DoGachaInRollShopScRsp(), input).checkInitialized(); + } + + public static DoGachaInRollShopScRsp parseFrom(final JsonSource input) throws IOException { + return ProtoMessage.mergeFrom(new DoGachaInRollShopScRsp(), input).checkInitialized(); + } + + /** + * @return factory for creating DoGachaInRollShopScRsp messages + */ + public static MessageFactory getFactory() { + return DoGachaInRollShopScRspFactory.INSTANCE; + } + + private enum DoGachaInRollShopScRspFactory implements MessageFactory { + INSTANCE; + + @Override + public DoGachaInRollShopScRsp create() { + return DoGachaInRollShopScRsp.newInstance(); + } + } + + /** + * Contains name constants used for serializing JSON + */ + static class FieldNames { + static final FieldName aFMPDBBHCHM = FieldName.forField("AFMPDBBHCHM"); + + static final FieldName lEJJOJGNIHK = FieldName.forField("LEJJOJGNIHK"); + + static final FieldName retcode = FieldName.forField("retcode"); + + static final FieldName rollShopId = FieldName.forField("rollShopId", "roll_shop_id"); + + static final FieldName reward = FieldName.forField("reward"); + } + } +} diff --git a/src/generated/main/emu/lunarcore/proto/DoGachaScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/DoGachaScRspOuterClass.java index a79e7e1fd..82fd922e7 100644 --- a/src/generated/main/emu/lunarcore/proto/DoGachaScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/DoGachaScRspOuterClass.java @@ -20,27 +20,27 @@ public static final class DoGachaScRsp extends ProtoMessage implem private static final long serialVersionUID = 0L; /** - * optional uint32 gacha_id = 4; - */ - private int gachaId; - - /** - * optional uint32 gacha_num = 5; + * optional uint32 gacha_num = 2; */ private int gachaNum; /** - * optional uint32 ceiling_num = 13; + * optional uint32 ceiling_num = 9; */ private int ceilingNum; /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 12; */ private int retcode; /** - * repeated .GachaItem gacha_item_list = 7; + * optional uint32 gacha_id = 13; + */ + private int gachaId; + + /** + * repeated .GachaItem gacha_item_list = 3; */ private final RepeatedMessage gachaItemList = RepeatedMessage.newEmptyInstance(GachaItemOuterClass.GachaItem.getFactory()); @@ -55,155 +55,155 @@ public static DoGachaScRsp newInstance() { } /** - * optional uint32 gacha_id = 4; - * @return whether the gachaId field is set + * optional uint32 gacha_num = 2; + * @return whether the gachaNum field is set */ - public boolean hasGachaId() { + public boolean hasGachaNum() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 gacha_id = 4; + * optional uint32 gacha_num = 2; * @return this */ - public DoGachaScRsp clearGachaId() { + public DoGachaScRsp clearGachaNum() { bitField0_ &= ~0x00000001; - gachaId = 0; + gachaNum = 0; return this; } /** - * optional uint32 gacha_id = 4; - * @return the gachaId + * optional uint32 gacha_num = 2; + * @return the gachaNum */ - public int getGachaId() { - return gachaId; + public int getGachaNum() { + return gachaNum; } /** - * optional uint32 gacha_id = 4; - * @param value the gachaId to set + * optional uint32 gacha_num = 2; + * @param value the gachaNum to set * @return this */ - public DoGachaScRsp setGachaId(final int value) { + public DoGachaScRsp setGachaNum(final int value) { bitField0_ |= 0x00000001; - gachaId = value; + gachaNum = value; return this; } /** - * optional uint32 gacha_num = 5; - * @return whether the gachaNum field is set + * optional uint32 ceiling_num = 9; + * @return whether the ceilingNum field is set */ - public boolean hasGachaNum() { + public boolean hasCeilingNum() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 gacha_num = 5; + * optional uint32 ceiling_num = 9; * @return this */ - public DoGachaScRsp clearGachaNum() { + public DoGachaScRsp clearCeilingNum() { bitField0_ &= ~0x00000002; - gachaNum = 0; + ceilingNum = 0; return this; } /** - * optional uint32 gacha_num = 5; - * @return the gachaNum + * optional uint32 ceiling_num = 9; + * @return the ceilingNum */ - public int getGachaNum() { - return gachaNum; + public int getCeilingNum() { + return ceilingNum; } /** - * optional uint32 gacha_num = 5; - * @param value the gachaNum to set + * optional uint32 ceiling_num = 9; + * @param value the ceilingNum to set * @return this */ - public DoGachaScRsp setGachaNum(final int value) { + public DoGachaScRsp setCeilingNum(final int value) { bitField0_ |= 0x00000002; - gachaNum = value; + ceilingNum = value; return this; } /** - * optional uint32 ceiling_num = 13; - * @return whether the ceilingNum field is set + * optional uint32 retcode = 12; + * @return whether the retcode field is set */ - public boolean hasCeilingNum() { + public boolean hasRetcode() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 ceiling_num = 13; + * optional uint32 retcode = 12; * @return this */ - public DoGachaScRsp clearCeilingNum() { + public DoGachaScRsp clearRetcode() { bitField0_ &= ~0x00000004; - ceilingNum = 0; + retcode = 0; return this; } /** - * optional uint32 ceiling_num = 13; - * @return the ceilingNum + * optional uint32 retcode = 12; + * @return the retcode */ - public int getCeilingNum() { - return ceilingNum; + public int getRetcode() { + return retcode; } /** - * optional uint32 ceiling_num = 13; - * @param value the ceilingNum to set + * optional uint32 retcode = 12; + * @param value the retcode to set * @return this */ - public DoGachaScRsp setCeilingNum(final int value) { + public DoGachaScRsp setRetcode(final int value) { bitField0_ |= 0x00000004; - ceilingNum = value; + retcode = value; return this; } /** - * optional uint32 retcode = 14; - * @return whether the retcode field is set + * optional uint32 gacha_id = 13; + * @return whether the gachaId field is set */ - public boolean hasRetcode() { + public boolean hasGachaId() { return (bitField0_ & 0x00000008) != 0; } /** - * optional uint32 retcode = 14; + * optional uint32 gacha_id = 13; * @return this */ - public DoGachaScRsp clearRetcode() { + public DoGachaScRsp clearGachaId() { bitField0_ &= ~0x00000008; - retcode = 0; + gachaId = 0; return this; } /** - * optional uint32 retcode = 14; - * @return the retcode + * optional uint32 gacha_id = 13; + * @return the gachaId */ - public int getRetcode() { - return retcode; + public int getGachaId() { + return gachaId; } /** - * optional uint32 retcode = 14; - * @param value the retcode to set + * optional uint32 gacha_id = 13; + * @param value the gachaId to set * @return this */ - public DoGachaScRsp setRetcode(final int value) { + public DoGachaScRsp setGachaId(final int value) { bitField0_ |= 0x00000008; - retcode = value; + gachaId = value; return this; } /** - * repeated .GachaItem gacha_item_list = 7; + * repeated .GachaItem gacha_item_list = 3; * @return whether the gachaItemList field is set */ public boolean hasGachaItemList() { @@ -211,7 +211,7 @@ public boolean hasGachaItemList() { } /** - * repeated .GachaItem gacha_item_list = 7; + * repeated .GachaItem gacha_item_list = 3; * @return this */ public DoGachaScRsp clearGachaItemList() { @@ -221,7 +221,7 @@ public DoGachaScRsp clearGachaItemList() { } /** - * repeated .GachaItem gacha_item_list = 7; + * repeated .GachaItem gacha_item_list = 3; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -235,7 +235,7 @@ public RepeatedMessage getGachaItemList() { } /** - * repeated .GachaItem gacha_item_list = 7; + * repeated .GachaItem gacha_item_list = 3; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -249,7 +249,7 @@ public RepeatedMessage getMutableGachaItemList() } /** - * repeated .GachaItem gacha_item_list = 7; + * repeated .GachaItem gacha_item_list = 3; * @param value the gachaItemList to add * @return this */ @@ -260,7 +260,7 @@ public DoGachaScRsp addGachaItemList(final GachaItemOuterClass.GachaItem value) } /** - * repeated .GachaItem gacha_item_list = 7; + * repeated .GachaItem gacha_item_list = 3; * @param values the gachaItemList to add * @return this */ @@ -275,10 +275,10 @@ public DoGachaScRsp copyFrom(final DoGachaScRsp other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - gachaId = other.gachaId; gachaNum = other.gachaNum; ceilingNum = other.ceilingNum; retcode = other.retcode; + gachaId = other.gachaId; gachaItemList.copyFrom(other.gachaItemList); } return this; @@ -290,9 +290,6 @@ public DoGachaScRsp mergeFrom(final DoGachaScRsp other) { return this; } cachedSize = -1; - if (other.hasGachaId()) { - setGachaId(other.gachaId); - } if (other.hasGachaNum()) { setGachaNum(other.gachaNum); } @@ -302,6 +299,9 @@ public DoGachaScRsp mergeFrom(final DoGachaScRsp other) { if (other.hasRetcode()) { setRetcode(other.retcode); } + if (other.hasGachaId()) { + setGachaId(other.gachaId); + } if (other.hasGachaItemList()) { getMutableGachaItemList().addAll(other.gachaItemList); } @@ -315,10 +315,10 @@ public DoGachaScRsp clear() { } cachedSize = -1; bitField0_ = 0; - gachaId = 0; gachaNum = 0; ceilingNum = 0; retcode = 0; + gachaId = 0; gachaItemList.clear(); return this; } @@ -344,34 +344,34 @@ public boolean equals(Object o) { } DoGachaScRsp other = (DoGachaScRsp) o; return bitField0_ == other.bitField0_ - && (!hasGachaId() || gachaId == other.gachaId) && (!hasGachaNum() || gachaNum == other.gachaNum) && (!hasCeilingNum() || ceilingNum == other.ceilingNum) && (!hasRetcode() || retcode == other.retcode) + && (!hasGachaId() || gachaId == other.gachaId) && (!hasGachaItemList() || gachaItemList.equals(other.gachaItemList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); - output.writeUInt32NoTag(gachaId); + output.writeRawByte((byte) 16); + output.writeUInt32NoTag(gachaNum); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 40); - output.writeUInt32NoTag(gachaNum); + output.writeRawByte((byte) 72); + output.writeUInt32NoTag(ceilingNum); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 104); - output.writeUInt32NoTag(ceilingNum); + output.writeRawByte((byte) 96); + output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 112); - output.writeUInt32NoTag(retcode); + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(gachaId); } if ((bitField0_ & 0x00000010) != 0) { for (int i = 0; i < gachaItemList.length(); i++) { - output.writeRawByte((byte) 58); + output.writeRawByte((byte) 26); output.writeMessageNoTag(gachaItemList.get(i)); } } @@ -381,16 +381,16 @@ public void writeTo(final ProtoSink output) throws IOException { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaNum); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaNum); + size += 1 + ProtoSink.computeUInt32SizeNoTag(ceilingNum); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(ceilingNum); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaId); } if ((bitField0_ & 0x00000010) != 0) { size += (1 * gachaItemList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(gachaItemList); @@ -405,43 +405,43 @@ public DoGachaScRsp mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { - // gachaId - gachaId = input.readUInt32(); + case 16: { + // gachaNum + gachaNum = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 40) { + if (tag != 72) { break; } } - case 40: { - // gachaNum - gachaNum = input.readUInt32(); + case 72: { + // ceilingNum + ceilingNum = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 104) { + if (tag != 96) { break; } } - case 104: { - // ceilingNum - ceilingNum = input.readUInt32(); + case 96: { + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 112) { + if (tag != 104) { break; } } - case 112: { - // retcode - retcode = input.readUInt32(); + case 104: { + // gachaId + gachaId = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 58) { + if (tag != 26) { break; } } - case 58: { + case 26: { // gachaItemList tag = input.readRepeatedMessage(gachaItemList, tag); bitField0_ |= 0x00000010; @@ -467,16 +467,16 @@ public DoGachaScRsp mergeFrom(final ProtoSource input) throws IOException { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.gachaId, gachaId); + output.writeUInt32(FieldNames.gachaNum, gachaNum); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.gachaNum, gachaNum); + output.writeUInt32(FieldNames.ceilingNum, ceilingNum); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.ceilingNum, ceilingNum); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.gachaId, gachaId); } if ((bitField0_ & 0x00000010) != 0) { output.writeRepeatedMessage(FieldNames.gachaItemList, gachaItemList); @@ -491,24 +491,12 @@ public DoGachaScRsp mergeFrom(final JsonSource input) throws IOException { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -204751299: - case -2052301576: { - if (input.isAtField(FieldNames.gachaId)) { - if (!input.trySkipNullValue()) { - gachaId = input.readUInt32(); - bitField0_ |= 0x00000001; - } - } else { - input.skipUnknownField(); - } - break; - } case -2052317532: case 803166025: { if (input.isAtField(FieldNames.gachaNum)) { if (!input.trySkipNullValue()) { gachaNum = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; } } else { input.skipUnknownField(); @@ -520,7 +508,7 @@ public DoGachaScRsp mergeFrom(final JsonSource input) throws IOException { if (input.isAtField(FieldNames.ceilingNum)) { if (!input.trySkipNullValue()) { ceilingNum = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; } } else { input.skipUnknownField(); @@ -531,6 +519,18 @@ public DoGachaScRsp mergeFrom(final JsonSource input) throws IOException { if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { retcode = input.readUInt32(); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } + case -204751299: + case -2052301576: { + if (input.isAtField(FieldNames.gachaId)) { + if (!input.trySkipNullValue()) { + gachaId = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -602,14 +602,14 @@ public DoGachaScRsp create() { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName gachaId = FieldName.forField("gachaId", "gacha_id"); - static final FieldName gachaNum = FieldName.forField("gachaNum", "gacha_num"); static final FieldName ceilingNum = FieldName.forField("ceilingNum", "ceiling_num"); static final FieldName retcode = FieldName.forField("retcode"); + static final FieldName gachaId = FieldName.forField("gachaId", "gacha_id"); + static final FieldName gachaItemList = FieldName.forField("gachaItemList", "gacha_item_list"); } } diff --git a/src/generated/main/emu/lunarcore/proto/DressAvatarCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/DressAvatarCsReqOuterClass.java index 3c3ae596e..503351801 100644 --- a/src/generated/main/emu/lunarcore/proto/DressAvatarCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/DressAvatarCsReqOuterClass.java @@ -19,14 +19,14 @@ public static final class DressAvatarCsReq extends ProtoMessageoptional uint32 base_avatar_id = 2; + * optional uint32 equipment_unique_id = 1; */ - private int baseAvatarId; + private int equipmentUniqueId; /** - * optional uint32 equipment_unique_id = 4; + * optional uint32 base_avatar_id = 10; */ - private int equipmentUniqueId; + private int baseAvatarId; private DressAvatarCsReq() { } @@ -39,76 +39,76 @@ public static DressAvatarCsReq newInstance() { } /** - * optional uint32 base_avatar_id = 2; - * @return whether the baseAvatarId field is set + * optional uint32 equipment_unique_id = 1; + * @return whether the equipmentUniqueId field is set */ - public boolean hasBaseAvatarId() { + public boolean hasEquipmentUniqueId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 base_avatar_id = 2; + * optional uint32 equipment_unique_id = 1; * @return this */ - public DressAvatarCsReq clearBaseAvatarId() { + public DressAvatarCsReq clearEquipmentUniqueId() { bitField0_ &= ~0x00000001; - baseAvatarId = 0; + equipmentUniqueId = 0; return this; } /** - * optional uint32 base_avatar_id = 2; - * @return the baseAvatarId + * optional uint32 equipment_unique_id = 1; + * @return the equipmentUniqueId */ - public int getBaseAvatarId() { - return baseAvatarId; + public int getEquipmentUniqueId() { + return equipmentUniqueId; } /** - * optional uint32 base_avatar_id = 2; - * @param value the baseAvatarId to set + * optional uint32 equipment_unique_id = 1; + * @param value the equipmentUniqueId to set * @return this */ - public DressAvatarCsReq setBaseAvatarId(final int value) { + public DressAvatarCsReq setEquipmentUniqueId(final int value) { bitField0_ |= 0x00000001; - baseAvatarId = value; + equipmentUniqueId = value; return this; } /** - * optional uint32 equipment_unique_id = 4; - * @return whether the equipmentUniqueId field is set + * optional uint32 base_avatar_id = 10; + * @return whether the baseAvatarId field is set */ - public boolean hasEquipmentUniqueId() { + public boolean hasBaseAvatarId() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 equipment_unique_id = 4; + * optional uint32 base_avatar_id = 10; * @return this */ - public DressAvatarCsReq clearEquipmentUniqueId() { + public DressAvatarCsReq clearBaseAvatarId() { bitField0_ &= ~0x00000002; - equipmentUniqueId = 0; + baseAvatarId = 0; return this; } /** - * optional uint32 equipment_unique_id = 4; - * @return the equipmentUniqueId + * optional uint32 base_avatar_id = 10; + * @return the baseAvatarId */ - public int getEquipmentUniqueId() { - return equipmentUniqueId; + public int getBaseAvatarId() { + return baseAvatarId; } /** - * optional uint32 equipment_unique_id = 4; - * @param value the equipmentUniqueId to set + * optional uint32 base_avatar_id = 10; + * @param value the baseAvatarId to set * @return this */ - public DressAvatarCsReq setEquipmentUniqueId(final int value) { + public DressAvatarCsReq setBaseAvatarId(final int value) { bitField0_ |= 0x00000002; - equipmentUniqueId = value; + baseAvatarId = value; return this; } @@ -117,8 +117,8 @@ public DressAvatarCsReq copyFrom(final DressAvatarCsReq other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - baseAvatarId = other.baseAvatarId; equipmentUniqueId = other.equipmentUniqueId; + baseAvatarId = other.baseAvatarId; } return this; } @@ -129,12 +129,12 @@ public DressAvatarCsReq mergeFrom(final DressAvatarCsReq other) { return this; } cachedSize = -1; - if (other.hasBaseAvatarId()) { - setBaseAvatarId(other.baseAvatarId); - } if (other.hasEquipmentUniqueId()) { setEquipmentUniqueId(other.equipmentUniqueId); } + if (other.hasBaseAvatarId()) { + setBaseAvatarId(other.baseAvatarId); + } return this; } @@ -145,8 +145,8 @@ public DressAvatarCsReq clear() { } cachedSize = -1; bitField0_ = 0; - baseAvatarId = 0; equipmentUniqueId = 0; + baseAvatarId = 0; return this; } @@ -170,19 +170,19 @@ public boolean equals(Object o) { } DressAvatarCsReq other = (DressAvatarCsReq) o; return bitField0_ == other.bitField0_ - && (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId) - && (!hasEquipmentUniqueId() || equipmentUniqueId == other.equipmentUniqueId); + && (!hasEquipmentUniqueId() || equipmentUniqueId == other.equipmentUniqueId) + && (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); - output.writeUInt32NoTag(baseAvatarId); + output.writeRawByte((byte) 8); + output.writeUInt32NoTag(equipmentUniqueId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 32); - output.writeUInt32NoTag(equipmentUniqueId); + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(baseAvatarId); } } @@ -190,10 +190,10 @@ public void writeTo(final ProtoSink output) throws IOException { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(equipmentUniqueId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(equipmentUniqueId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId); } return size; } @@ -205,18 +205,18 @@ public DressAvatarCsReq mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { - // baseAvatarId - baseAvatarId = input.readUInt32(); + case 8: { + // equipmentUniqueId + equipmentUniqueId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 32) { + if (tag != 80) { break; } } - case 32: { - // equipmentUniqueId - equipmentUniqueId = input.readUInt32(); + case 80: { + // baseAvatarId + baseAvatarId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -241,10 +241,10 @@ public DressAvatarCsReq mergeFrom(final ProtoSource input) throws IOException { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId); + output.writeUInt32(FieldNames.equipmentUniqueId, equipmentUniqueId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.equipmentUniqueId, equipmentUniqueId); + output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId); } output.endObject(); } @@ -256,11 +256,11 @@ public DressAvatarCsReq mergeFrom(final JsonSource input) throws IOException { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 118022725: - case -1756826157: { - if (input.isAtField(FieldNames.baseAvatarId)) { + case -1867136902: + case 760467160: { + if (input.isAtField(FieldNames.equipmentUniqueId)) { if (!input.trySkipNullValue()) { - baseAvatarId = input.readUInt32(); + equipmentUniqueId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -268,11 +268,11 @@ public DressAvatarCsReq mergeFrom(final JsonSource input) throws IOException { } break; } - case -1867136902: - case 760467160: { - if (input.isAtField(FieldNames.equipmentUniqueId)) { + case 118022725: + case -1756826157: { + if (input.isAtField(FieldNames.baseAvatarId)) { if (!input.trySkipNullValue()) { - equipmentUniqueId = input.readUInt32(); + baseAvatarId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -333,9 +333,9 @@ public DressAvatarCsReq create() { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName baseAvatarId = FieldName.forField("baseAvatarId", "base_avatar_id"); - static final FieldName equipmentUniqueId = FieldName.forField("equipmentUniqueId", "equipment_unique_id"); + + static final FieldName baseAvatarId = FieldName.forField("baseAvatarId", "base_avatar_id"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/DressRelicAvatarCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/DressRelicAvatarCsReqOuterClass.java index 12122ecab..2bbe58960 100644 --- a/src/generated/main/emu/lunarcore/proto/DressRelicAvatarCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/DressRelicAvatarCsReqOuterClass.java @@ -20,12 +20,12 @@ public static final class DressRelicAvatarCsReq extends ProtoMessageoptional uint32 base_avatar_id = 5; + * optional uint32 base_avatar_id = 3; */ private int baseAvatarId; /** - * repeated .RelicParam param_list = 15; + * repeated .RelicParam param_list = 10; */ private final RepeatedMessage paramList = RepeatedMessage.newEmptyInstance(RelicParamOuterClass.RelicParam.getFactory()); @@ -40,7 +40,7 @@ public static DressRelicAvatarCsReq newInstance() { } /** - * optional uint32 base_avatar_id = 5; + * optional uint32 base_avatar_id = 3; * @return whether the baseAvatarId field is set */ public boolean hasBaseAvatarId() { @@ -48,7 +48,7 @@ public boolean hasBaseAvatarId() { } /** - * optional uint32 base_avatar_id = 5; + * optional uint32 base_avatar_id = 3; * @return this */ public DressRelicAvatarCsReq clearBaseAvatarId() { @@ -58,7 +58,7 @@ public DressRelicAvatarCsReq clearBaseAvatarId() { } /** - * optional uint32 base_avatar_id = 5; + * optional uint32 base_avatar_id = 3; * @return the baseAvatarId */ public int getBaseAvatarId() { @@ -66,7 +66,7 @@ public int getBaseAvatarId() { } /** - * optional uint32 base_avatar_id = 5; + * optional uint32 base_avatar_id = 3; * @param value the baseAvatarId to set * @return this */ @@ -77,7 +77,7 @@ public DressRelicAvatarCsReq setBaseAvatarId(final int value) { } /** - * repeated .RelicParam param_list = 15; + * repeated .RelicParam param_list = 10; * @return whether the paramList field is set */ public boolean hasParamList() { @@ -85,7 +85,7 @@ public boolean hasParamList() { } /** - * repeated .RelicParam param_list = 15; + * repeated .RelicParam param_list = 10; * @return this */ public DressRelicAvatarCsReq clearParamList() { @@ -95,7 +95,7 @@ public DressRelicAvatarCsReq clearParamList() { } /** - * repeated .RelicParam param_list = 15; + * repeated .RelicParam param_list = 10; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -109,7 +109,7 @@ public RepeatedMessage getParamList() { } /** - * repeated .RelicParam param_list = 15; + * repeated .RelicParam param_list = 10; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -123,7 +123,7 @@ public RepeatedMessage getMutableParamList() { } /** - * repeated .RelicParam param_list = 15; + * repeated .RelicParam param_list = 10; * @param value the paramList to add * @return this */ @@ -134,7 +134,7 @@ public DressRelicAvatarCsReq addParamList(final RelicParamOuterClass.RelicParam } /** - * repeated .RelicParam param_list = 15; + * repeated .RelicParam param_list = 10; * @param values the paramList to add * @return this */ @@ -210,12 +210,12 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(baseAvatarId); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < paramList.length(); i++) { - output.writeRawByte((byte) 122); + output.writeRawByte((byte) 82); output.writeMessageNoTag(paramList.get(i)); } } @@ -240,16 +240,16 @@ public DressRelicAvatarCsReq mergeFrom(final ProtoSource input) throws IOExcepti int tag = input.readTag(); while (true) { switch (tag) { - case 40: { + case 24: { // baseAvatarId baseAvatarId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 122) { + if (tag != 82) { break; } } - case 122: { + case 82: { // paramList tag = input.readRepeatedMessage(paramList, tag); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/RogueQueryOuterClass.java b/src/generated/main/emu/lunarcore/proto/EnterMapRotationRegionCsReqOuterClass.java similarity index 51% rename from src/generated/main/emu/lunarcore/proto/RogueQueryOuterClass.java rename to src/generated/main/emu/lunarcore/proto/EnterMapRotationRegionCsReqOuterClass.java index f4f0ce7f3..0cdb40bb4 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueQueryOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/EnterMapRotationRegionCsReqOuterClass.java @@ -10,64 +10,63 @@ import us.hebi.quickbuf.ProtoMessage; import us.hebi.quickbuf.ProtoSink; import us.hebi.quickbuf.ProtoSource; -import us.hebi.quickbuf.RepeatedInt; -public final class RogueQueryOuterClass { +public final class EnterMapRotationRegionCsReqOuterClass { /** - * Protobuf type {@code RogueQuery} + * Protobuf type {@code EnterMapRotationRegionCsReq} */ - public static final class RogueQuery extends ProtoMessage implements Cloneable { + public static final class EnterMapRotationRegionCsReq extends ProtoMessage implements Cloneable { private static final long serialVersionUID = 0L; /** - * repeated uint32 FFJHNGIINMN = 13; + * optional .MotionInfo motion = 12; */ - private final RepeatedInt fFJHNGIINMN = RepeatedInt.newEmptyInstance(); + private final MotionInfoOuterClass.MotionInfo motion = MotionInfoOuterClass.MotionInfo.newInstance(); - private RogueQuery() { + private EnterMapRotationRegionCsReq() { } /** - * @return a new empty instance of {@code RogueQuery} + * @return a new empty instance of {@code EnterMapRotationRegionCsReq} */ - public static RogueQuery newInstance() { - return new RogueQuery(); + public static EnterMapRotationRegionCsReq newInstance() { + return new EnterMapRotationRegionCsReq(); } /** - * repeated uint32 FFJHNGIINMN = 13; - * @return whether the fFJHNGIINMN field is set + * optional .MotionInfo motion = 12; + * @return whether the motion field is set */ - public boolean hasFFJHNGIINMN() { + public boolean hasMotion() { return (bitField0_ & 0x00000001) != 0; } /** - * repeated uint32 FFJHNGIINMN = 13; + * optional .MotionInfo motion = 12; * @return this */ - public RogueQuery clearFFJHNGIINMN() { + public EnterMapRotationRegionCsReq clearMotion() { bitField0_ &= ~0x00000001; - fFJHNGIINMN.clear(); + motion.clear(); return this; } /** - * repeated uint32 FFJHNGIINMN = 13; + * optional .MotionInfo motion = 12; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. * - * Use {@link #getMutableFFJHNGIINMN()} if you want to modify it. + * Use {@link #getMutableMotion()} if you want to modify it. * * @return internal storage object for reading */ - public RepeatedInt getFFJHNGIINMN() { - return fFJHNGIINMN; + public MotionInfoOuterClass.MotionInfo getMotion() { + return motion; } /** - * repeated uint32 FFJHNGIINMN = 13; + * optional .MotionInfo motion = 12; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -75,74 +74,63 @@ public RepeatedInt getFFJHNGIINMN() { * * @return internal storage object for modifications */ - public RepeatedInt getMutableFFJHNGIINMN() { + public MotionInfoOuterClass.MotionInfo getMutableMotion() { bitField0_ |= 0x00000001; - return fFJHNGIINMN; + return motion; } /** - * repeated uint32 FFJHNGIINMN = 13; - * @param value the fFJHNGIINMN to add + * optional .MotionInfo motion = 12; + * @param value the motion to set * @return this */ - public RogueQuery addFFJHNGIINMN(final int value) { + public EnterMapRotationRegionCsReq setMotion(final MotionInfoOuterClass.MotionInfo value) { bitField0_ |= 0x00000001; - fFJHNGIINMN.add(value); - return this; - } - - /** - * repeated uint32 FFJHNGIINMN = 13; - * @param values the fFJHNGIINMN to add - * @return this - */ - public RogueQuery addAllFFJHNGIINMN(final int... values) { - bitField0_ |= 0x00000001; - fFJHNGIINMN.addAll(values); + motion.copyFrom(value); return this; } @Override - public RogueQuery copyFrom(final RogueQuery other) { + public EnterMapRotationRegionCsReq copyFrom(final EnterMapRotationRegionCsReq other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - fFJHNGIINMN.copyFrom(other.fFJHNGIINMN); + motion.copyFrom(other.motion); } return this; } @Override - public RogueQuery mergeFrom(final RogueQuery other) { + public EnterMapRotationRegionCsReq mergeFrom(final EnterMapRotationRegionCsReq other) { if (other.isEmpty()) { return this; } cachedSize = -1; - if (other.hasFFJHNGIINMN()) { - getMutableFFJHNGIINMN().addAll(other.fFJHNGIINMN); + if (other.hasMotion()) { + getMutableMotion().mergeFrom(other.motion); } return this; } @Override - public RogueQuery clear() { + public EnterMapRotationRegionCsReq clear() { if (isEmpty()) { return this; } cachedSize = -1; bitField0_ = 0; - fFJHNGIINMN.clear(); + motion.clear(); return this; } @Override - public RogueQuery clearQuick() { + public EnterMapRotationRegionCsReq clearQuick() { if (isEmpty()) { return this; } cachedSize = -1; bitField0_ = 0; - fFJHNGIINMN.clear(); + motion.clearQuick(); return this; } @@ -151,21 +139,19 @@ public boolean equals(Object o) { if (o == this) { return true; } - if (!(o instanceof RogueQuery)) { + if (!(o instanceof EnterMapRotationRegionCsReq)) { return false; } - RogueQuery other = (RogueQuery) o; + EnterMapRotationRegionCsReq other = (EnterMapRotationRegionCsReq) o; return bitField0_ == other.bitField0_ - && (!hasFFJHNGIINMN() || fFJHNGIINMN.equals(other.fFJHNGIINMN)); + && (!hasMotion() || motion.equals(other.motion)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - for (int i = 0; i < fFJHNGIINMN.length(); i++) { - output.writeRawByte((byte) 104); - output.writeUInt32NoTag(fFJHNGIINMN.array()[i]); - } + output.writeRawByte((byte) 98); + output.writeMessageNoTag(motion); } } @@ -173,21 +159,21 @@ public void writeTo(final ProtoSink output) throws IOException { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += (1 * fFJHNGIINMN.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(fFJHNGIINMN); + size += 1 + ProtoSink.computeMessageSizeNoTag(motion); } return size; } @Override @SuppressWarnings("fallthrough") - public RogueQuery mergeFrom(final ProtoSource input) throws IOException { + public EnterMapRotationRegionCsReq mergeFrom(final ProtoSource input) throws IOException { // Enabled Fall-Through Optimization (QuickBuffers) int tag = input.readTag(); while (true) { switch (tag) { - case 106: { - // fFJHNGIINMN [packed=true] - input.readPackedUInt32(fFJHNGIINMN, tag); + case 98: { + // motion + input.readMessage(motion); bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 0) { @@ -204,12 +190,6 @@ public RogueQuery mergeFrom(final ProtoSource input) throws IOException { tag = input.readTag(); break; } - case 104: { - // fFJHNGIINMN [packed=false] - tag = input.readRepeatedUInt32(fFJHNGIINMN, tag); - bitField0_ |= 0x00000001; - break; - } } } } @@ -218,22 +198,22 @@ public RogueQuery mergeFrom(final ProtoSource input) throws IOException { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeRepeatedUInt32(FieldNames.fFJHNGIINMN, fFJHNGIINMN); + output.writeMessage(FieldNames.motion, motion); } output.endObject(); } @Override - public RogueQuery mergeFrom(final JsonSource input) throws IOException { + public EnterMapRotationRegionCsReq mergeFrom(final JsonSource input) throws IOException { if (!input.beginObject()) { return this; } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 825210744: { - if (input.isAtField(FieldNames.fFJHNGIINMN)) { + case -1068318794: { + if (input.isAtField(FieldNames.motion)) { if (!input.trySkipNullValue()) { - input.readRepeatedUInt32(fFJHNGIINMN); + input.readMessage(motion); bitField0_ |= 0x00000001; } } else { @@ -252,8 +232,8 @@ public RogueQuery mergeFrom(final JsonSource input) throws IOException { } @Override - public RogueQuery clone() { - return new RogueQuery().copyFrom(this); + public EnterMapRotationRegionCsReq clone() { + return new EnterMapRotationRegionCsReq().copyFrom(this); } @Override @@ -261,31 +241,33 @@ public boolean isEmpty() { return ((bitField0_) == 0); } - public static RogueQuery parseFrom(final byte[] data) throws InvalidProtocolBufferException { - return ProtoMessage.mergeFrom(new RogueQuery(), data).checkInitialized(); + public static EnterMapRotationRegionCsReq parseFrom(final byte[] data) throws + InvalidProtocolBufferException { + return ProtoMessage.mergeFrom(new EnterMapRotationRegionCsReq(), data).checkInitialized(); } - public static RogueQuery parseFrom(final ProtoSource input) throws IOException { - return ProtoMessage.mergeFrom(new RogueQuery(), input).checkInitialized(); + public static EnterMapRotationRegionCsReq parseFrom(final ProtoSource input) throws + IOException { + return ProtoMessage.mergeFrom(new EnterMapRotationRegionCsReq(), input).checkInitialized(); } - public static RogueQuery parseFrom(final JsonSource input) throws IOException { - return ProtoMessage.mergeFrom(new RogueQuery(), input).checkInitialized(); + public static EnterMapRotationRegionCsReq parseFrom(final JsonSource input) throws IOException { + return ProtoMessage.mergeFrom(new EnterMapRotationRegionCsReq(), input).checkInitialized(); } /** - * @return factory for creating RogueQuery messages + * @return factory for creating EnterMapRotationRegionCsReq messages */ - public static MessageFactory getFactory() { - return RogueQueryFactory.INSTANCE; + public static MessageFactory getFactory() { + return EnterMapRotationRegionCsReqFactory.INSTANCE; } - private enum RogueQueryFactory implements MessageFactory { + private enum EnterMapRotationRegionCsReqFactory implements MessageFactory { INSTANCE; @Override - public RogueQuery create() { - return RogueQuery.newInstance(); + public EnterMapRotationRegionCsReq create() { + return EnterMapRotationRegionCsReq.newInstance(); } } @@ -293,7 +275,7 @@ public RogueQuery create() { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName fFJHNGIINMN = FieldName.forField("FFJHNGIINMN"); + static final FieldName motion = FieldName.forField("motion"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/EnterMapRotationRegionScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/EnterMapRotationRegionScRspOuterClass.java new file mode 100644 index 000000000..e1df4ed0c --- /dev/null +++ b/src/generated/main/emu/lunarcore/proto/EnterMapRotationRegionScRspOuterClass.java @@ -0,0 +1,442 @@ +// Code generated by protocol buffer compiler. Do not edit! +package emu.lunarcore.proto; + +import java.io.IOException; +import us.hebi.quickbuf.FieldName; +import us.hebi.quickbuf.InvalidProtocolBufferException; +import us.hebi.quickbuf.JsonSink; +import us.hebi.quickbuf.JsonSource; +import us.hebi.quickbuf.MessageFactory; +import us.hebi.quickbuf.ProtoMessage; +import us.hebi.quickbuf.ProtoSink; +import us.hebi.quickbuf.ProtoSource; + +public final class EnterMapRotationRegionScRspOuterClass { + /** + * Protobuf type {@code EnterMapRotationRegionScRsp} + */ + public static final class EnterMapRotationRegionScRsp extends ProtoMessage implements Cloneable { + private static final long serialVersionUID = 0L; + + /** + * optional uint32 client_pos_version = 1; + */ + private int clientPosVersion; + + /** + * optional uint32 retcode = 5; + */ + private int retcode; + + /** + * optional .MotionInfo motion = 10; + */ + private final MotionInfoOuterClass.MotionInfo motion = MotionInfoOuterClass.MotionInfo.newInstance(); + + private EnterMapRotationRegionScRsp() { + } + + /** + * @return a new empty instance of {@code EnterMapRotationRegionScRsp} + */ + public static EnterMapRotationRegionScRsp newInstance() { + return new EnterMapRotationRegionScRsp(); + } + + /** + * optional uint32 client_pos_version = 1; + * @return whether the clientPosVersion field is set + */ + public boolean hasClientPosVersion() { + return (bitField0_ & 0x00000001) != 0; + } + + /** + * optional uint32 client_pos_version = 1; + * @return this + */ + public EnterMapRotationRegionScRsp clearClientPosVersion() { + bitField0_ &= ~0x00000001; + clientPosVersion = 0; + return this; + } + + /** + * optional uint32 client_pos_version = 1; + * @return the clientPosVersion + */ + public int getClientPosVersion() { + return clientPosVersion; + } + + /** + * optional uint32 client_pos_version = 1; + * @param value the clientPosVersion to set + * @return this + */ + public EnterMapRotationRegionScRsp setClientPosVersion(final int value) { + bitField0_ |= 0x00000001; + clientPosVersion = value; + return this; + } + + /** + * optional uint32 retcode = 5; + * @return whether the retcode field is set + */ + public boolean hasRetcode() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 retcode = 5; + * @return this + */ + public EnterMapRotationRegionScRsp clearRetcode() { + bitField0_ &= ~0x00000002; + retcode = 0; + return this; + } + + /** + * optional uint32 retcode = 5; + * @return the retcode + */ + public int getRetcode() { + return retcode; + } + + /** + * optional uint32 retcode = 5; + * @param value the retcode to set + * @return this + */ + public EnterMapRotationRegionScRsp setRetcode(final int value) { + bitField0_ |= 0x00000002; + retcode = value; + return this; + } + + /** + * optional .MotionInfo motion = 10; + * @return whether the motion field is set + */ + public boolean hasMotion() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional .MotionInfo motion = 10; + * @return this + */ + public EnterMapRotationRegionScRsp clearMotion() { + bitField0_ &= ~0x00000004; + motion.clear(); + return this; + } + + /** + * optional .MotionInfo motion = 10; + * + * This method returns the internal storage object without modifying any has state. + * The returned object should not be modified and be treated as read-only. + * + * Use {@link #getMutableMotion()} if you want to modify it. + * + * @return internal storage object for reading + */ + public MotionInfoOuterClass.MotionInfo getMotion() { + return motion; + } + + /** + * optional .MotionInfo motion = 10; + * + * This method returns the internal storage object and sets the corresponding + * has state. The returned object will become part of this message and its + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public MotionInfoOuterClass.MotionInfo getMutableMotion() { + bitField0_ |= 0x00000004; + return motion; + } + + /** + * optional .MotionInfo motion = 10; + * @param value the motion to set + * @return this + */ + public EnterMapRotationRegionScRsp setMotion(final MotionInfoOuterClass.MotionInfo value) { + bitField0_ |= 0x00000004; + motion.copyFrom(value); + return this; + } + + @Override + public EnterMapRotationRegionScRsp copyFrom(final EnterMapRotationRegionScRsp other) { + cachedSize = other.cachedSize; + if ((bitField0_ | other.bitField0_) != 0) { + bitField0_ = other.bitField0_; + clientPosVersion = other.clientPosVersion; + retcode = other.retcode; + motion.copyFrom(other.motion); + } + return this; + } + + @Override + public EnterMapRotationRegionScRsp mergeFrom(final EnterMapRotationRegionScRsp other) { + if (other.isEmpty()) { + return this; + } + cachedSize = -1; + if (other.hasClientPosVersion()) { + setClientPosVersion(other.clientPosVersion); + } + if (other.hasRetcode()) { + setRetcode(other.retcode); + } + if (other.hasMotion()) { + getMutableMotion().mergeFrom(other.motion); + } + return this; + } + + @Override + public EnterMapRotationRegionScRsp clear() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + clientPosVersion = 0; + retcode = 0; + motion.clear(); + return this; + } + + @Override + public EnterMapRotationRegionScRsp clearQuick() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + motion.clearQuick(); + return this; + } + + @Override + public boolean equals(Object o) { + if (o == this) { + return true; + } + if (!(o instanceof EnterMapRotationRegionScRsp)) { + return false; + } + EnterMapRotationRegionScRsp other = (EnterMapRotationRegionScRsp) o; + return bitField0_ == other.bitField0_ + && (!hasClientPosVersion() || clientPosVersion == other.clientPosVersion) + && (!hasRetcode() || retcode == other.retcode) + && (!hasMotion() || motion.equals(other.motion)); + } + + @Override + public void writeTo(final ProtoSink output) throws IOException { + if ((bitField0_ & 0x00000001) != 0) { + output.writeRawByte((byte) 8); + output.writeUInt32NoTag(clientPosVersion); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 40); + output.writeUInt32NoTag(retcode); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 82); + output.writeMessageNoTag(motion); + } + } + + @Override + protected int computeSerializedSize() { + int size = 0; + if ((bitField0_ & 0x00000001) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(clientPosVersion); + } + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + } + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeMessageSizeNoTag(motion); + } + return size; + } + + @Override + @SuppressWarnings("fallthrough") + public EnterMapRotationRegionScRsp mergeFrom(final ProtoSource input) throws IOException { + // Enabled Fall-Through Optimization (QuickBuffers) + int tag = input.readTag(); + while (true) { + switch (tag) { + case 8: { + // clientPosVersion + clientPosVersion = input.readUInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 40) { + break; + } + } + case 40: { + // retcode + retcode = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 82) { + break; + } + } + case 82: { + // motion + input.readMessage(motion); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 0) { + break; + } + } + case 0: { + return this; + } + default: { + if (!input.skipField(tag)) { + return this; + } + tag = input.readTag(); + break; + } + } + } + } + + @Override + public void writeTo(final JsonSink output) throws IOException { + output.beginObject(); + if ((bitField0_ & 0x00000001) != 0) { + output.writeUInt32(FieldNames.clientPosVersion, clientPosVersion); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeUInt32(FieldNames.retcode, retcode); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeMessage(FieldNames.motion, motion); + } + output.endObject(); + } + + @Override + public EnterMapRotationRegionScRsp mergeFrom(final JsonSource input) throws IOException { + if (!input.beginObject()) { + return this; + } + while (!input.isAtEnd()) { + switch (input.readFieldHash()) { + case 1787644431: + case 1278860153: { + if (input.isAtField(FieldNames.clientPosVersion)) { + if (!input.trySkipNullValue()) { + clientPosVersion = input.readUInt32(); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { + if (!input.trySkipNullValue()) { + retcode = input.readUInt32(); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + case -1068318794: { + if (input.isAtField(FieldNames.motion)) { + if (!input.trySkipNullValue()) { + input.readMessage(motion); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } + default: { + input.skipUnknownField(); + break; + } + } + } + input.endObject(); + return this; + } + + @Override + public EnterMapRotationRegionScRsp clone() { + return new EnterMapRotationRegionScRsp().copyFrom(this); + } + + @Override + public boolean isEmpty() { + return ((bitField0_) == 0); + } + + public static EnterMapRotationRegionScRsp parseFrom(final byte[] data) throws + InvalidProtocolBufferException { + return ProtoMessage.mergeFrom(new EnterMapRotationRegionScRsp(), data).checkInitialized(); + } + + public static EnterMapRotationRegionScRsp parseFrom(final ProtoSource input) throws + IOException { + return ProtoMessage.mergeFrom(new EnterMapRotationRegionScRsp(), input).checkInitialized(); + } + + public static EnterMapRotationRegionScRsp parseFrom(final JsonSource input) throws IOException { + return ProtoMessage.mergeFrom(new EnterMapRotationRegionScRsp(), input).checkInitialized(); + } + + /** + * @return factory for creating EnterMapRotationRegionScRsp messages + */ + public static MessageFactory getFactory() { + return EnterMapRotationRegionScRspFactory.INSTANCE; + } + + private enum EnterMapRotationRegionScRspFactory implements MessageFactory { + INSTANCE; + + @Override + public EnterMapRotationRegionScRsp create() { + return EnterMapRotationRegionScRsp.newInstance(); + } + } + + /** + * Contains name constants used for serializing JSON + */ + static class FieldNames { + static final FieldName clientPosVersion = FieldName.forField("clientPosVersion", "client_pos_version"); + + static final FieldName retcode = FieldName.forField("retcode"); + + static final FieldName motion = FieldName.forField("motion"); + } + } +} diff --git a/src/generated/main/emu/lunarcore/proto/EnterSceneByServerScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/EnterSceneByServerScNotifyOuterClass.java index c25e7e703..c0ce18f2f 100644 --- a/src/generated/main/emu/lunarcore/proto/EnterSceneByServerScNotifyOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/EnterSceneByServerScNotifyOuterClass.java @@ -19,17 +19,17 @@ public static final class EnterSceneByServerScNotify extends ProtoMessageoptional .EnterSceneReason reason = 3; + * optional .EnterSceneReason reason = 10; */ private int reason; /** - * optional .SceneInfo scene = 4; + * optional .SceneInfo scene = 5; */ private final SceneInfoOuterClass.SceneInfo scene = SceneInfoOuterClass.SceneInfo.newInstance(); /** - * optional .LineupInfo lineup = 12; + * optional .LineupInfo lineup = 6; */ private final LineupInfoOuterClass.LineupInfo lineup = LineupInfoOuterClass.LineupInfo.newInstance(); @@ -44,7 +44,7 @@ public static EnterSceneByServerScNotify newInstance() { } /** - * optional .EnterSceneReason reason = 3; + * optional .EnterSceneReason reason = 10; * @return whether the reason field is set */ public boolean hasReason() { @@ -52,7 +52,7 @@ public boolean hasReason() { } /** - * optional .EnterSceneReason reason = 3; + * optional .EnterSceneReason reason = 10; * @return this */ public EnterSceneByServerScNotify clearReason() { @@ -62,7 +62,7 @@ public EnterSceneByServerScNotify clearReason() { } /** - * optional .EnterSceneReason reason = 3; + * optional .EnterSceneReason reason = 10; * @return the reason */ public EnterSceneReasonOuterClass.EnterSceneReason getReason() { @@ -95,7 +95,7 @@ public EnterSceneByServerScNotify setReasonValue(final int value) { } /** - * optional .EnterSceneReason reason = 3; + * optional .EnterSceneReason reason = 10; * @param value the reason to set * @return this */ @@ -107,7 +107,7 @@ public EnterSceneByServerScNotify setReason( } /** - * optional .SceneInfo scene = 4; + * optional .SceneInfo scene = 5; * @return whether the scene field is set */ public boolean hasScene() { @@ -115,7 +115,7 @@ public boolean hasScene() { } /** - * optional .SceneInfo scene = 4; + * optional .SceneInfo scene = 5; * @return this */ public EnterSceneByServerScNotify clearScene() { @@ -125,7 +125,7 @@ public EnterSceneByServerScNotify clearScene() { } /** - * optional .SceneInfo scene = 4; + * optional .SceneInfo scene = 5; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -139,7 +139,7 @@ public SceneInfoOuterClass.SceneInfo getScene() { } /** - * optional .SceneInfo scene = 4; + * optional .SceneInfo scene = 5; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -153,7 +153,7 @@ public SceneInfoOuterClass.SceneInfo getMutableScene() { } /** - * optional .SceneInfo scene = 4; + * optional .SceneInfo scene = 5; * @param value the scene to set * @return this */ @@ -164,7 +164,7 @@ public EnterSceneByServerScNotify setScene(final SceneInfoOuterClass.SceneInfo v } /** - * optional .LineupInfo lineup = 12; + * optional .LineupInfo lineup = 6; * @return whether the lineup field is set */ public boolean hasLineup() { @@ -172,7 +172,7 @@ public boolean hasLineup() { } /** - * optional .LineupInfo lineup = 12; + * optional .LineupInfo lineup = 6; * @return this */ public EnterSceneByServerScNotify clearLineup() { @@ -182,7 +182,7 @@ public EnterSceneByServerScNotify clearLineup() { } /** - * optional .LineupInfo lineup = 12; + * optional .LineupInfo lineup = 6; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -196,7 +196,7 @@ public LineupInfoOuterClass.LineupInfo getLineup() { } /** - * optional .LineupInfo lineup = 12; + * optional .LineupInfo lineup = 6; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -210,7 +210,7 @@ public LineupInfoOuterClass.LineupInfo getMutableLineup() { } /** - * optional .LineupInfo lineup = 12; + * optional .LineupInfo lineup = 6; * @param value the lineup to set * @return this */ @@ -293,15 +293,15 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 80); output.writeEnumNoTag(reason); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 34); + output.writeRawByte((byte) 42); output.writeMessageNoTag(scene); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 98); + output.writeRawByte((byte) 50); output.writeMessageNoTag(lineup); } } @@ -328,7 +328,7 @@ public EnterSceneByServerScNotify mergeFrom(final ProtoSource input) throws IOEx int tag = input.readTag(); while (true) { switch (tag) { - case 24: { + case 80: { // reason final int value = input.readInt32(); if (EnterSceneReasonOuterClass.EnterSceneReason.forNumber(value) != null) { @@ -336,20 +336,20 @@ public EnterSceneByServerScNotify mergeFrom(final ProtoSource input) throws IOEx bitField0_ |= 0x00000001; } tag = input.readTag(); - if (tag != 34) { + if (tag != 42) { break; } } - case 34: { + case 42: { // scene input.readMessage(scene); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 98) { + if (tag != 50) { break; } } - case 98: { + case 50: { // lineup input.readMessage(lineup); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/EnterSceneCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/EnterSceneCsReqOuterClass.java index 30428eb08..f8111fabc 100644 --- a/src/generated/main/emu/lunarcore/proto/EnterSceneCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/EnterSceneCsReqOuterClass.java @@ -19,14 +19,14 @@ public static final class EnterSceneCsReq extends ProtoMessage private static final long serialVersionUID = 0L; /** - * optional uint32 teleport_id = 2; + * optional uint32 entry_id = 1; */ - private int teleportId; + private int entryId; /** - * optional uint32 entry_id = 14; + * optional uint32 teleport_id = 14; */ - private int entryId; + private int teleportId; private EnterSceneCsReq() { } @@ -39,76 +39,76 @@ public static EnterSceneCsReq newInstance() { } /** - * optional uint32 teleport_id = 2; - * @return whether the teleportId field is set + * optional uint32 entry_id = 1; + * @return whether the entryId field is set */ - public boolean hasTeleportId() { + public boolean hasEntryId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 teleport_id = 2; + * optional uint32 entry_id = 1; * @return this */ - public EnterSceneCsReq clearTeleportId() { + public EnterSceneCsReq clearEntryId() { bitField0_ &= ~0x00000001; - teleportId = 0; + entryId = 0; return this; } /** - * optional uint32 teleport_id = 2; - * @return the teleportId + * optional uint32 entry_id = 1; + * @return the entryId */ - public int getTeleportId() { - return teleportId; + public int getEntryId() { + return entryId; } /** - * optional uint32 teleport_id = 2; - * @param value the teleportId to set + * optional uint32 entry_id = 1; + * @param value the entryId to set * @return this */ - public EnterSceneCsReq setTeleportId(final int value) { + public EnterSceneCsReq setEntryId(final int value) { bitField0_ |= 0x00000001; - teleportId = value; + entryId = value; return this; } /** - * optional uint32 entry_id = 14; - * @return whether the entryId field is set + * optional uint32 teleport_id = 14; + * @return whether the teleportId field is set */ - public boolean hasEntryId() { + public boolean hasTeleportId() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 entry_id = 14; + * optional uint32 teleport_id = 14; * @return this */ - public EnterSceneCsReq clearEntryId() { + public EnterSceneCsReq clearTeleportId() { bitField0_ &= ~0x00000002; - entryId = 0; + teleportId = 0; return this; } /** - * optional uint32 entry_id = 14; - * @return the entryId + * optional uint32 teleport_id = 14; + * @return the teleportId */ - public int getEntryId() { - return entryId; + public int getTeleportId() { + return teleportId; } /** - * optional uint32 entry_id = 14; - * @param value the entryId to set + * optional uint32 teleport_id = 14; + * @param value the teleportId to set * @return this */ - public EnterSceneCsReq setEntryId(final int value) { + public EnterSceneCsReq setTeleportId(final int value) { bitField0_ |= 0x00000002; - entryId = value; + teleportId = value; return this; } @@ -117,8 +117,8 @@ public EnterSceneCsReq copyFrom(final EnterSceneCsReq other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - teleportId = other.teleportId; entryId = other.entryId; + teleportId = other.teleportId; } return this; } @@ -129,12 +129,12 @@ public EnterSceneCsReq mergeFrom(final EnterSceneCsReq other) { return this; } cachedSize = -1; - if (other.hasTeleportId()) { - setTeleportId(other.teleportId); - } if (other.hasEntryId()) { setEntryId(other.entryId); } + if (other.hasTeleportId()) { + setTeleportId(other.teleportId); + } return this; } @@ -145,8 +145,8 @@ public EnterSceneCsReq clear() { } cachedSize = -1; bitField0_ = 0; - teleportId = 0; entryId = 0; + teleportId = 0; return this; } @@ -170,19 +170,19 @@ public boolean equals(Object o) { } EnterSceneCsReq other = (EnterSceneCsReq) o; return bitField0_ == other.bitField0_ - && (!hasTeleportId() || teleportId == other.teleportId) - && (!hasEntryId() || entryId == other.entryId); + && (!hasEntryId() || entryId == other.entryId) + && (!hasTeleportId() || teleportId == other.teleportId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); - output.writeUInt32NoTag(teleportId); + output.writeRawByte((byte) 8); + output.writeUInt32NoTag(entryId); } if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 112); - output.writeUInt32NoTag(entryId); + output.writeUInt32NoTag(teleportId); } } @@ -190,10 +190,10 @@ public void writeTo(final ProtoSink output) throws IOException { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(teleportId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(entryId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(entryId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(teleportId); } return size; } @@ -205,9 +205,9 @@ public EnterSceneCsReq mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { - // teleportId - teleportId = input.readUInt32(); + case 8: { + // entryId + entryId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 112) { @@ -215,8 +215,8 @@ public EnterSceneCsReq mergeFrom(final ProtoSource input) throws IOException { } } case 112: { - // entryId - entryId = input.readUInt32(); + // teleportId + teleportId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -241,10 +241,10 @@ public EnterSceneCsReq mergeFrom(final ProtoSource input) throws IOException { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.teleportId, teleportId); + output.writeUInt32(FieldNames.entryId, entryId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.entryId, entryId); + output.writeUInt32(FieldNames.teleportId, teleportId); } output.endObject(); } @@ -256,11 +256,11 @@ public EnterSceneCsReq mergeFrom(final JsonSource input) throws IOException { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1484004954: - case 1240508079: { - if (input.isAtField(FieldNames.teleportId)) { + case -1591558867: + case -2093663224: { + if (input.isAtField(FieldNames.entryId)) { if (!input.trySkipNullValue()) { - teleportId = input.readUInt32(); + entryId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -268,11 +268,11 @@ public EnterSceneCsReq mergeFrom(final JsonSource input) throws IOException { } break; } - case -1591558867: - case -2093663224: { - if (input.isAtField(FieldNames.entryId)) { + case -1484004954: + case 1240508079: { + if (input.isAtField(FieldNames.teleportId)) { if (!input.trySkipNullValue()) { - entryId = input.readUInt32(); + teleportId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -333,9 +333,9 @@ public EnterSceneCsReq create() { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName teleportId = FieldName.forField("teleportId", "teleport_id"); - static final FieldName entryId = FieldName.forField("entryId", "entry_id"); + + static final FieldName teleportId = FieldName.forField("teleportId", "teleport_id"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/EnteredSceneInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/EnteredSceneInfoOuterClass.java index edaf76ec7..8cb5f8039 100644 --- a/src/generated/main/emu/lunarcore/proto/EnteredSceneInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/EnteredSceneInfoOuterClass.java @@ -19,14 +19,14 @@ public static final class EnteredSceneInfo extends ProtoMessageoptional uint32 plane_id = 1; + * optional uint32 floor_id = 4; */ - private int planeId; + private int floorId; /** - * optional uint32 floor_id = 6; + * optional uint32 plane_id = 12; */ - private int floorId; + private int planeId; private EnteredSceneInfo() { } @@ -39,76 +39,76 @@ public static EnteredSceneInfo newInstance() { } /** - * optional uint32 plane_id = 1; - * @return whether the planeId field is set + * optional uint32 floor_id = 4; + * @return whether the floorId field is set */ - public boolean hasPlaneId() { + public boolean hasFloorId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 plane_id = 1; + * optional uint32 floor_id = 4; * @return this */ - public EnteredSceneInfo clearPlaneId() { + public EnteredSceneInfo clearFloorId() { bitField0_ &= ~0x00000001; - planeId = 0; + floorId = 0; return this; } /** - * optional uint32 plane_id = 1; - * @return the planeId + * optional uint32 floor_id = 4; + * @return the floorId */ - public int getPlaneId() { - return planeId; + public int getFloorId() { + return floorId; } /** - * optional uint32 plane_id = 1; - * @param value the planeId to set + * optional uint32 floor_id = 4; + * @param value the floorId to set * @return this */ - public EnteredSceneInfo setPlaneId(final int value) { + public EnteredSceneInfo setFloorId(final int value) { bitField0_ |= 0x00000001; - planeId = value; + floorId = value; return this; } /** - * optional uint32 floor_id = 6; - * @return whether the floorId field is set + * optional uint32 plane_id = 12; + * @return whether the planeId field is set */ - public boolean hasFloorId() { + public boolean hasPlaneId() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 floor_id = 6; + * optional uint32 plane_id = 12; * @return this */ - public EnteredSceneInfo clearFloorId() { + public EnteredSceneInfo clearPlaneId() { bitField0_ &= ~0x00000002; - floorId = 0; + planeId = 0; return this; } /** - * optional uint32 floor_id = 6; - * @return the floorId + * optional uint32 plane_id = 12; + * @return the planeId */ - public int getFloorId() { - return floorId; + public int getPlaneId() { + return planeId; } /** - * optional uint32 floor_id = 6; - * @param value the floorId to set + * optional uint32 plane_id = 12; + * @param value the planeId to set * @return this */ - public EnteredSceneInfo setFloorId(final int value) { + public EnteredSceneInfo setPlaneId(final int value) { bitField0_ |= 0x00000002; - floorId = value; + planeId = value; return this; } @@ -117,8 +117,8 @@ public EnteredSceneInfo copyFrom(final EnteredSceneInfo other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - planeId = other.planeId; floorId = other.floorId; + planeId = other.planeId; } return this; } @@ -129,12 +129,12 @@ public EnteredSceneInfo mergeFrom(final EnteredSceneInfo other) { return this; } cachedSize = -1; - if (other.hasPlaneId()) { - setPlaneId(other.planeId); - } if (other.hasFloorId()) { setFloorId(other.floorId); } + if (other.hasPlaneId()) { + setPlaneId(other.planeId); + } return this; } @@ -145,8 +145,8 @@ public EnteredSceneInfo clear() { } cachedSize = -1; bitField0_ = 0; - planeId = 0; floorId = 0; + planeId = 0; return this; } @@ -170,19 +170,19 @@ public boolean equals(Object o) { } EnteredSceneInfo other = (EnteredSceneInfo) o; return bitField0_ == other.bitField0_ - && (!hasPlaneId() || planeId == other.planeId) - && (!hasFloorId() || floorId == other.floorId); + && (!hasFloorId() || floorId == other.floorId) + && (!hasPlaneId() || planeId == other.planeId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); - output.writeUInt32NoTag(planeId); + output.writeRawByte((byte) 32); + output.writeUInt32NoTag(floorId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 48); - output.writeUInt32NoTag(floorId); + output.writeRawByte((byte) 96); + output.writeUInt32NoTag(planeId); } } @@ -190,10 +190,10 @@ public void writeTo(final ProtoSink output) throws IOException { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(planeId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(floorId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(floorId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(planeId); } return size; } @@ -205,18 +205,18 @@ public EnteredSceneInfo mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { - // planeId - planeId = input.readUInt32(); + case 32: { + // floorId + floorId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 48) { + if (tag != 96) { break; } } - case 48: { - // floorId - floorId = input.readUInt32(); + case 96: { + // planeId + planeId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -241,10 +241,10 @@ public EnteredSceneInfo mergeFrom(final ProtoSource input) throws IOException { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.planeId, planeId); + output.writeUInt32(FieldNames.floorId, floorId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.floorId, floorId); + output.writeUInt32(FieldNames.planeId, planeId); } output.endObject(); } @@ -256,11 +256,11 @@ public EnteredSceneInfo mergeFrom(final JsonSource input) throws IOException { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -493896553: - case 1869097438: { - if (input.isAtField(FieldNames.planeId)) { + case -766027193: + case 2022982190: { + if (input.isAtField(FieldNames.floorId)) { if (!input.trySkipNullValue()) { - planeId = input.readUInt32(); + floorId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -268,11 +268,11 @@ public EnteredSceneInfo mergeFrom(final JsonSource input) throws IOException { } break; } - case -766027193: - case 2022982190: { - if (input.isAtField(FieldNames.floorId)) { + case -493896553: + case 1869097438: { + if (input.isAtField(FieldNames.planeId)) { if (!input.trySkipNullValue()) { - floorId = input.readUInt32(); + planeId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -333,9 +333,9 @@ public EnteredSceneInfo create() { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName planeId = FieldName.forField("planeId", "plane_id"); - static final FieldName floorId = FieldName.forField("floorId", "floor_id"); + + static final FieldName planeId = FieldName.forField("planeId", "plane_id"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/EntityBuffChangeInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/EntityBuffChangeInfoOuterClass.java index 4b85880d1..5a9a4d1ca 100644 --- a/src/generated/main/emu/lunarcore/proto/EntityBuffChangeInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/EntityBuffChangeInfoOuterClass.java @@ -19,17 +19,17 @@ public static final class EntityBuffChangeInfo extends ProtoMessageoptional uint32 remove_buff_id = 4; + * optional uint32 entity_id = 7; */ - private int removeBuffId; + private int entityId; /** - * optional uint32 entity_id = 9; + * optional uint32 remove_buff_id = 12; */ - private int entityId; + private int removeBuffId; /** - * optional .BuffInfo add_buff_info = 12; + * optional .BuffInfo add_buff_info = 5; */ private final BuffInfoOuterClass.BuffInfo addBuffInfo = BuffInfoOuterClass.BuffInfo.newInstance(); @@ -44,81 +44,81 @@ public static EntityBuffChangeInfo newInstance() { } /** - * optional uint32 remove_buff_id = 4; - * @return whether the removeBuffId field is set + * optional uint32 entity_id = 7; + * @return whether the entityId field is set */ - public boolean hasRemoveBuffId() { + public boolean hasEntityId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 remove_buff_id = 4; + * optional uint32 entity_id = 7; * @return this */ - public EntityBuffChangeInfo clearRemoveBuffId() { + public EntityBuffChangeInfo clearEntityId() { bitField0_ &= ~0x00000001; - removeBuffId = 0; + entityId = 0; return this; } /** - * optional uint32 remove_buff_id = 4; - * @return the removeBuffId + * optional uint32 entity_id = 7; + * @return the entityId */ - public int getRemoveBuffId() { - return removeBuffId; + public int getEntityId() { + return entityId; } /** - * optional uint32 remove_buff_id = 4; - * @param value the removeBuffId to set + * optional uint32 entity_id = 7; + * @param value the entityId to set * @return this */ - public EntityBuffChangeInfo setRemoveBuffId(final int value) { + public EntityBuffChangeInfo setEntityId(final int value) { bitField0_ |= 0x00000001; - removeBuffId = value; + entityId = value; return this; } /** - * optional uint32 entity_id = 9; - * @return whether the entityId field is set + * optional uint32 remove_buff_id = 12; + * @return whether the removeBuffId field is set */ - public boolean hasEntityId() { + public boolean hasRemoveBuffId() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 entity_id = 9; + * optional uint32 remove_buff_id = 12; * @return this */ - public EntityBuffChangeInfo clearEntityId() { + public EntityBuffChangeInfo clearRemoveBuffId() { bitField0_ &= ~0x00000002; - entityId = 0; + removeBuffId = 0; return this; } /** - * optional uint32 entity_id = 9; - * @return the entityId + * optional uint32 remove_buff_id = 12; + * @return the removeBuffId */ - public int getEntityId() { - return entityId; + public int getRemoveBuffId() { + return removeBuffId; } /** - * optional uint32 entity_id = 9; - * @param value the entityId to set + * optional uint32 remove_buff_id = 12; + * @param value the removeBuffId to set * @return this */ - public EntityBuffChangeInfo setEntityId(final int value) { + public EntityBuffChangeInfo setRemoveBuffId(final int value) { bitField0_ |= 0x00000002; - entityId = value; + removeBuffId = value; return this; } /** - * optional .BuffInfo add_buff_info = 12; + * optional .BuffInfo add_buff_info = 5; * @return whether the addBuffInfo field is set */ public boolean hasAddBuffInfo() { @@ -126,7 +126,7 @@ public boolean hasAddBuffInfo() { } /** - * optional .BuffInfo add_buff_info = 12; + * optional .BuffInfo add_buff_info = 5; * @return this */ public EntityBuffChangeInfo clearAddBuffInfo() { @@ -136,7 +136,7 @@ public EntityBuffChangeInfo clearAddBuffInfo() { } /** - * optional .BuffInfo add_buff_info = 12; + * optional .BuffInfo add_buff_info = 5; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -150,7 +150,7 @@ public BuffInfoOuterClass.BuffInfo getAddBuffInfo() { } /** - * optional .BuffInfo add_buff_info = 12; + * optional .BuffInfo add_buff_info = 5; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -164,7 +164,7 @@ public BuffInfoOuterClass.BuffInfo getMutableAddBuffInfo() { } /** - * optional .BuffInfo add_buff_info = 12; + * optional .BuffInfo add_buff_info = 5; * @param value the addBuffInfo to set * @return this */ @@ -179,8 +179,8 @@ public EntityBuffChangeInfo copyFrom(final EntityBuffChangeInfo other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - removeBuffId = other.removeBuffId; entityId = other.entityId; + removeBuffId = other.removeBuffId; addBuffInfo.copyFrom(other.addBuffInfo); } return this; @@ -192,12 +192,12 @@ public EntityBuffChangeInfo mergeFrom(final EntityBuffChangeInfo other) { return this; } cachedSize = -1; - if (other.hasRemoveBuffId()) { - setRemoveBuffId(other.removeBuffId); - } if (other.hasEntityId()) { setEntityId(other.entityId); } + if (other.hasRemoveBuffId()) { + setRemoveBuffId(other.removeBuffId); + } if (other.hasAddBuffInfo()) { getMutableAddBuffInfo().mergeFrom(other.addBuffInfo); } @@ -211,8 +211,8 @@ public EntityBuffChangeInfo clear() { } cachedSize = -1; bitField0_ = 0; - removeBuffId = 0; entityId = 0; + removeBuffId = 0; addBuffInfo.clear(); return this; } @@ -238,23 +238,23 @@ public boolean equals(Object o) { } EntityBuffChangeInfo other = (EntityBuffChangeInfo) o; return bitField0_ == other.bitField0_ - && (!hasRemoveBuffId() || removeBuffId == other.removeBuffId) && (!hasEntityId() || entityId == other.entityId) + && (!hasRemoveBuffId() || removeBuffId == other.removeBuffId) && (!hasAddBuffInfo() || addBuffInfo.equals(other.addBuffInfo)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); - output.writeUInt32NoTag(removeBuffId); + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(entityId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 72); - output.writeUInt32NoTag(entityId); + output.writeRawByte((byte) 96); + output.writeUInt32NoTag(removeBuffId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 98); + output.writeRawByte((byte) 42); output.writeMessageNoTag(addBuffInfo); } } @@ -263,10 +263,10 @@ public void writeTo(final ProtoSink output) throws IOException { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(removeBuffId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(entityId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(entityId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(removeBuffId); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(addBuffInfo); @@ -281,25 +281,25 @@ public EntityBuffChangeInfo mergeFrom(final ProtoSource input) throws IOExceptio int tag = input.readTag(); while (true) { switch (tag) { - case 32: { - // removeBuffId - removeBuffId = input.readUInt32(); + case 56: { + // entityId + entityId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 72) { + if (tag != 96) { break; } } - case 72: { - // entityId - entityId = input.readUInt32(); + case 96: { + // removeBuffId + removeBuffId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 98) { + if (tag != 42) { break; } } - case 98: { + case 42: { // addBuffInfo input.readMessage(addBuffInfo); bitField0_ |= 0x00000004; @@ -326,10 +326,10 @@ public EntityBuffChangeInfo mergeFrom(final ProtoSource input) throws IOExceptio public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.removeBuffId, removeBuffId); + output.writeUInt32(FieldNames.entityId, entityId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.entityId, entityId); + output.writeUInt32(FieldNames.removeBuffId, removeBuffId); } if ((bitField0_ & 0x00000004) != 0) { output.writeMessage(FieldNames.addBuffInfo, addBuffInfo); @@ -344,11 +344,11 @@ public EntityBuffChangeInfo mergeFrom(final JsonSource input) throws IOException } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1339555214: - case 927119308: { - if (input.isAtField(FieldNames.removeBuffId)) { + case -2102099874: + case -740565257: { + if (input.isAtField(FieldNames.entityId)) { if (!input.trySkipNullValue()) { - removeBuffId = input.readUInt32(); + entityId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -356,11 +356,11 @@ public EntityBuffChangeInfo mergeFrom(final JsonSource input) throws IOException } break; } - case -2102099874: - case -740565257: { - if (input.isAtField(FieldNames.entityId)) { + case -1339555214: + case 927119308: { + if (input.isAtField(FieldNames.removeBuffId)) { if (!input.trySkipNullValue()) { - entityId = input.readUInt32(); + removeBuffId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -433,10 +433,10 @@ public EntityBuffChangeInfo create() { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName removeBuffId = FieldName.forField("removeBuffId", "remove_buff_id"); - static final FieldName entityId = FieldName.forField("entityId", "entity_id"); + static final FieldName removeBuffId = FieldName.forField("removeBuffId", "remove_buff_id"); + static final FieldName addBuffInfo = FieldName.forField("addBuffInfo", "add_buff_info"); } } diff --git a/src/generated/main/emu/lunarcore/proto/EntityBuffInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/EntityBuffInfoOuterClass.java index f44162f83..0e88c5d02 100644 --- a/src/generated/main/emu/lunarcore/proto/EntityBuffInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/EntityBuffInfoOuterClass.java @@ -20,12 +20,12 @@ public static final class EntityBuffInfo extends ProtoMessage im private static final long serialVersionUID = 0L; /** - * optional uint32 entity_id = 7; + * optional uint32 entity_id = 11; */ private int entityId; /** - * repeated .BuffInfo buff_list = 6; + * repeated .BuffInfo buff_list = 8; */ private final RepeatedMessage buffList = RepeatedMessage.newEmptyInstance(BuffInfoOuterClass.BuffInfo.getFactory()); @@ -40,7 +40,7 @@ public static EntityBuffInfo newInstance() { } /** - * optional uint32 entity_id = 7; + * optional uint32 entity_id = 11; * @return whether the entityId field is set */ public boolean hasEntityId() { @@ -48,7 +48,7 @@ public boolean hasEntityId() { } /** - * optional uint32 entity_id = 7; + * optional uint32 entity_id = 11; * @return this */ public EntityBuffInfo clearEntityId() { @@ -58,7 +58,7 @@ public EntityBuffInfo clearEntityId() { } /** - * optional uint32 entity_id = 7; + * optional uint32 entity_id = 11; * @return the entityId */ public int getEntityId() { @@ -66,7 +66,7 @@ public int getEntityId() { } /** - * optional uint32 entity_id = 7; + * optional uint32 entity_id = 11; * @param value the entityId to set * @return this */ @@ -77,7 +77,7 @@ public EntityBuffInfo setEntityId(final int value) { } /** - * repeated .BuffInfo buff_list = 6; + * repeated .BuffInfo buff_list = 8; * @return whether the buffList field is set */ public boolean hasBuffList() { @@ -85,7 +85,7 @@ public boolean hasBuffList() { } /** - * repeated .BuffInfo buff_list = 6; + * repeated .BuffInfo buff_list = 8; * @return this */ public EntityBuffInfo clearBuffList() { @@ -95,7 +95,7 @@ public EntityBuffInfo clearBuffList() { } /** - * repeated .BuffInfo buff_list = 6; + * repeated .BuffInfo buff_list = 8; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -109,7 +109,7 @@ public RepeatedMessage getBuffList() { } /** - * repeated .BuffInfo buff_list = 6; + * repeated .BuffInfo buff_list = 8; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -123,7 +123,7 @@ public RepeatedMessage getMutableBuffList() { } /** - * repeated .BuffInfo buff_list = 6; + * repeated .BuffInfo buff_list = 8; * @param value the buffList to add * @return this */ @@ -134,7 +134,7 @@ public EntityBuffInfo addBuffList(final BuffInfoOuterClass.BuffInfo value) { } /** - * repeated .BuffInfo buff_list = 6; + * repeated .BuffInfo buff_list = 8; * @param values the buffList to add * @return this */ @@ -210,12 +210,12 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(entityId); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < buffList.length(); i++) { - output.writeRawByte((byte) 50); + output.writeRawByte((byte) 66); output.writeMessageNoTag(buffList.get(i)); } } @@ -240,16 +240,16 @@ public EntityBuffInfo mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { + case 88: { // entityId entityId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 50) { + if (tag != 66) { break; } } - case 50: { + case 66: { // buffList tag = input.readRepeatedMessage(buffList, tag); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/EntityMotionOuterClass.java b/src/generated/main/emu/lunarcore/proto/EntityMotionOuterClass.java index 590b796ce..6f62a974c 100644 --- a/src/generated/main/emu/lunarcore/proto/EntityMotionOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/EntityMotionOuterClass.java @@ -19,17 +19,17 @@ public static final class EntityMotion extends ProtoMessage implem private static final long serialVersionUID = 0L; /** - * optional uint32 map_layer = 13; + * optional uint32 entity_id = 11; */ - private int mapLayer; + private int entityId; /** - * optional uint32 entity_id = 14; + * optional uint32 map_layer = 13; */ - private int entityId; + private int mapLayer; /** - * optional .MotionInfo motion = 11; + * optional .MotionInfo motion = 3; */ private final MotionInfoOuterClass.MotionInfo motion = MotionInfoOuterClass.MotionInfo.newInstance(); @@ -44,81 +44,81 @@ public static EntityMotion newInstance() { } /** - * optional uint32 map_layer = 13; - * @return whether the mapLayer field is set + * optional uint32 entity_id = 11; + * @return whether the entityId field is set */ - public boolean hasMapLayer() { + public boolean hasEntityId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 map_layer = 13; + * optional uint32 entity_id = 11; * @return this */ - public EntityMotion clearMapLayer() { + public EntityMotion clearEntityId() { bitField0_ &= ~0x00000001; - mapLayer = 0; + entityId = 0; return this; } /** - * optional uint32 map_layer = 13; - * @return the mapLayer + * optional uint32 entity_id = 11; + * @return the entityId */ - public int getMapLayer() { - return mapLayer; + public int getEntityId() { + return entityId; } /** - * optional uint32 map_layer = 13; - * @param value the mapLayer to set + * optional uint32 entity_id = 11; + * @param value the entityId to set * @return this */ - public EntityMotion setMapLayer(final int value) { + public EntityMotion setEntityId(final int value) { bitField0_ |= 0x00000001; - mapLayer = value; + entityId = value; return this; } /** - * optional uint32 entity_id = 14; - * @return whether the entityId field is set + * optional uint32 map_layer = 13; + * @return whether the mapLayer field is set */ - public boolean hasEntityId() { + public boolean hasMapLayer() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 entity_id = 14; + * optional uint32 map_layer = 13; * @return this */ - public EntityMotion clearEntityId() { + public EntityMotion clearMapLayer() { bitField0_ &= ~0x00000002; - entityId = 0; + mapLayer = 0; return this; } /** - * optional uint32 entity_id = 14; - * @return the entityId + * optional uint32 map_layer = 13; + * @return the mapLayer */ - public int getEntityId() { - return entityId; + public int getMapLayer() { + return mapLayer; } /** - * optional uint32 entity_id = 14; - * @param value the entityId to set + * optional uint32 map_layer = 13; + * @param value the mapLayer to set * @return this */ - public EntityMotion setEntityId(final int value) { + public EntityMotion setMapLayer(final int value) { bitField0_ |= 0x00000002; - entityId = value; + mapLayer = value; return this; } /** - * optional .MotionInfo motion = 11; + * optional .MotionInfo motion = 3; * @return whether the motion field is set */ public boolean hasMotion() { @@ -126,7 +126,7 @@ public boolean hasMotion() { } /** - * optional .MotionInfo motion = 11; + * optional .MotionInfo motion = 3; * @return this */ public EntityMotion clearMotion() { @@ -136,7 +136,7 @@ public EntityMotion clearMotion() { } /** - * optional .MotionInfo motion = 11; + * optional .MotionInfo motion = 3; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -150,7 +150,7 @@ public MotionInfoOuterClass.MotionInfo getMotion() { } /** - * optional .MotionInfo motion = 11; + * optional .MotionInfo motion = 3; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -164,7 +164,7 @@ public MotionInfoOuterClass.MotionInfo getMutableMotion() { } /** - * optional .MotionInfo motion = 11; + * optional .MotionInfo motion = 3; * @param value the motion to set * @return this */ @@ -179,8 +179,8 @@ public EntityMotion copyFrom(final EntityMotion other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - mapLayer = other.mapLayer; entityId = other.entityId; + mapLayer = other.mapLayer; motion.copyFrom(other.motion); } return this; @@ -192,12 +192,12 @@ public EntityMotion mergeFrom(final EntityMotion other) { return this; } cachedSize = -1; - if (other.hasMapLayer()) { - setMapLayer(other.mapLayer); - } if (other.hasEntityId()) { setEntityId(other.entityId); } + if (other.hasMapLayer()) { + setMapLayer(other.mapLayer); + } if (other.hasMotion()) { getMutableMotion().mergeFrom(other.motion); } @@ -211,8 +211,8 @@ public EntityMotion clear() { } cachedSize = -1; bitField0_ = 0; - mapLayer = 0; entityId = 0; + mapLayer = 0; motion.clear(); return this; } @@ -238,23 +238,23 @@ public boolean equals(Object o) { } EntityMotion other = (EntityMotion) o; return bitField0_ == other.bitField0_ - && (!hasMapLayer() || mapLayer == other.mapLayer) && (!hasEntityId() || entityId == other.entityId) + && (!hasMapLayer() || mapLayer == other.mapLayer) && (!hasMotion() || motion.equals(other.motion)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 104); - output.writeUInt32NoTag(mapLayer); + output.writeRawByte((byte) 88); + output.writeUInt32NoTag(entityId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 112); - output.writeUInt32NoTag(entityId); + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(mapLayer); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 90); + output.writeRawByte((byte) 26); output.writeMessageNoTag(motion); } } @@ -263,10 +263,10 @@ public void writeTo(final ProtoSink output) throws IOException { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(mapLayer); + size += 1 + ProtoSink.computeUInt32SizeNoTag(entityId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(entityId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(mapLayer); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(motion); @@ -281,25 +281,25 @@ public EntityMotion mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 104: { - // mapLayer - mapLayer = input.readUInt32(); + case 88: { + // entityId + entityId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 112) { + if (tag != 104) { break; } } - case 112: { - // entityId - entityId = input.readUInt32(); + case 104: { + // mapLayer + mapLayer = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 90) { + if (tag != 26) { break; } } - case 90: { + case 26: { // motion input.readMessage(motion); bitField0_ |= 0x00000004; @@ -326,10 +326,10 @@ public EntityMotion mergeFrom(final ProtoSource input) throws IOException { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.mapLayer, mapLayer); + output.writeUInt32(FieldNames.entityId, entityId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.entityId, entityId); + output.writeUInt32(FieldNames.mapLayer, mapLayer); } if ((bitField0_ & 0x00000004) != 0) { output.writeMessage(FieldNames.motion, motion); @@ -344,11 +344,11 @@ public EntityMotion mergeFrom(final JsonSource input) throws IOException { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 160971093: - case 1248553134: { - if (input.isAtField(FieldNames.mapLayer)) { + case -2102099874: + case -740565257: { + if (input.isAtField(FieldNames.entityId)) { if (!input.trySkipNullValue()) { - mapLayer = input.readUInt32(); + entityId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -356,11 +356,11 @@ public EntityMotion mergeFrom(final JsonSource input) throws IOException { } break; } - case -2102099874: - case -740565257: { - if (input.isAtField(FieldNames.entityId)) { + case 160971093: + case 1248553134: { + if (input.isAtField(FieldNames.mapLayer)) { if (!input.trySkipNullValue()) { - entityId = input.readUInt32(); + mapLayer = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -431,10 +431,10 @@ public EntityMotion create() { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName mapLayer = FieldName.forField("mapLayer", "map_layer"); - static final FieldName entityId = FieldName.forField("entityId", "entity_id"); + static final FieldName mapLayer = FieldName.forField("mapLayer", "map_layer"); + static final FieldName motion = FieldName.forField("motion"); } } diff --git a/src/generated/main/emu/lunarcore/proto/EquipRelicOuterClass.java b/src/generated/main/emu/lunarcore/proto/EquipRelicOuterClass.java index 1eba528d2..fd4005be5 100644 --- a/src/generated/main/emu/lunarcore/proto/EquipRelicOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/EquipRelicOuterClass.java @@ -19,12 +19,12 @@ public static final class EquipRelic extends ProtoMessage implements private static final long serialVersionUID = 0L; /** - * optional uint32 slot = 4; + * optional uint32 slot = 3; */ private int slot; /** - * optional uint32 relic_unique_id = 15; + * optional uint32 relic_unique_id = 4; */ private int relicUniqueId; @@ -39,7 +39,7 @@ public static EquipRelic newInstance() { } /** - * optional uint32 slot = 4; + * optional uint32 slot = 3; * @return whether the slot field is set */ public boolean hasSlot() { @@ -47,7 +47,7 @@ public boolean hasSlot() { } /** - * optional uint32 slot = 4; + * optional uint32 slot = 3; * @return this */ public EquipRelic clearSlot() { @@ -57,7 +57,7 @@ public EquipRelic clearSlot() { } /** - * optional uint32 slot = 4; + * optional uint32 slot = 3; * @return the slot */ public int getSlot() { @@ -65,7 +65,7 @@ public int getSlot() { } /** - * optional uint32 slot = 4; + * optional uint32 slot = 3; * @param value the slot to set * @return this */ @@ -76,7 +76,7 @@ public EquipRelic setSlot(final int value) { } /** - * optional uint32 relic_unique_id = 15; + * optional uint32 relic_unique_id = 4; * @return whether the relicUniqueId field is set */ public boolean hasRelicUniqueId() { @@ -84,7 +84,7 @@ public boolean hasRelicUniqueId() { } /** - * optional uint32 relic_unique_id = 15; + * optional uint32 relic_unique_id = 4; * @return this */ public EquipRelic clearRelicUniqueId() { @@ -94,7 +94,7 @@ public EquipRelic clearRelicUniqueId() { } /** - * optional uint32 relic_unique_id = 15; + * optional uint32 relic_unique_id = 4; * @return the relicUniqueId */ public int getRelicUniqueId() { @@ -102,7 +102,7 @@ public int getRelicUniqueId() { } /** - * optional uint32 relic_unique_id = 15; + * optional uint32 relic_unique_id = 4; * @param value the relicUniqueId to set * @return this */ @@ -177,11 +177,11 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(slot); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(relicUniqueId); } } @@ -205,16 +205,16 @@ public EquipRelic mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { + case 24: { // slot slot = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 120) { + if (tag != 32) { break; } } - case 120: { + case 32: { // relicUniqueId relicUniqueId = input.readUInt32(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/EquipmentOuterClass.java b/src/generated/main/emu/lunarcore/proto/EquipmentOuterClass.java index 6cf75a5da..d1ed59476 100644 --- a/src/generated/main/emu/lunarcore/proto/EquipmentOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/EquipmentOuterClass.java @@ -19,42 +19,42 @@ public static final class Equipment extends ProtoMessage implements C private static final long serialVersionUID = 0L; /** - * optional uint32 rank = 1; + * optional uint32 tid = 3; */ - private int rank; + private int tid; /** - * optional uint32 exp = 2; + * optional uint32 rank = 4; */ - private int exp; + private int rank; /** - * optional uint32 base_avatar_id = 7; + * optional uint32 exp = 6; */ - private int baseAvatarId; + private int exp; /** - * optional uint32 promotion = 8; + * optional uint32 unique_id = 11; */ - private int promotion; + private int uniqueId; /** - * optional uint32 unique_id = 12; + * optional uint32 promotion = 12; */ - private int uniqueId; + private int promotion; /** - * optional uint32 tid = 14; + * optional uint32 level = 14; */ - private int tid; + private int level; /** - * optional uint32 level = 15; + * optional uint32 base_avatar_id = 15; */ - private int level; + private int baseAvatarId; /** - * optional bool is_protected = 3; + * optional bool is_protected = 5; */ private boolean isProtected; @@ -69,266 +69,266 @@ public static Equipment newInstance() { } /** - * optional uint32 rank = 1; - * @return whether the rank field is set + * optional uint32 tid = 3; + * @return whether the tid field is set */ - public boolean hasRank() { + public boolean hasTid() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 rank = 1; + * optional uint32 tid = 3; * @return this */ - public Equipment clearRank() { + public Equipment clearTid() { bitField0_ &= ~0x00000001; - rank = 0; + tid = 0; return this; } /** - * optional uint32 rank = 1; - * @return the rank + * optional uint32 tid = 3; + * @return the tid */ - public int getRank() { - return rank; + public int getTid() { + return tid; } /** - * optional uint32 rank = 1; - * @param value the rank to set + * optional uint32 tid = 3; + * @param value the tid to set * @return this */ - public Equipment setRank(final int value) { + public Equipment setTid(final int value) { bitField0_ |= 0x00000001; - rank = value; + tid = value; return this; } /** - * optional uint32 exp = 2; - * @return whether the exp field is set + * optional uint32 rank = 4; + * @return whether the rank field is set */ - public boolean hasExp() { + public boolean hasRank() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 exp = 2; + * optional uint32 rank = 4; * @return this */ - public Equipment clearExp() { + public Equipment clearRank() { bitField0_ &= ~0x00000002; - exp = 0; + rank = 0; return this; } /** - * optional uint32 exp = 2; - * @return the exp + * optional uint32 rank = 4; + * @return the rank */ - public int getExp() { - return exp; + public int getRank() { + return rank; } /** - * optional uint32 exp = 2; - * @param value the exp to set + * optional uint32 rank = 4; + * @param value the rank to set * @return this */ - public Equipment setExp(final int value) { + public Equipment setRank(final int value) { bitField0_ |= 0x00000002; - exp = value; + rank = value; return this; } /** - * optional uint32 base_avatar_id = 7; - * @return whether the baseAvatarId field is set + * optional uint32 exp = 6; + * @return whether the exp field is set */ - public boolean hasBaseAvatarId() { + public boolean hasExp() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 base_avatar_id = 7; + * optional uint32 exp = 6; * @return this */ - public Equipment clearBaseAvatarId() { + public Equipment clearExp() { bitField0_ &= ~0x00000004; - baseAvatarId = 0; + exp = 0; return this; } /** - * optional uint32 base_avatar_id = 7; - * @return the baseAvatarId + * optional uint32 exp = 6; + * @return the exp */ - public int getBaseAvatarId() { - return baseAvatarId; + public int getExp() { + return exp; } /** - * optional uint32 base_avatar_id = 7; - * @param value the baseAvatarId to set + * optional uint32 exp = 6; + * @param value the exp to set * @return this */ - public Equipment setBaseAvatarId(final int value) { + public Equipment setExp(final int value) { bitField0_ |= 0x00000004; - baseAvatarId = value; + exp = value; return this; } /** - * optional uint32 promotion = 8; - * @return whether the promotion field is set + * optional uint32 unique_id = 11; + * @return whether the uniqueId field is set */ - public boolean hasPromotion() { + public boolean hasUniqueId() { return (bitField0_ & 0x00000008) != 0; } /** - * optional uint32 promotion = 8; + * optional uint32 unique_id = 11; * @return this */ - public Equipment clearPromotion() { + public Equipment clearUniqueId() { bitField0_ &= ~0x00000008; - promotion = 0; + uniqueId = 0; return this; } /** - * optional uint32 promotion = 8; - * @return the promotion + * optional uint32 unique_id = 11; + * @return the uniqueId */ - public int getPromotion() { - return promotion; + public int getUniqueId() { + return uniqueId; } /** - * optional uint32 promotion = 8; - * @param value the promotion to set + * optional uint32 unique_id = 11; + * @param value the uniqueId to set * @return this */ - public Equipment setPromotion(final int value) { + public Equipment setUniqueId(final int value) { bitField0_ |= 0x00000008; - promotion = value; + uniqueId = value; return this; } /** - * optional uint32 unique_id = 12; - * @return whether the uniqueId field is set + * optional uint32 promotion = 12; + * @return whether the promotion field is set */ - public boolean hasUniqueId() { + public boolean hasPromotion() { return (bitField0_ & 0x00000010) != 0; } /** - * optional uint32 unique_id = 12; + * optional uint32 promotion = 12; * @return this */ - public Equipment clearUniqueId() { + public Equipment clearPromotion() { bitField0_ &= ~0x00000010; - uniqueId = 0; + promotion = 0; return this; } /** - * optional uint32 unique_id = 12; - * @return the uniqueId + * optional uint32 promotion = 12; + * @return the promotion */ - public int getUniqueId() { - return uniqueId; + public int getPromotion() { + return promotion; } /** - * optional uint32 unique_id = 12; - * @param value the uniqueId to set + * optional uint32 promotion = 12; + * @param value the promotion to set * @return this */ - public Equipment setUniqueId(final int value) { + public Equipment setPromotion(final int value) { bitField0_ |= 0x00000010; - uniqueId = value; + promotion = value; return this; } /** - * optional uint32 tid = 14; - * @return whether the tid field is set + * optional uint32 level = 14; + * @return whether the level field is set */ - public boolean hasTid() { + public boolean hasLevel() { return (bitField0_ & 0x00000020) != 0; } /** - * optional uint32 tid = 14; + * optional uint32 level = 14; * @return this */ - public Equipment clearTid() { + public Equipment clearLevel() { bitField0_ &= ~0x00000020; - tid = 0; + level = 0; return this; } /** - * optional uint32 tid = 14; - * @return the tid + * optional uint32 level = 14; + * @return the level */ - public int getTid() { - return tid; + public int getLevel() { + return level; } /** - * optional uint32 tid = 14; - * @param value the tid to set + * optional uint32 level = 14; + * @param value the level to set * @return this */ - public Equipment setTid(final int value) { + public Equipment setLevel(final int value) { bitField0_ |= 0x00000020; - tid = value; + level = value; return this; } /** - * optional uint32 level = 15; - * @return whether the level field is set + * optional uint32 base_avatar_id = 15; + * @return whether the baseAvatarId field is set */ - public boolean hasLevel() { + public boolean hasBaseAvatarId() { return (bitField0_ & 0x00000040) != 0; } /** - * optional uint32 level = 15; + * optional uint32 base_avatar_id = 15; * @return this */ - public Equipment clearLevel() { + public Equipment clearBaseAvatarId() { bitField0_ &= ~0x00000040; - level = 0; + baseAvatarId = 0; return this; } /** - * optional uint32 level = 15; - * @return the level + * optional uint32 base_avatar_id = 15; + * @return the baseAvatarId */ - public int getLevel() { - return level; + public int getBaseAvatarId() { + return baseAvatarId; } /** - * optional uint32 level = 15; - * @param value the level to set + * optional uint32 base_avatar_id = 15; + * @param value the baseAvatarId to set * @return this */ - public Equipment setLevel(final int value) { + public Equipment setBaseAvatarId(final int value) { bitField0_ |= 0x00000040; - level = value; + baseAvatarId = value; return this; } /** - * optional bool is_protected = 3; + * optional bool is_protected = 5; * @return whether the isProtected field is set */ public boolean hasIsProtected() { @@ -336,7 +336,7 @@ public boolean hasIsProtected() { } /** - * optional bool is_protected = 3; + * optional bool is_protected = 5; * @return this */ public Equipment clearIsProtected() { @@ -346,7 +346,7 @@ public Equipment clearIsProtected() { } /** - * optional bool is_protected = 3; + * optional bool is_protected = 5; * @return the isProtected */ public boolean getIsProtected() { @@ -354,7 +354,7 @@ public boolean getIsProtected() { } /** - * optional bool is_protected = 3; + * optional bool is_protected = 5; * @param value the isProtected to set * @return this */ @@ -369,13 +369,13 @@ public Equipment copyFrom(final Equipment other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; + tid = other.tid; rank = other.rank; exp = other.exp; - baseAvatarId = other.baseAvatarId; - promotion = other.promotion; uniqueId = other.uniqueId; - tid = other.tid; + promotion = other.promotion; level = other.level; + baseAvatarId = other.baseAvatarId; isProtected = other.isProtected; } return this; @@ -387,27 +387,27 @@ public Equipment mergeFrom(final Equipment other) { return this; } cachedSize = -1; + if (other.hasTid()) { + setTid(other.tid); + } if (other.hasRank()) { setRank(other.rank); } if (other.hasExp()) { setExp(other.exp); } - if (other.hasBaseAvatarId()) { - setBaseAvatarId(other.baseAvatarId); - } - if (other.hasPromotion()) { - setPromotion(other.promotion); - } if (other.hasUniqueId()) { setUniqueId(other.uniqueId); } - if (other.hasTid()) { - setTid(other.tid); + if (other.hasPromotion()) { + setPromotion(other.promotion); } if (other.hasLevel()) { setLevel(other.level); } + if (other.hasBaseAvatarId()) { + setBaseAvatarId(other.baseAvatarId); + } if (other.hasIsProtected()) { setIsProtected(other.isProtected); } @@ -421,13 +421,13 @@ public Equipment clear() { } cachedSize = -1; bitField0_ = 0; + tid = 0; rank = 0; exp = 0; - baseAvatarId = 0; - promotion = 0; uniqueId = 0; - tid = 0; + promotion = 0; level = 0; + baseAvatarId = 0; isProtected = false; return this; } @@ -452,48 +452,48 @@ public boolean equals(Object o) { } Equipment other = (Equipment) o; return bitField0_ == other.bitField0_ + && (!hasTid() || tid == other.tid) && (!hasRank() || rank == other.rank) && (!hasExp() || exp == other.exp) - && (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId) - && (!hasPromotion() || promotion == other.promotion) && (!hasUniqueId() || uniqueId == other.uniqueId) - && (!hasTid() || tid == other.tid) + && (!hasPromotion() || promotion == other.promotion) && (!hasLevel() || level == other.level) + && (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId) && (!hasIsProtected() || isProtected == other.isProtected); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); - output.writeUInt32NoTag(rank); + output.writeRawByte((byte) 24); + output.writeUInt32NoTag(tid); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 16); - output.writeUInt32NoTag(exp); + output.writeRawByte((byte) 32); + output.writeUInt32NoTag(rank); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 56); - output.writeUInt32NoTag(baseAvatarId); + output.writeRawByte((byte) 48); + output.writeUInt32NoTag(exp); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 64); - output.writeUInt32NoTag(promotion); + output.writeRawByte((byte) 88); + output.writeUInt32NoTag(uniqueId); } if ((bitField0_ & 0x00000010) != 0) { output.writeRawByte((byte) 96); - output.writeUInt32NoTag(uniqueId); + output.writeUInt32NoTag(promotion); } if ((bitField0_ & 0x00000020) != 0) { output.writeRawByte((byte) 112); - output.writeUInt32NoTag(tid); + output.writeUInt32NoTag(level); } if ((bitField0_ & 0x00000040) != 0) { output.writeRawByte((byte) 120); - output.writeUInt32NoTag(level); + output.writeUInt32NoTag(baseAvatarId); } if ((bitField0_ & 0x00000080) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 40); output.writeBoolNoTag(isProtected); } } @@ -502,25 +502,25 @@ public void writeTo(final ProtoSink output) throws IOException { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(rank); + size += 1 + ProtoSink.computeUInt32SizeNoTag(tid); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(exp); + size += 1 + ProtoSink.computeUInt32SizeNoTag(rank); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(exp); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(promotion); + size += 1 + ProtoSink.computeUInt32SizeNoTag(uniqueId); } if ((bitField0_ & 0x00000010) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(uniqueId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(promotion); } if ((bitField0_ & 0x00000020) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(tid); + size += 1 + ProtoSink.computeUInt32SizeNoTag(level); } if ((bitField0_ & 0x00000040) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(level); + size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId); } if ((bitField0_ & 0x00000080) != 0) { size += 2; @@ -535,36 +535,36 @@ public Equipment mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { - // rank - rank = input.readUInt32(); + case 24: { + // tid + tid = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 16) { + if (tag != 32) { break; } } - case 16: { - // exp - exp = input.readUInt32(); + case 32: { + // rank + rank = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 56) { + if (tag != 48) { break; } } - case 56: { - // baseAvatarId - baseAvatarId = input.readUInt32(); + case 48: { + // exp + exp = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 64) { + if (tag != 88) { break; } } - case 64: { - // promotion - promotion = input.readUInt32(); + case 88: { + // uniqueId + uniqueId = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); if (tag != 96) { @@ -572,8 +572,8 @@ public Equipment mergeFrom(final ProtoSource input) throws IOException { } } case 96: { - // uniqueId - uniqueId = input.readUInt32(); + // promotion + promotion = input.readUInt32(); bitField0_ |= 0x00000010; tag = input.readTag(); if (tag != 112) { @@ -581,8 +581,8 @@ public Equipment mergeFrom(final ProtoSource input) throws IOException { } } case 112: { - // tid - tid = input.readUInt32(); + // level + level = input.readUInt32(); bitField0_ |= 0x00000020; tag = input.readTag(); if (tag != 120) { @@ -590,15 +590,15 @@ public Equipment mergeFrom(final ProtoSource input) throws IOException { } } case 120: { - // level - level = input.readUInt32(); + // baseAvatarId + baseAvatarId = input.readUInt32(); bitField0_ |= 0x00000040; tag = input.readTag(); - if (tag != 24) { + if (tag != 40) { break; } } - case 24: { + case 40: { // isProtected isProtected = input.readBool(); bitField0_ |= 0x00000080; @@ -625,25 +625,25 @@ public Equipment mergeFrom(final ProtoSource input) throws IOException { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.rank, rank); + output.writeUInt32(FieldNames.tid, tid); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.exp, exp); + output.writeUInt32(FieldNames.rank, rank); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId); + output.writeUInt32(FieldNames.exp, exp); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.promotion, promotion); + output.writeUInt32(FieldNames.uniqueId, uniqueId); } if ((bitField0_ & 0x00000010) != 0) { - output.writeUInt32(FieldNames.uniqueId, uniqueId); + output.writeUInt32(FieldNames.promotion, promotion); } if ((bitField0_ & 0x00000020) != 0) { - output.writeUInt32(FieldNames.tid, tid); + output.writeUInt32(FieldNames.level, level); } if ((bitField0_ & 0x00000040) != 0) { - output.writeUInt32(FieldNames.level, level); + output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId); } if ((bitField0_ & 0x00000080) != 0) { output.writeBool(FieldNames.isProtected, isProtected); @@ -658,10 +658,10 @@ public Equipment mergeFrom(final JsonSource input) throws IOException { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 3492908: { - if (input.isAtField(FieldNames.rank)) { + case 114831: { + if (input.isAtField(FieldNames.tid)) { if (!input.trySkipNullValue()) { - rank = input.readUInt32(); + tid = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -669,10 +669,10 @@ public Equipment mergeFrom(final JsonSource input) throws IOException { } break; } - case 100893: { - if (input.isAtField(FieldNames.exp)) { + case 3492908: { + if (input.isAtField(FieldNames.rank)) { if (!input.trySkipNullValue()) { - exp = input.readUInt32(); + rank = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -680,11 +680,10 @@ public Equipment mergeFrom(final JsonSource input) throws IOException { } break; } - case 118022725: - case -1756826157: { - if (input.isAtField(FieldNames.baseAvatarId)) { + case 100893: { + if (input.isAtField(FieldNames.exp)) { if (!input.trySkipNullValue()) { - baseAvatarId = input.readUInt32(); + exp = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -692,10 +691,11 @@ public Equipment mergeFrom(final JsonSource input) throws IOException { } break; } - case -799212381: { - if (input.isAtField(FieldNames.promotion)) { + case -294460212: + case -538310583: { + if (input.isAtField(FieldNames.uniqueId)) { if (!input.trySkipNullValue()) { - promotion = input.readUInt32(); + uniqueId = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -703,11 +703,10 @@ public Equipment mergeFrom(final JsonSource input) throws IOException { } break; } - case -294460212: - case -538310583: { - if (input.isAtField(FieldNames.uniqueId)) { + case -799212381: { + if (input.isAtField(FieldNames.promotion)) { if (!input.trySkipNullValue()) { - uniqueId = input.readUInt32(); + promotion = input.readUInt32(); bitField0_ |= 0x00000010; } } else { @@ -715,10 +714,10 @@ public Equipment mergeFrom(final JsonSource input) throws IOException { } break; } - case 114831: { - if (input.isAtField(FieldNames.tid)) { + case 102865796: { + if (input.isAtField(FieldNames.level)) { if (!input.trySkipNullValue()) { - tid = input.readUInt32(); + level = input.readUInt32(); bitField0_ |= 0x00000020; } } else { @@ -726,10 +725,11 @@ public Equipment mergeFrom(final JsonSource input) throws IOException { } break; } - case 102865796: { - if (input.isAtField(FieldNames.level)) { + case 118022725: + case -1756826157: { + if (input.isAtField(FieldNames.baseAvatarId)) { if (!input.trySkipNullValue()) { - level = input.readUInt32(); + baseAvatarId = input.readUInt32(); bitField0_ |= 0x00000040; } } else { @@ -801,20 +801,20 @@ public Equipment create() { * Contains name constants used for serializing JSON */ static class FieldNames { + static final FieldName tid = FieldName.forField("tid"); + static final FieldName rank = FieldName.forField("rank"); static final FieldName exp = FieldName.forField("exp"); - static final FieldName baseAvatarId = FieldName.forField("baseAvatarId", "base_avatar_id"); - - static final FieldName promotion = FieldName.forField("promotion"); - static final FieldName uniqueId = FieldName.forField("uniqueId", "unique_id"); - static final FieldName tid = FieldName.forField("tid"); + static final FieldName promotion = FieldName.forField("promotion"); static final FieldName level = FieldName.forField("level"); + static final FieldName baseAvatarId = FieldName.forField("baseAvatarId", "base_avatar_id"); + static final FieldName isProtected = FieldName.forField("isProtected", "is_protected"); } } diff --git a/src/generated/main/emu/lunarcore/proto/ExchangeGachaCeilingCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/ExchangeGachaCeilingCsReqOuterClass.java index 4c43fb264..09cc04d06 100644 --- a/src/generated/main/emu/lunarcore/proto/ExchangeGachaCeilingCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ExchangeGachaCeilingCsReqOuterClass.java @@ -19,12 +19,12 @@ public static final class ExchangeGachaCeilingCsReq extends ProtoMessageoptional uint32 avatar_id = 6; + * optional uint32 avatar_id = 1; */ private int avatarId; /** - * optional uint32 gacha_type = 8; + * optional uint32 gacha_type = 5; */ private int gachaType; @@ -39,7 +39,7 @@ public static ExchangeGachaCeilingCsReq newInstance() { } /** - * optional uint32 avatar_id = 6; + * optional uint32 avatar_id = 1; * @return whether the avatarId field is set */ public boolean hasAvatarId() { @@ -47,7 +47,7 @@ public boolean hasAvatarId() { } /** - * optional uint32 avatar_id = 6; + * optional uint32 avatar_id = 1; * @return this */ public ExchangeGachaCeilingCsReq clearAvatarId() { @@ -57,7 +57,7 @@ public ExchangeGachaCeilingCsReq clearAvatarId() { } /** - * optional uint32 avatar_id = 6; + * optional uint32 avatar_id = 1; * @return the avatarId */ public int getAvatarId() { @@ -65,7 +65,7 @@ public int getAvatarId() { } /** - * optional uint32 avatar_id = 6; + * optional uint32 avatar_id = 1; * @param value the avatarId to set * @return this */ @@ -76,7 +76,7 @@ public ExchangeGachaCeilingCsReq setAvatarId(final int value) { } /** - * optional uint32 gacha_type = 8; + * optional uint32 gacha_type = 5; * @return whether the gachaType field is set */ public boolean hasGachaType() { @@ -84,7 +84,7 @@ public boolean hasGachaType() { } /** - * optional uint32 gacha_type = 8; + * optional uint32 gacha_type = 5; * @return this */ public ExchangeGachaCeilingCsReq clearGachaType() { @@ -94,7 +94,7 @@ public ExchangeGachaCeilingCsReq clearGachaType() { } /** - * optional uint32 gacha_type = 8; + * optional uint32 gacha_type = 5; * @return the gachaType */ public int getGachaType() { @@ -102,7 +102,7 @@ public int getGachaType() { } /** - * optional uint32 gacha_type = 8; + * optional uint32 gacha_type = 5; * @param value the gachaType to set * @return this */ @@ -177,11 +177,11 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(avatarId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(gachaType); } } @@ -205,16 +205,16 @@ public ExchangeGachaCeilingCsReq mergeFrom(final ProtoSource input) throws IOExc int tag = input.readTag(); while (true) { switch (tag) { - case 48: { + case 8: { // avatarId avatarId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 64) { + if (tag != 40) { break; } } - case 64: { + case 40: { // gachaType gachaType = input.readUInt32(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/ExchangeGachaCeilingScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/ExchangeGachaCeilingScRspOuterClass.java index f77eb6fab..deddc3f01 100644 --- a/src/generated/main/emu/lunarcore/proto/ExchangeGachaCeilingScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ExchangeGachaCeilingScRspOuterClass.java @@ -19,29 +19,29 @@ public static final class ExchangeGachaCeilingScRsp extends ProtoMessageoptional uint32 avatar_id = 6; + * optional uint32 retcode = 3; */ - private int avatarId; + private int retcode; /** - * optional uint32 retcode = 12; + * optional uint32 avatar_id = 4; */ - private int retcode; + private int avatarId; /** - * optional uint32 gacha_type = 14; + * optional uint32 gacha_type = 10; */ private int gachaType; /** - * optional .GachaCeiling gacha_ceiling = 5; + * optional .ItemList transfer_item_list = 2; */ - private final GachaCeilingOuterClass.GachaCeiling gachaCeiling = GachaCeilingOuterClass.GachaCeiling.newInstance(); + private final ItemListOuterClass.ItemList transferItemList = ItemListOuterClass.ItemList.newInstance(); /** - * optional .ItemList transfer_item_list = 7; + * optional .GachaCeiling gacha_ceiling = 5; */ - private final ItemListOuterClass.ItemList transferItemList = ItemListOuterClass.ItemList.newInstance(); + private final GachaCeilingOuterClass.GachaCeiling gachaCeiling = GachaCeilingOuterClass.GachaCeiling.newInstance(); private ExchangeGachaCeilingScRsp() { } @@ -54,81 +54,81 @@ public static ExchangeGachaCeilingScRsp newInstance() { } /** - * optional uint32 avatar_id = 6; - * @return whether the avatarId field is set + * optional uint32 retcode = 3; + * @return whether the retcode field is set */ - public boolean hasAvatarId() { + public boolean hasRetcode() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 avatar_id = 6; + * optional uint32 retcode = 3; * @return this */ - public ExchangeGachaCeilingScRsp clearAvatarId() { + public ExchangeGachaCeilingScRsp clearRetcode() { bitField0_ &= ~0x00000001; - avatarId = 0; + retcode = 0; return this; } /** - * optional uint32 avatar_id = 6; - * @return the avatarId + * optional uint32 retcode = 3; + * @return the retcode */ - public int getAvatarId() { - return avatarId; + public int getRetcode() { + return retcode; } /** - * optional uint32 avatar_id = 6; - * @param value the avatarId to set + * optional uint32 retcode = 3; + * @param value the retcode to set * @return this */ - public ExchangeGachaCeilingScRsp setAvatarId(final int value) { + public ExchangeGachaCeilingScRsp setRetcode(final int value) { bitField0_ |= 0x00000001; - avatarId = value; + retcode = value; return this; } /** - * optional uint32 retcode = 12; - * @return whether the retcode field is set + * optional uint32 avatar_id = 4; + * @return whether the avatarId field is set */ - public boolean hasRetcode() { + public boolean hasAvatarId() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 retcode = 12; + * optional uint32 avatar_id = 4; * @return this */ - public ExchangeGachaCeilingScRsp clearRetcode() { + public ExchangeGachaCeilingScRsp clearAvatarId() { bitField0_ &= ~0x00000002; - retcode = 0; + avatarId = 0; return this; } /** - * optional uint32 retcode = 12; - * @return the retcode + * optional uint32 avatar_id = 4; + * @return the avatarId */ - public int getRetcode() { - return retcode; + public int getAvatarId() { + return avatarId; } /** - * optional uint32 retcode = 12; - * @param value the retcode to set + * optional uint32 avatar_id = 4; + * @param value the avatarId to set * @return this */ - public ExchangeGachaCeilingScRsp setRetcode(final int value) { + public ExchangeGachaCeilingScRsp setAvatarId(final int value) { bitField0_ |= 0x00000002; - retcode = value; + avatarId = value; return this; } /** - * optional uint32 gacha_type = 14; + * optional uint32 gacha_type = 10; * @return whether the gachaType field is set */ public boolean hasGachaType() { @@ -136,7 +136,7 @@ public boolean hasGachaType() { } /** - * optional uint32 gacha_type = 14; + * optional uint32 gacha_type = 10; * @return this */ public ExchangeGachaCeilingScRsp clearGachaType() { @@ -146,7 +146,7 @@ public ExchangeGachaCeilingScRsp clearGachaType() { } /** - * optional uint32 gacha_type = 14; + * optional uint32 gacha_type = 10; * @return the gachaType */ public int getGachaType() { @@ -154,7 +154,7 @@ public int getGachaType() { } /** - * optional uint32 gacha_type = 14; + * optional uint32 gacha_type = 10; * @param value the gachaType to set * @return this */ @@ -165,39 +165,39 @@ public ExchangeGachaCeilingScRsp setGachaType(final int value) { } /** - * optional .GachaCeiling gacha_ceiling = 5; - * @return whether the gachaCeiling field is set + * optional .ItemList transfer_item_list = 2; + * @return whether the transferItemList field is set */ - public boolean hasGachaCeiling() { + public boolean hasTransferItemList() { return (bitField0_ & 0x00000008) != 0; } /** - * optional .GachaCeiling gacha_ceiling = 5; + * optional .ItemList transfer_item_list = 2; * @return this */ - public ExchangeGachaCeilingScRsp clearGachaCeiling() { + public ExchangeGachaCeilingScRsp clearTransferItemList() { bitField0_ &= ~0x00000008; - gachaCeiling.clear(); + transferItemList.clear(); return this; } /** - * optional .GachaCeiling gacha_ceiling = 5; + * optional .ItemList transfer_item_list = 2; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. * - * Use {@link #getMutableGachaCeiling()} if you want to modify it. + * Use {@link #getMutableTransferItemList()} if you want to modify it. * * @return internal storage object for reading */ - public GachaCeilingOuterClass.GachaCeiling getGachaCeiling() { - return gachaCeiling; + public ItemListOuterClass.ItemList getTransferItemList() { + return transferItemList; } /** - * optional .GachaCeiling gacha_ceiling = 5; + * optional .ItemList transfer_item_list = 2; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -205,57 +205,56 @@ public GachaCeilingOuterClass.GachaCeiling getGachaCeiling() { * * @return internal storage object for modifications */ - public GachaCeilingOuterClass.GachaCeiling getMutableGachaCeiling() { + public ItemListOuterClass.ItemList getMutableTransferItemList() { bitField0_ |= 0x00000008; - return gachaCeiling; + return transferItemList; } /** - * optional .GachaCeiling gacha_ceiling = 5; - * @param value the gachaCeiling to set + * optional .ItemList transfer_item_list = 2; + * @param value the transferItemList to set * @return this */ - public ExchangeGachaCeilingScRsp setGachaCeiling( - final GachaCeilingOuterClass.GachaCeiling value) { + public ExchangeGachaCeilingScRsp setTransferItemList(final ItemListOuterClass.ItemList value) { bitField0_ |= 0x00000008; - gachaCeiling.copyFrom(value); + transferItemList.copyFrom(value); return this; } /** - * optional .ItemList transfer_item_list = 7; - * @return whether the transferItemList field is set + * optional .GachaCeiling gacha_ceiling = 5; + * @return whether the gachaCeiling field is set */ - public boolean hasTransferItemList() { + public boolean hasGachaCeiling() { return (bitField0_ & 0x00000010) != 0; } /** - * optional .ItemList transfer_item_list = 7; + * optional .GachaCeiling gacha_ceiling = 5; * @return this */ - public ExchangeGachaCeilingScRsp clearTransferItemList() { + public ExchangeGachaCeilingScRsp clearGachaCeiling() { bitField0_ &= ~0x00000010; - transferItemList.clear(); + gachaCeiling.clear(); return this; } /** - * optional .ItemList transfer_item_list = 7; + * optional .GachaCeiling gacha_ceiling = 5; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. * - * Use {@link #getMutableTransferItemList()} if you want to modify it. + * Use {@link #getMutableGachaCeiling()} if you want to modify it. * * @return internal storage object for reading */ - public ItemListOuterClass.ItemList getTransferItemList() { - return transferItemList; + public GachaCeilingOuterClass.GachaCeiling getGachaCeiling() { + return gachaCeiling; } /** - * optional .ItemList transfer_item_list = 7; + * optional .GachaCeiling gacha_ceiling = 5; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -263,19 +262,20 @@ public ItemListOuterClass.ItemList getTransferItemList() { * * @return internal storage object for modifications */ - public ItemListOuterClass.ItemList getMutableTransferItemList() { + public GachaCeilingOuterClass.GachaCeiling getMutableGachaCeiling() { bitField0_ |= 0x00000010; - return transferItemList; + return gachaCeiling; } /** - * optional .ItemList transfer_item_list = 7; - * @param value the transferItemList to set + * optional .GachaCeiling gacha_ceiling = 5; + * @param value the gachaCeiling to set * @return this */ - public ExchangeGachaCeilingScRsp setTransferItemList(final ItemListOuterClass.ItemList value) { + public ExchangeGachaCeilingScRsp setGachaCeiling( + final GachaCeilingOuterClass.GachaCeiling value) { bitField0_ |= 0x00000010; - transferItemList.copyFrom(value); + gachaCeiling.copyFrom(value); return this; } @@ -284,11 +284,11 @@ public ExchangeGachaCeilingScRsp copyFrom(final ExchangeGachaCeilingScRsp other) cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - avatarId = other.avatarId; retcode = other.retcode; + avatarId = other.avatarId; gachaType = other.gachaType; - gachaCeiling.copyFrom(other.gachaCeiling); transferItemList.copyFrom(other.transferItemList); + gachaCeiling.copyFrom(other.gachaCeiling); } return this; } @@ -299,21 +299,21 @@ public ExchangeGachaCeilingScRsp mergeFrom(final ExchangeGachaCeilingScRsp other return this; } cachedSize = -1; - if (other.hasAvatarId()) { - setAvatarId(other.avatarId); - } if (other.hasRetcode()) { setRetcode(other.retcode); } + if (other.hasAvatarId()) { + setAvatarId(other.avatarId); + } if (other.hasGachaType()) { setGachaType(other.gachaType); } - if (other.hasGachaCeiling()) { - getMutableGachaCeiling().mergeFrom(other.gachaCeiling); - } if (other.hasTransferItemList()) { getMutableTransferItemList().mergeFrom(other.transferItemList); } + if (other.hasGachaCeiling()) { + getMutableGachaCeiling().mergeFrom(other.gachaCeiling); + } return this; } @@ -324,11 +324,11 @@ public ExchangeGachaCeilingScRsp clear() { } cachedSize = -1; bitField0_ = 0; - avatarId = 0; retcode = 0; + avatarId = 0; gachaType = 0; - gachaCeiling.clear(); transferItemList.clear(); + gachaCeiling.clear(); return this; } @@ -339,8 +339,8 @@ public ExchangeGachaCeilingScRsp clearQuick() { } cachedSize = -1; bitField0_ = 0; - gachaCeiling.clearQuick(); transferItemList.clearQuick(); + gachaCeiling.clearQuick(); return this; } @@ -354,34 +354,34 @@ public boolean equals(Object o) { } ExchangeGachaCeilingScRsp other = (ExchangeGachaCeilingScRsp) o; return bitField0_ == other.bitField0_ - && (!hasAvatarId() || avatarId == other.avatarId) && (!hasRetcode() || retcode == other.retcode) + && (!hasAvatarId() || avatarId == other.avatarId) && (!hasGachaType() || gachaType == other.gachaType) - && (!hasGachaCeiling() || gachaCeiling.equals(other.gachaCeiling)) - && (!hasTransferItemList() || transferItemList.equals(other.transferItemList)); + && (!hasTransferItemList() || transferItemList.equals(other.transferItemList)) + && (!hasGachaCeiling() || gachaCeiling.equals(other.gachaCeiling)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 48); - output.writeUInt32NoTag(avatarId); + output.writeRawByte((byte) 24); + output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 96); - output.writeUInt32NoTag(retcode); + output.writeRawByte((byte) 32); + output.writeUInt32NoTag(avatarId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(gachaType); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 42); - output.writeMessageNoTag(gachaCeiling); + output.writeRawByte((byte) 18); + output.writeMessageNoTag(transferItemList); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 58); - output.writeMessageNoTag(transferItemList); + output.writeRawByte((byte) 42); + output.writeMessageNoTag(gachaCeiling); } } @@ -389,19 +389,19 @@ public void writeTo(final ProtoSink output) throws IOException { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(avatarId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(avatarId); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaType); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(gachaCeiling); + size += 1 + ProtoSink.computeMessageSizeNoTag(transferItemList); } if ((bitField0_ & 0x00000010) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(transferItemList); + size += 1 + ProtoSink.computeMessageSizeNoTag(gachaCeiling); } return size; } @@ -413,45 +413,45 @@ public ExchangeGachaCeilingScRsp mergeFrom(final ProtoSource input) throws IOExc int tag = input.readTag(); while (true) { switch (tag) { - case 48: { - // avatarId - avatarId = input.readUInt32(); + case 24: { + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 96) { + if (tag != 32) { break; } } - case 96: { - // retcode - retcode = input.readUInt32(); + case 32: { + // avatarId + avatarId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 112) { + if (tag != 80) { break; } } - case 112: { + case 80: { // gachaType gachaType = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 42) { + if (tag != 18) { break; } } - case 42: { - // gachaCeiling - input.readMessage(gachaCeiling); + case 18: { + // transferItemList + input.readMessage(transferItemList); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 58) { + if (tag != 42) { break; } } - case 58: { - // transferItemList - input.readMessage(transferItemList); + case 42: { + // gachaCeiling + input.readMessage(gachaCeiling); bitField0_ |= 0x00000010; tag = input.readTag(); if (tag != 0) { @@ -476,19 +476,19 @@ public ExchangeGachaCeilingScRsp mergeFrom(final ProtoSource input) throws IOExc public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.avatarId, avatarId); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.avatarId, avatarId); } if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.gachaType, gachaType); } if ((bitField0_ & 0x00000008) != 0) { - output.writeMessage(FieldNames.gachaCeiling, gachaCeiling); + output.writeMessage(FieldNames.transferItemList, transferItemList); } if ((bitField0_ & 0x00000010) != 0) { - output.writeMessage(FieldNames.transferItemList, transferItemList); + output.writeMessage(FieldNames.gachaCeiling, gachaCeiling); } output.endObject(); } @@ -500,11 +500,10 @@ public ExchangeGachaCeilingScRsp mergeFrom(final JsonSource input) throws IOExce } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1787287636: - case -428636735: { - if (input.isAtField(FieldNames.avatarId)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - avatarId = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -512,10 +511,11 @@ public ExchangeGachaCeilingScRsp mergeFrom(final JsonSource input) throws IOExce } break; } - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case 1787287636: + case -428636735: { + if (input.isAtField(FieldNames.avatarId)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + avatarId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -535,11 +535,11 @@ public ExchangeGachaCeilingScRsp mergeFrom(final JsonSource input) throws IOExce } break; } - case 507275483: - case -1792489728: { - if (input.isAtField(FieldNames.gachaCeiling)) { + case -997597348: + case 263056118: { + if (input.isAtField(FieldNames.transferItemList)) { if (!input.trySkipNullValue()) { - input.readMessage(gachaCeiling); + input.readMessage(transferItemList); bitField0_ |= 0x00000008; } } else { @@ -547,11 +547,11 @@ public ExchangeGachaCeilingScRsp mergeFrom(final JsonSource input) throws IOExce } break; } - case -997597348: - case 263056118: { - if (input.isAtField(FieldNames.transferItemList)) { + case 507275483: + case -1792489728: { + if (input.isAtField(FieldNames.gachaCeiling)) { if (!input.trySkipNullValue()) { - input.readMessage(transferItemList); + input.readMessage(gachaCeiling); bitField0_ |= 0x00000010; } } else { @@ -612,15 +612,15 @@ public ExchangeGachaCeilingScRsp create() { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName avatarId = FieldName.forField("avatarId", "avatar_id"); - static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName gachaType = FieldName.forField("gachaType", "gacha_type"); + static final FieldName avatarId = FieldName.forField("avatarId", "avatar_id"); - static final FieldName gachaCeiling = FieldName.forField("gachaCeiling", "gacha_ceiling"); + static final FieldName gachaType = FieldName.forField("gachaType", "gacha_type"); static final FieldName transferItemList = FieldName.forField("transferItemList", "transfer_item_list"); + + static final FieldName gachaCeiling = FieldName.forField("gachaCeiling", "gacha_ceiling"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/ExchangeHcoinCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/ExchangeHcoinCsReqOuterClass.java index 783af0e82..328c2db7f 100644 --- a/src/generated/main/emu/lunarcore/proto/ExchangeHcoinCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ExchangeHcoinCsReqOuterClass.java @@ -19,7 +19,7 @@ public static final class ExchangeHcoinCsReq extends ProtoMessageoptional uint32 num = 11; + * optional uint32 num = 10; */ private int num; @@ -34,7 +34,7 @@ public static ExchangeHcoinCsReq newInstance() { } /** - * optional uint32 num = 11; + * optional uint32 num = 10; * @return whether the num field is set */ public boolean hasNum() { @@ -42,7 +42,7 @@ public boolean hasNum() { } /** - * optional uint32 num = 11; + * optional uint32 num = 10; * @return this */ public ExchangeHcoinCsReq clearNum() { @@ -52,7 +52,7 @@ public ExchangeHcoinCsReq clearNum() { } /** - * optional uint32 num = 11; + * optional uint32 num = 10; * @return the num */ public int getNum() { @@ -60,7 +60,7 @@ public int getNum() { } /** - * optional uint32 num = 11; + * optional uint32 num = 10; * @param value the num to set * @return this */ @@ -129,7 +129,7 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(num); } } @@ -150,7 +150,7 @@ public ExchangeHcoinCsReq mergeFrom(final ProtoSource input) throws IOException int tag = input.readTag(); while (true) { switch (tag) { - case 88: { + case 80: { // num num = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/ExchangeHcoinScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/ExchangeHcoinScRspOuterClass.java index a95b3a270..2d0091161 100644 --- a/src/generated/main/emu/lunarcore/proto/ExchangeHcoinScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ExchangeHcoinScRspOuterClass.java @@ -19,14 +19,14 @@ public static final class ExchangeHcoinScRsp extends ProtoMessageoptional uint32 retcode = 7; + * optional uint32 num = 1; */ - private int retcode; + private int num; /** - * optional uint32 num = 9; + * optional uint32 retcode = 14; */ - private int num; + private int retcode; private ExchangeHcoinScRsp() { } @@ -39,76 +39,76 @@ public static ExchangeHcoinScRsp newInstance() { } /** - * optional uint32 retcode = 7; - * @return whether the retcode field is set + * optional uint32 num = 1; + * @return whether the num field is set */ - public boolean hasRetcode() { + public boolean hasNum() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 retcode = 7; + * optional uint32 num = 1; * @return this */ - public ExchangeHcoinScRsp clearRetcode() { + public ExchangeHcoinScRsp clearNum() { bitField0_ &= ~0x00000001; - retcode = 0; + num = 0; return this; } /** - * optional uint32 retcode = 7; - * @return the retcode + * optional uint32 num = 1; + * @return the num */ - public int getRetcode() { - return retcode; + public int getNum() { + return num; } /** - * optional uint32 retcode = 7; - * @param value the retcode to set + * optional uint32 num = 1; + * @param value the num to set * @return this */ - public ExchangeHcoinScRsp setRetcode(final int value) { + public ExchangeHcoinScRsp setNum(final int value) { bitField0_ |= 0x00000001; - retcode = value; + num = value; return this; } /** - * optional uint32 num = 9; - * @return whether the num field is set + * optional uint32 retcode = 14; + * @return whether the retcode field is set */ - public boolean hasNum() { + public boolean hasRetcode() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 num = 9; + * optional uint32 retcode = 14; * @return this */ - public ExchangeHcoinScRsp clearNum() { + public ExchangeHcoinScRsp clearRetcode() { bitField0_ &= ~0x00000002; - num = 0; + retcode = 0; return this; } /** - * optional uint32 num = 9; - * @return the num + * optional uint32 retcode = 14; + * @return the retcode */ - public int getNum() { - return num; + public int getRetcode() { + return retcode; } /** - * optional uint32 num = 9; - * @param value the num to set + * optional uint32 retcode = 14; + * @param value the retcode to set * @return this */ - public ExchangeHcoinScRsp setNum(final int value) { + public ExchangeHcoinScRsp setRetcode(final int value) { bitField0_ |= 0x00000002; - num = value; + retcode = value; return this; } @@ -117,8 +117,8 @@ public ExchangeHcoinScRsp copyFrom(final ExchangeHcoinScRsp other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - retcode = other.retcode; num = other.num; + retcode = other.retcode; } return this; } @@ -129,12 +129,12 @@ public ExchangeHcoinScRsp mergeFrom(final ExchangeHcoinScRsp other) { return this; } cachedSize = -1; - if (other.hasRetcode()) { - setRetcode(other.retcode); - } if (other.hasNum()) { setNum(other.num); } + if (other.hasRetcode()) { + setRetcode(other.retcode); + } return this; } @@ -145,8 +145,8 @@ public ExchangeHcoinScRsp clear() { } cachedSize = -1; bitField0_ = 0; - retcode = 0; num = 0; + retcode = 0; return this; } @@ -170,19 +170,19 @@ public boolean equals(Object o) { } ExchangeHcoinScRsp other = (ExchangeHcoinScRsp) o; return bitField0_ == other.bitField0_ - && (!hasRetcode() || retcode == other.retcode) - && (!hasNum() || num == other.num); + && (!hasNum() || num == other.num) + && (!hasRetcode() || retcode == other.retcode); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 56); - output.writeUInt32NoTag(retcode); + output.writeRawByte((byte) 8); + output.writeUInt32NoTag(num); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 72); - output.writeUInt32NoTag(num); + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(retcode); } } @@ -190,10 +190,10 @@ public void writeTo(final ProtoSink output) throws IOException { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(num); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(num); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } return size; } @@ -205,18 +205,18 @@ public ExchangeHcoinScRsp mergeFrom(final ProtoSource input) throws IOException int tag = input.readTag(); while (true) { switch (tag) { - case 56: { - // retcode - retcode = input.readUInt32(); + case 8: { + // num + num = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 72) { + if (tag != 112) { break; } } - case 72: { - // num - num = input.readUInt32(); + case 112: { + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -241,10 +241,10 @@ public ExchangeHcoinScRsp mergeFrom(final ProtoSource input) throws IOException public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.num, num); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.num, num); + output.writeUInt32(FieldNames.retcode, retcode); } output.endObject(); } @@ -256,10 +256,10 @@ public ExchangeHcoinScRsp mergeFrom(final JsonSource input) throws IOException { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case 109446: { + if (input.isAtField(FieldNames.num)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + num = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -267,10 +267,10 @@ public ExchangeHcoinScRsp mergeFrom(final JsonSource input) throws IOException { } break; } - case 109446: { - if (input.isAtField(FieldNames.num)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - num = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -331,9 +331,9 @@ public ExchangeHcoinScRsp create() { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName num = FieldName.forField("num"); + + static final FieldName retcode = FieldName.forField("retcode"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/ExpUpEquipmentCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/ExpUpEquipmentCsReqOuterClass.java index 4978ca037..df1d0d1c8 100644 --- a/src/generated/main/emu/lunarcore/proto/ExpUpEquipmentCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ExpUpEquipmentCsReqOuterClass.java @@ -19,12 +19,12 @@ public static final class ExpUpEquipmentCsReq extends ProtoMessageoptional uint32 equipment_unique_id = 10; + * optional uint32 equipment_unique_id = 2; */ private int equipmentUniqueId; /** - * optional .ItemCostList item_cost_list = 3; + * optional .ItemCostList item_cost_list = 1; */ private final ItemCostListOuterClass.ItemCostList itemCostList = ItemCostListOuterClass.ItemCostList.newInstance(); @@ -39,7 +39,7 @@ public static ExpUpEquipmentCsReq newInstance() { } /** - * optional uint32 equipment_unique_id = 10; + * optional uint32 equipment_unique_id = 2; * @return whether the equipmentUniqueId field is set */ public boolean hasEquipmentUniqueId() { @@ -47,7 +47,7 @@ public boolean hasEquipmentUniqueId() { } /** - * optional uint32 equipment_unique_id = 10; + * optional uint32 equipment_unique_id = 2; * @return this */ public ExpUpEquipmentCsReq clearEquipmentUniqueId() { @@ -57,7 +57,7 @@ public ExpUpEquipmentCsReq clearEquipmentUniqueId() { } /** - * optional uint32 equipment_unique_id = 10; + * optional uint32 equipment_unique_id = 2; * @return the equipmentUniqueId */ public int getEquipmentUniqueId() { @@ -65,7 +65,7 @@ public int getEquipmentUniqueId() { } /** - * optional uint32 equipment_unique_id = 10; + * optional uint32 equipment_unique_id = 2; * @param value the equipmentUniqueId to set * @return this */ @@ -76,7 +76,7 @@ public ExpUpEquipmentCsReq setEquipmentUniqueId(final int value) { } /** - * optional .ItemCostList item_cost_list = 3; + * optional .ItemCostList item_cost_list = 1; * @return whether the itemCostList field is set */ public boolean hasItemCostList() { @@ -84,7 +84,7 @@ public boolean hasItemCostList() { } /** - * optional .ItemCostList item_cost_list = 3; + * optional .ItemCostList item_cost_list = 1; * @return this */ public ExpUpEquipmentCsReq clearItemCostList() { @@ -94,7 +94,7 @@ public ExpUpEquipmentCsReq clearItemCostList() { } /** - * optional .ItemCostList item_cost_list = 3; + * optional .ItemCostList item_cost_list = 1; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -108,7 +108,7 @@ public ItemCostListOuterClass.ItemCostList getItemCostList() { } /** - * optional .ItemCostList item_cost_list = 3; + * optional .ItemCostList item_cost_list = 1; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -122,7 +122,7 @@ public ItemCostListOuterClass.ItemCostList getMutableItemCostList() { } /** - * optional .ItemCostList item_cost_list = 3; + * optional .ItemCostList item_cost_list = 1; * @param value the itemCostList to set * @return this */ @@ -198,11 +198,11 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(equipmentUniqueId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 26); + output.writeRawByte((byte) 10); output.writeMessageNoTag(itemCostList); } } @@ -226,16 +226,16 @@ public ExpUpEquipmentCsReq mergeFrom(final ProtoSource input) throws IOException int tag = input.readTag(); while (true) { switch (tag) { - case 80: { + case 16: { // equipmentUniqueId equipmentUniqueId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 26) { + if (tag != 10) { break; } } - case 26: { + case 10: { // itemCostList input.readMessage(itemCostList); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/ExpUpEquipmentScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/ExpUpEquipmentScRspOuterClass.java index 7b4881d71..667f9d9df 100644 --- a/src/generated/main/emu/lunarcore/proto/ExpUpEquipmentScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ExpUpEquipmentScRspOuterClass.java @@ -20,12 +20,12 @@ public static final class ExpUpEquipmentScRsp extends ProtoMessageoptional uint32 retcode = 10; + * optional uint32 retcode = 8; */ private int retcode; /** - * repeated .PileItem return_item_list = 6; + * repeated .PileItem return_item_list = 12; */ private final RepeatedMessage returnItemList = RepeatedMessage.newEmptyInstance(PileItemOuterClass.PileItem.getFactory()); @@ -40,7 +40,7 @@ public static ExpUpEquipmentScRsp newInstance() { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 8; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -48,7 +48,7 @@ public boolean hasRetcode() { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 8; * @return this */ public ExpUpEquipmentScRsp clearRetcode() { @@ -58,7 +58,7 @@ public ExpUpEquipmentScRsp clearRetcode() { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 8; * @return the retcode */ public int getRetcode() { @@ -66,7 +66,7 @@ public int getRetcode() { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 8; * @param value the retcode to set * @return this */ @@ -77,7 +77,7 @@ public ExpUpEquipmentScRsp setRetcode(final int value) { } /** - * repeated .PileItem return_item_list = 6; + * repeated .PileItem return_item_list = 12; * @return whether the returnItemList field is set */ public boolean hasReturnItemList() { @@ -85,7 +85,7 @@ public boolean hasReturnItemList() { } /** - * repeated .PileItem return_item_list = 6; + * repeated .PileItem return_item_list = 12; * @return this */ public ExpUpEquipmentScRsp clearReturnItemList() { @@ -95,7 +95,7 @@ public ExpUpEquipmentScRsp clearReturnItemList() { } /** - * repeated .PileItem return_item_list = 6; + * repeated .PileItem return_item_list = 12; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -109,7 +109,7 @@ public RepeatedMessage getReturnItemList() { } /** - * repeated .PileItem return_item_list = 6; + * repeated .PileItem return_item_list = 12; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -123,7 +123,7 @@ public RepeatedMessage getMutableReturnItemList() { } /** - * repeated .PileItem return_item_list = 6; + * repeated .PileItem return_item_list = 12; * @param value the returnItemList to add * @return this */ @@ -134,7 +134,7 @@ public ExpUpEquipmentScRsp addReturnItemList(final PileItemOuterClass.PileItem v } /** - * repeated .PileItem return_item_list = 6; + * repeated .PileItem return_item_list = 12; * @param values the returnItemList to add * @return this */ @@ -210,12 +210,12 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < returnItemList.length(); i++) { - output.writeRawByte((byte) 50); + output.writeRawByte((byte) 98); output.writeMessageNoTag(returnItemList.get(i)); } } @@ -240,16 +240,16 @@ public ExpUpEquipmentScRsp mergeFrom(final ProtoSource input) throws IOException int tag = input.readTag(); while (true) { switch (tag) { - case 80: { + case 64: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 50) { + if (tag != 98) { break; } } - case 50: { + case 98: { // returnItemList tag = input.readRepeatedMessage(returnItemList, tag); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/ExpUpRelicCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/ExpUpRelicCsReqOuterClass.java index 7dcc7dbce..1297d1e6c 100644 --- a/src/generated/main/emu/lunarcore/proto/ExpUpRelicCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ExpUpRelicCsReqOuterClass.java @@ -19,12 +19,12 @@ public static final class ExpUpRelicCsReq extends ProtoMessage private static final long serialVersionUID = 0L; /** - * optional uint32 relic_unique_id = 8; + * optional uint32 relic_unique_id = 7; */ private int relicUniqueId; /** - * optional .ItemCostList item_cost_list = 13; + * optional .ItemCostList item_cost_list = 11; */ private final ItemCostListOuterClass.ItemCostList itemCostList = ItemCostListOuterClass.ItemCostList.newInstance(); @@ -39,7 +39,7 @@ public static ExpUpRelicCsReq newInstance() { } /** - * optional uint32 relic_unique_id = 8; + * optional uint32 relic_unique_id = 7; * @return whether the relicUniqueId field is set */ public boolean hasRelicUniqueId() { @@ -47,7 +47,7 @@ public boolean hasRelicUniqueId() { } /** - * optional uint32 relic_unique_id = 8; + * optional uint32 relic_unique_id = 7; * @return this */ public ExpUpRelicCsReq clearRelicUniqueId() { @@ -57,7 +57,7 @@ public ExpUpRelicCsReq clearRelicUniqueId() { } /** - * optional uint32 relic_unique_id = 8; + * optional uint32 relic_unique_id = 7; * @return the relicUniqueId */ public int getRelicUniqueId() { @@ -65,7 +65,7 @@ public int getRelicUniqueId() { } /** - * optional uint32 relic_unique_id = 8; + * optional uint32 relic_unique_id = 7; * @param value the relicUniqueId to set * @return this */ @@ -76,7 +76,7 @@ public ExpUpRelicCsReq setRelicUniqueId(final int value) { } /** - * optional .ItemCostList item_cost_list = 13; + * optional .ItemCostList item_cost_list = 11; * @return whether the itemCostList field is set */ public boolean hasItemCostList() { @@ -84,7 +84,7 @@ public boolean hasItemCostList() { } /** - * optional .ItemCostList item_cost_list = 13; + * optional .ItemCostList item_cost_list = 11; * @return this */ public ExpUpRelicCsReq clearItemCostList() { @@ -94,7 +94,7 @@ public ExpUpRelicCsReq clearItemCostList() { } /** - * optional .ItemCostList item_cost_list = 13; + * optional .ItemCostList item_cost_list = 11; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -108,7 +108,7 @@ public ItemCostListOuterClass.ItemCostList getItemCostList() { } /** - * optional .ItemCostList item_cost_list = 13; + * optional .ItemCostList item_cost_list = 11; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -122,7 +122,7 @@ public ItemCostListOuterClass.ItemCostList getMutableItemCostList() { } /** - * optional .ItemCostList item_cost_list = 13; + * optional .ItemCostList item_cost_list = 11; * @param value the itemCostList to set * @return this */ @@ -198,11 +198,11 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(relicUniqueId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 106); + output.writeRawByte((byte) 90); output.writeMessageNoTag(itemCostList); } } @@ -226,16 +226,16 @@ public ExpUpRelicCsReq mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { + case 56: { // relicUniqueId relicUniqueId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 106) { + if (tag != 90) { break; } } - case 106: { + case 90: { // itemCostList input.readMessage(itemCostList); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/ExpUpRelicScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/ExpUpRelicScRspOuterClass.java index 1127dd79f..a7c7e45e2 100644 --- a/src/generated/main/emu/lunarcore/proto/ExpUpRelicScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ExpUpRelicScRspOuterClass.java @@ -20,12 +20,12 @@ public static final class ExpUpRelicScRsp extends ProtoMessage private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 1; */ private int retcode; /** - * repeated .PileItem return_item_list = 6; + * repeated .PileItem return_item_list = 14; */ private final RepeatedMessage returnItemList = RepeatedMessage.newEmptyInstance(PileItemOuterClass.PileItem.getFactory()); @@ -40,7 +40,7 @@ public static ExpUpRelicScRsp newInstance() { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 1; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -48,7 +48,7 @@ public boolean hasRetcode() { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 1; * @return this */ public ExpUpRelicScRsp clearRetcode() { @@ -58,7 +58,7 @@ public ExpUpRelicScRsp clearRetcode() { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 1; * @return the retcode */ public int getRetcode() { @@ -66,7 +66,7 @@ public int getRetcode() { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 1; * @param value the retcode to set * @return this */ @@ -77,7 +77,7 @@ public ExpUpRelicScRsp setRetcode(final int value) { } /** - * repeated .PileItem return_item_list = 6; + * repeated .PileItem return_item_list = 14; * @return whether the returnItemList field is set */ public boolean hasReturnItemList() { @@ -85,7 +85,7 @@ public boolean hasReturnItemList() { } /** - * repeated .PileItem return_item_list = 6; + * repeated .PileItem return_item_list = 14; * @return this */ public ExpUpRelicScRsp clearReturnItemList() { @@ -95,7 +95,7 @@ public ExpUpRelicScRsp clearReturnItemList() { } /** - * repeated .PileItem return_item_list = 6; + * repeated .PileItem return_item_list = 14; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -109,7 +109,7 @@ public RepeatedMessage getReturnItemList() { } /** - * repeated .PileItem return_item_list = 6; + * repeated .PileItem return_item_list = 14; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -123,7 +123,7 @@ public RepeatedMessage getMutableReturnItemList() { } /** - * repeated .PileItem return_item_list = 6; + * repeated .PileItem return_item_list = 14; * @param value the returnItemList to add * @return this */ @@ -134,7 +134,7 @@ public ExpUpRelicScRsp addReturnItemList(final PileItemOuterClass.PileItem value } /** - * repeated .PileItem return_item_list = 6; + * repeated .PileItem return_item_list = 14; * @param values the returnItemList to add * @return this */ @@ -210,12 +210,12 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < returnItemList.length(); i++) { - output.writeRawByte((byte) 50); + output.writeRawByte((byte) 114); output.writeMessageNoTag(returnItemList.get(i)); } } @@ -240,16 +240,16 @@ public ExpUpRelicScRsp mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 80: { + case 8: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 50) { + if (tag != 114) { break; } } - case 50: { + case 114: { // returnItemList tag = input.readRepeatedMessage(returnItemList, tag); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/FriendApplyInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/FriendApplyInfoOuterClass.java index 88e9aa97e..671f160e2 100644 --- a/src/generated/main/emu/lunarcore/proto/FriendApplyInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/FriendApplyInfoOuterClass.java @@ -19,7 +19,7 @@ public static final class FriendApplyInfo extends ProtoMessage private static final long serialVersionUID = 0L; /** - * optional .SimpleInfo simple_info = 4; + * optional .SimpleInfo simple_info = 14; */ private final SimpleInfoOuterClass.SimpleInfo simpleInfo = SimpleInfoOuterClass.SimpleInfo.newInstance(); @@ -34,7 +34,7 @@ public static FriendApplyInfo newInstance() { } /** - * optional .SimpleInfo simple_info = 4; + * optional .SimpleInfo simple_info = 14; * @return whether the simpleInfo field is set */ public boolean hasSimpleInfo() { @@ -42,7 +42,7 @@ public boolean hasSimpleInfo() { } /** - * optional .SimpleInfo simple_info = 4; + * optional .SimpleInfo simple_info = 14; * @return this */ public FriendApplyInfo clearSimpleInfo() { @@ -52,7 +52,7 @@ public FriendApplyInfo clearSimpleInfo() { } /** - * optional .SimpleInfo simple_info = 4; + * optional .SimpleInfo simple_info = 14; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -66,7 +66,7 @@ public SimpleInfoOuterClass.SimpleInfo getSimpleInfo() { } /** - * optional .SimpleInfo simple_info = 4; + * optional .SimpleInfo simple_info = 14; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -80,7 +80,7 @@ public SimpleInfoOuterClass.SimpleInfo getMutableSimpleInfo() { } /** - * optional .SimpleInfo simple_info = 4; + * optional .SimpleInfo simple_info = 14; * @param value the simpleInfo to set * @return this */ @@ -150,7 +150,7 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 34); + output.writeRawByte((byte) 114); output.writeMessageNoTag(simpleInfo); } } @@ -171,7 +171,7 @@ public FriendApplyInfo mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 34: { + case 114: { // simpleInfo input.readMessage(simpleInfo); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/FriendListInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/FriendListInfoOuterClass.java index 36f8146da..688851cec 100644 --- a/src/generated/main/emu/lunarcore/proto/FriendListInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/FriendListInfoOuterClass.java @@ -19,7 +19,7 @@ public static final class FriendListInfo extends ProtoMessage im private static final long serialVersionUID = 0L; /** - * optional .SimpleInfo simple_info = 7; + * optional .SimpleInfo simple_info = 10; */ private final SimpleInfoOuterClass.SimpleInfo simpleInfo = SimpleInfoOuterClass.SimpleInfo.newInstance(); @@ -34,7 +34,7 @@ public static FriendListInfo newInstance() { } /** - * optional .SimpleInfo simple_info = 7; + * optional .SimpleInfo simple_info = 10; * @return whether the simpleInfo field is set */ public boolean hasSimpleInfo() { @@ -42,7 +42,7 @@ public boolean hasSimpleInfo() { } /** - * optional .SimpleInfo simple_info = 7; + * optional .SimpleInfo simple_info = 10; * @return this */ public FriendListInfo clearSimpleInfo() { @@ -52,7 +52,7 @@ public FriendListInfo clearSimpleInfo() { } /** - * optional .SimpleInfo simple_info = 7; + * optional .SimpleInfo simple_info = 10; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -66,7 +66,7 @@ public SimpleInfoOuterClass.SimpleInfo getSimpleInfo() { } /** - * optional .SimpleInfo simple_info = 7; + * optional .SimpleInfo simple_info = 10; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -80,7 +80,7 @@ public SimpleInfoOuterClass.SimpleInfo getMutableSimpleInfo() { } /** - * optional .SimpleInfo simple_info = 7; + * optional .SimpleInfo simple_info = 10; * @param value the simpleInfo to set * @return this */ @@ -150,7 +150,7 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 58); + output.writeRawByte((byte) 82); output.writeMessageNoTag(simpleInfo); } } @@ -171,7 +171,7 @@ public FriendListInfo mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 58: { + case 82: { // simpleInfo input.readMessage(simpleInfo); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/FriendRecommendInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/FriendRecommendInfoOuterClass.java index 97b22f60f..4bef5a6ec 100644 --- a/src/generated/main/emu/lunarcore/proto/FriendRecommendInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/FriendRecommendInfoOuterClass.java @@ -19,7 +19,7 @@ public static final class FriendRecommendInfo extends ProtoMessageoptional .SimpleInfo simple_info = 1; + * optional .SimpleInfo simple_info = 15; */ private final SimpleInfoOuterClass.SimpleInfo simpleInfo = SimpleInfoOuterClass.SimpleInfo.newInstance(); @@ -34,7 +34,7 @@ public static FriendRecommendInfo newInstance() { } /** - * optional .SimpleInfo simple_info = 1; + * optional .SimpleInfo simple_info = 15; * @return whether the simpleInfo field is set */ public boolean hasSimpleInfo() { @@ -42,7 +42,7 @@ public boolean hasSimpleInfo() { } /** - * optional .SimpleInfo simple_info = 1; + * optional .SimpleInfo simple_info = 15; * @return this */ public FriendRecommendInfo clearSimpleInfo() { @@ -52,7 +52,7 @@ public FriendRecommendInfo clearSimpleInfo() { } /** - * optional .SimpleInfo simple_info = 1; + * optional .SimpleInfo simple_info = 15; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -66,7 +66,7 @@ public SimpleInfoOuterClass.SimpleInfo getSimpleInfo() { } /** - * optional .SimpleInfo simple_info = 1; + * optional .SimpleInfo simple_info = 15; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -80,7 +80,7 @@ public SimpleInfoOuterClass.SimpleInfo getMutableSimpleInfo() { } /** - * optional .SimpleInfo simple_info = 1; + * optional .SimpleInfo simple_info = 15; * @param value the simpleInfo to set * @return this */ @@ -150,7 +150,7 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 10); + output.writeRawByte((byte) 122); output.writeMessageNoTag(simpleInfo); } } @@ -171,7 +171,7 @@ public FriendRecommendInfo mergeFrom(final ProtoSource input) throws IOException int tag = input.readTag(); while (true) { switch (tag) { - case 10: { + case 122: { // simpleInfo input.readMessage(simpleInfo); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/GachaCeilingAvatarOuterClass.java b/src/generated/main/emu/lunarcore/proto/GachaCeilingAvatarOuterClass.java index 1c107fe59..2e0f178b3 100644 --- a/src/generated/main/emu/lunarcore/proto/GachaCeilingAvatarOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GachaCeilingAvatarOuterClass.java @@ -24,7 +24,7 @@ public static final class GachaCeilingAvatar extends ProtoMessageoptional uint32 repeated_cnt = 12; + * optional uint32 repeated_cnt = 15; */ private int repeatedCnt; @@ -76,7 +76,7 @@ public GachaCeilingAvatar setAvatarId(final int value) { } /** - * optional uint32 repeated_cnt = 12; + * optional uint32 repeated_cnt = 15; * @return whether the repeatedCnt field is set */ public boolean hasRepeatedCnt() { @@ -84,7 +84,7 @@ public boolean hasRepeatedCnt() { } /** - * optional uint32 repeated_cnt = 12; + * optional uint32 repeated_cnt = 15; * @return this */ public GachaCeilingAvatar clearRepeatedCnt() { @@ -94,7 +94,7 @@ public GachaCeilingAvatar clearRepeatedCnt() { } /** - * optional uint32 repeated_cnt = 12; + * optional uint32 repeated_cnt = 15; * @return the repeatedCnt */ public int getRepeatedCnt() { @@ -102,7 +102,7 @@ public int getRepeatedCnt() { } /** - * optional uint32 repeated_cnt = 12; + * optional uint32 repeated_cnt = 15; * @param value the repeatedCnt to set * @return this */ @@ -181,7 +181,7 @@ public void writeTo(final ProtoSink output) throws IOException { output.writeUInt32NoTag(avatarId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(repeatedCnt); } } @@ -210,11 +210,11 @@ public GachaCeilingAvatar mergeFrom(final ProtoSource input) throws IOException avatarId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 96) { + if (tag != 120) { break; } } - case 96: { + case 120: { // repeatedCnt repeatedCnt = input.readUInt32(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/GachaCeilingOuterClass.java b/src/generated/main/emu/lunarcore/proto/GachaCeilingOuterClass.java index 7fad7737b..c0e271a58 100644 --- a/src/generated/main/emu/lunarcore/proto/GachaCeilingOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GachaCeilingOuterClass.java @@ -20,12 +20,12 @@ public static final class GachaCeiling extends ProtoMessage implem private static final long serialVersionUID = 0L; /** - * optional uint32 ceiling_num = 12; + * optional uint32 ceiling_num = 4; */ private int ceilingNum; /** - * optional bool is_claimed = 5; + * optional bool is_claimed = 3; */ private boolean isClaimed; @@ -45,7 +45,7 @@ public static GachaCeiling newInstance() { } /** - * optional uint32 ceiling_num = 12; + * optional uint32 ceiling_num = 4; * @return whether the ceilingNum field is set */ public boolean hasCeilingNum() { @@ -53,7 +53,7 @@ public boolean hasCeilingNum() { } /** - * optional uint32 ceiling_num = 12; + * optional uint32 ceiling_num = 4; * @return this */ public GachaCeiling clearCeilingNum() { @@ -63,7 +63,7 @@ public GachaCeiling clearCeilingNum() { } /** - * optional uint32 ceiling_num = 12; + * optional uint32 ceiling_num = 4; * @return the ceilingNum */ public int getCeilingNum() { @@ -71,7 +71,7 @@ public int getCeilingNum() { } /** - * optional uint32 ceiling_num = 12; + * optional uint32 ceiling_num = 4; * @param value the ceilingNum to set * @return this */ @@ -82,7 +82,7 @@ public GachaCeiling setCeilingNum(final int value) { } /** - * optional bool is_claimed = 5; + * optional bool is_claimed = 3; * @return whether the isClaimed field is set */ public boolean hasIsClaimed() { @@ -90,7 +90,7 @@ public boolean hasIsClaimed() { } /** - * optional bool is_claimed = 5; + * optional bool is_claimed = 3; * @return this */ public GachaCeiling clearIsClaimed() { @@ -100,7 +100,7 @@ public GachaCeiling clearIsClaimed() { } /** - * optional bool is_claimed = 5; + * optional bool is_claimed = 3; * @return the isClaimed */ public boolean getIsClaimed() { @@ -108,7 +108,7 @@ public boolean getIsClaimed() { } /** - * optional bool is_claimed = 5; + * optional bool is_claimed = 3; * @param value the isClaimed to set * @return this */ @@ -259,11 +259,11 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(ceilingNum); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 24); output.writeBoolNoTag(isClaimed); } if ((bitField0_ & 0x00000004) != 0) { @@ -296,16 +296,16 @@ public GachaCeiling mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 96: { + case 32: { // ceilingNum ceilingNum = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 40) { + if (tag != 24) { break; } } - case 40: { + case 24: { // isClaimed isClaimed = input.readBool(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/GachaInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/GachaInfoOuterClass.java index cbafb9f79..3802d1709 100644 --- a/src/generated/main/emu/lunarcore/proto/GachaInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GachaInfoOuterClass.java @@ -21,44 +21,44 @@ public static final class GachaInfo extends ProtoMessage implements C private static final long serialVersionUID = 0L; /** - * optional int64 begin_time = 5; + * optional int64 begin_time = 10; */ private long beginTime; /** - * optional int64 end_time = 15; + * optional int64 end_time = 12; */ private long endTime; /** - * optional uint32 gacha_id = 3; + * optional uint32 gacha_id = 13; */ private int gachaId; /** - * optional .GachaCeiling gacha_ceiling = 1; + * optional .GachaCeiling gacha_ceiling = 9; */ private final GachaCeilingOuterClass.GachaCeiling gachaCeiling = GachaCeilingOuterClass.GachaCeiling.newInstance(); /** - * optional string history_url = 13; + * optional string detail_url = 2; */ - private final Utf8String historyUrl = Utf8String.newEmptyInstance(); + private final Utf8String detailUrl = Utf8String.newEmptyInstance(); /** - * optional string detail_url = 14; + * optional string history_url = 6; */ - private final Utf8String detailUrl = Utf8String.newEmptyInstance(); + private final Utf8String historyUrl = Utf8String.newEmptyInstance(); /** - * repeated uint32 up_info = 6; + * repeated uint32 featured = 1; */ - private final RepeatedInt upInfo = RepeatedInt.newEmptyInstance(); + private final RepeatedInt featured = RepeatedInt.newEmptyInstance(); /** - * repeated uint32 featured = 9; + * repeated uint32 up_info = 5; */ - private final RepeatedInt featured = RepeatedInt.newEmptyInstance(); + private final RepeatedInt upInfo = RepeatedInt.newEmptyInstance(); private GachaInfo() { } @@ -71,7 +71,7 @@ public static GachaInfo newInstance() { } /** - * optional int64 begin_time = 5; + * optional int64 begin_time = 10; * @return whether the beginTime field is set */ public boolean hasBeginTime() { @@ -79,7 +79,7 @@ public boolean hasBeginTime() { } /** - * optional int64 begin_time = 5; + * optional int64 begin_time = 10; * @return this */ public GachaInfo clearBeginTime() { @@ -89,7 +89,7 @@ public GachaInfo clearBeginTime() { } /** - * optional int64 begin_time = 5; + * optional int64 begin_time = 10; * @return the beginTime */ public long getBeginTime() { @@ -97,7 +97,7 @@ public long getBeginTime() { } /** - * optional int64 begin_time = 5; + * optional int64 begin_time = 10; * @param value the beginTime to set * @return this */ @@ -108,7 +108,7 @@ public GachaInfo setBeginTime(final long value) { } /** - * optional int64 end_time = 15; + * optional int64 end_time = 12; * @return whether the endTime field is set */ public boolean hasEndTime() { @@ -116,7 +116,7 @@ public boolean hasEndTime() { } /** - * optional int64 end_time = 15; + * optional int64 end_time = 12; * @return this */ public GachaInfo clearEndTime() { @@ -126,7 +126,7 @@ public GachaInfo clearEndTime() { } /** - * optional int64 end_time = 15; + * optional int64 end_time = 12; * @return the endTime */ public long getEndTime() { @@ -134,7 +134,7 @@ public long getEndTime() { } /** - * optional int64 end_time = 15; + * optional int64 end_time = 12; * @param value the endTime to set * @return this */ @@ -145,7 +145,7 @@ public GachaInfo setEndTime(final long value) { } /** - * optional uint32 gacha_id = 3; + * optional uint32 gacha_id = 13; * @return whether the gachaId field is set */ public boolean hasGachaId() { @@ -153,7 +153,7 @@ public boolean hasGachaId() { } /** - * optional uint32 gacha_id = 3; + * optional uint32 gacha_id = 13; * @return this */ public GachaInfo clearGachaId() { @@ -163,7 +163,7 @@ public GachaInfo clearGachaId() { } /** - * optional uint32 gacha_id = 3; + * optional uint32 gacha_id = 13; * @return the gachaId */ public int getGachaId() { @@ -171,7 +171,7 @@ public int getGachaId() { } /** - * optional uint32 gacha_id = 3; + * optional uint32 gacha_id = 13; * @param value the gachaId to set * @return this */ @@ -182,7 +182,7 @@ public GachaInfo setGachaId(final int value) { } /** - * optional .GachaCeiling gacha_ceiling = 1; + * optional .GachaCeiling gacha_ceiling = 9; * @return whether the gachaCeiling field is set */ public boolean hasGachaCeiling() { @@ -190,7 +190,7 @@ public boolean hasGachaCeiling() { } /** - * optional .GachaCeiling gacha_ceiling = 1; + * optional .GachaCeiling gacha_ceiling = 9; * @return this */ public GachaInfo clearGachaCeiling() { @@ -200,7 +200,7 @@ public GachaInfo clearGachaCeiling() { } /** - * optional .GachaCeiling gacha_ceiling = 1; + * optional .GachaCeiling gacha_ceiling = 9; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -214,7 +214,7 @@ public GachaCeilingOuterClass.GachaCeiling getGachaCeiling() { } /** - * optional .GachaCeiling gacha_ceiling = 1; + * optional .GachaCeiling gacha_ceiling = 9; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -228,7 +228,7 @@ public GachaCeilingOuterClass.GachaCeiling getMutableGachaCeiling() { } /** - * optional .GachaCeiling gacha_ceiling = 1; + * optional .GachaCeiling gacha_ceiling = 9; * @param value the gachaCeiling to set * @return this */ @@ -239,169 +239,169 @@ public GachaInfo setGachaCeiling(final GachaCeilingOuterClass.GachaCeiling value } /** - * optional string history_url = 13; - * @return whether the historyUrl field is set + * optional string detail_url = 2; + * @return whether the detailUrl field is set */ - public boolean hasHistoryUrl() { + public boolean hasDetailUrl() { return (bitField0_ & 0x00000010) != 0; } /** - * optional string history_url = 13; + * optional string detail_url = 2; * @return this */ - public GachaInfo clearHistoryUrl() { + public GachaInfo clearDetailUrl() { bitField0_ &= ~0x00000010; - historyUrl.clear(); + detailUrl.clear(); return this; } /** - * optional string history_url = 13; - * @return the historyUrl + * optional string detail_url = 2; + * @return the detailUrl */ - public String getHistoryUrl() { - return historyUrl.getString(); + public String getDetailUrl() { + return detailUrl.getString(); } /** - * optional string history_url = 13; - * @return internal {@code Utf8String} representation of historyUrl for reading + * optional string detail_url = 2; + * @return internal {@code Utf8String} representation of detailUrl for reading */ - public Utf8String getHistoryUrlBytes() { - return this.historyUrl; + public Utf8String getDetailUrlBytes() { + return this.detailUrl; } /** - * optional string history_url = 13; - * @return internal {@code Utf8String} representation of historyUrl for modifications + * optional string detail_url = 2; + * @return internal {@code Utf8String} representation of detailUrl for modifications */ - public Utf8String getMutableHistoryUrlBytes() { + public Utf8String getMutableDetailUrlBytes() { bitField0_ |= 0x00000010; - return this.historyUrl; + return this.detailUrl; } /** - * optional string history_url = 13; - * @param value the historyUrl to set + * optional string detail_url = 2; + * @param value the detailUrl to set * @return this */ - public GachaInfo setHistoryUrl(final CharSequence value) { + public GachaInfo setDetailUrl(final CharSequence value) { bitField0_ |= 0x00000010; - historyUrl.copyFrom(value); + detailUrl.copyFrom(value); return this; } /** - * optional string history_url = 13; - * @param value the historyUrl to set + * optional string detail_url = 2; + * @param value the detailUrl to set * @return this */ - public GachaInfo setHistoryUrl(final Utf8String value) { + public GachaInfo setDetailUrl(final Utf8String value) { bitField0_ |= 0x00000010; - historyUrl.copyFrom(value); + detailUrl.copyFrom(value); return this; } /** - * optional string detail_url = 14; - * @return whether the detailUrl field is set + * optional string history_url = 6; + * @return whether the historyUrl field is set */ - public boolean hasDetailUrl() { + public boolean hasHistoryUrl() { return (bitField0_ & 0x00000020) != 0; } /** - * optional string detail_url = 14; + * optional string history_url = 6; * @return this */ - public GachaInfo clearDetailUrl() { + public GachaInfo clearHistoryUrl() { bitField0_ &= ~0x00000020; - detailUrl.clear(); + historyUrl.clear(); return this; } /** - * optional string detail_url = 14; - * @return the detailUrl + * optional string history_url = 6; + * @return the historyUrl */ - public String getDetailUrl() { - return detailUrl.getString(); + public String getHistoryUrl() { + return historyUrl.getString(); } /** - * optional string detail_url = 14; - * @return internal {@code Utf8String} representation of detailUrl for reading + * optional string history_url = 6; + * @return internal {@code Utf8String} representation of historyUrl for reading */ - public Utf8String getDetailUrlBytes() { - return this.detailUrl; + public Utf8String getHistoryUrlBytes() { + return this.historyUrl; } /** - * optional string detail_url = 14; - * @return internal {@code Utf8String} representation of detailUrl for modifications + * optional string history_url = 6; + * @return internal {@code Utf8String} representation of historyUrl for modifications */ - public Utf8String getMutableDetailUrlBytes() { + public Utf8String getMutableHistoryUrlBytes() { bitField0_ |= 0x00000020; - return this.detailUrl; + return this.historyUrl; } /** - * optional string detail_url = 14; - * @param value the detailUrl to set + * optional string history_url = 6; + * @param value the historyUrl to set * @return this */ - public GachaInfo setDetailUrl(final CharSequence value) { + public GachaInfo setHistoryUrl(final CharSequence value) { bitField0_ |= 0x00000020; - detailUrl.copyFrom(value); + historyUrl.copyFrom(value); return this; } /** - * optional string detail_url = 14; - * @param value the detailUrl to set + * optional string history_url = 6; + * @param value the historyUrl to set * @return this */ - public GachaInfo setDetailUrl(final Utf8String value) { + public GachaInfo setHistoryUrl(final Utf8String value) { bitField0_ |= 0x00000020; - detailUrl.copyFrom(value); + historyUrl.copyFrom(value); return this; } /** - * repeated uint32 up_info = 6; - * @return whether the upInfo field is set + * repeated uint32 featured = 1; + * @return whether the featured field is set */ - public boolean hasUpInfo() { + public boolean hasFeatured() { return (bitField0_ & 0x00000040) != 0; } /** - * repeated uint32 up_info = 6; + * repeated uint32 featured = 1; * @return this */ - public GachaInfo clearUpInfo() { + public GachaInfo clearFeatured() { bitField0_ &= ~0x00000040; - upInfo.clear(); + featured.clear(); return this; } /** - * repeated uint32 up_info = 6; + * repeated uint32 featured = 1; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. * - * Use {@link #getMutableUpInfo()} if you want to modify it. + * Use {@link #getMutableFeatured()} if you want to modify it. * * @return internal storage object for reading */ - public RepeatedInt getUpInfo() { - return upInfo; + public RepeatedInt getFeatured() { + return featured; } /** - * repeated uint32 up_info = 6; + * repeated uint32 featured = 1; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -409,67 +409,67 @@ public RepeatedInt getUpInfo() { * * @return internal storage object for modifications */ - public RepeatedInt getMutableUpInfo() { + public RepeatedInt getMutableFeatured() { bitField0_ |= 0x00000040; - return upInfo; + return featured; } /** - * repeated uint32 up_info = 6; - * @param value the upInfo to add + * repeated uint32 featured = 1; + * @param value the featured to add * @return this */ - public GachaInfo addUpInfo(final int value) { + public GachaInfo addFeatured(final int value) { bitField0_ |= 0x00000040; - upInfo.add(value); + featured.add(value); return this; } /** - * repeated uint32 up_info = 6; - * @param values the upInfo to add + * repeated uint32 featured = 1; + * @param values the featured to add * @return this */ - public GachaInfo addAllUpInfo(final int... values) { + public GachaInfo addAllFeatured(final int... values) { bitField0_ |= 0x00000040; - upInfo.addAll(values); + featured.addAll(values); return this; } /** - * repeated uint32 featured = 9; - * @return whether the featured field is set + * repeated uint32 up_info = 5; + * @return whether the upInfo field is set */ - public boolean hasFeatured() { + public boolean hasUpInfo() { return (bitField0_ & 0x00000080) != 0; } /** - * repeated uint32 featured = 9; + * repeated uint32 up_info = 5; * @return this */ - public GachaInfo clearFeatured() { + public GachaInfo clearUpInfo() { bitField0_ &= ~0x00000080; - featured.clear(); + upInfo.clear(); return this; } /** - * repeated uint32 featured = 9; + * repeated uint32 up_info = 5; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. * - * Use {@link #getMutableFeatured()} if you want to modify it. + * Use {@link #getMutableUpInfo()} if you want to modify it. * * @return internal storage object for reading */ - public RepeatedInt getFeatured() { - return featured; + public RepeatedInt getUpInfo() { + return upInfo; } /** - * repeated uint32 featured = 9; + * repeated uint32 up_info = 5; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -477,30 +477,30 @@ public RepeatedInt getFeatured() { * * @return internal storage object for modifications */ - public RepeatedInt getMutableFeatured() { + public RepeatedInt getMutableUpInfo() { bitField0_ |= 0x00000080; - return featured; + return upInfo; } /** - * repeated uint32 featured = 9; - * @param value the featured to add + * repeated uint32 up_info = 5; + * @param value the upInfo to add * @return this */ - public GachaInfo addFeatured(final int value) { + public GachaInfo addUpInfo(final int value) { bitField0_ |= 0x00000080; - featured.add(value); + upInfo.add(value); return this; } /** - * repeated uint32 featured = 9; - * @param values the featured to add + * repeated uint32 up_info = 5; + * @param values the upInfo to add * @return this */ - public GachaInfo addAllFeatured(final int... values) { + public GachaInfo addAllUpInfo(final int... values) { bitField0_ |= 0x00000080; - featured.addAll(values); + upInfo.addAll(values); return this; } @@ -513,10 +513,10 @@ public GachaInfo copyFrom(final GachaInfo other) { endTime = other.endTime; gachaId = other.gachaId; gachaCeiling.copyFrom(other.gachaCeiling); - historyUrl.copyFrom(other.historyUrl); detailUrl.copyFrom(other.detailUrl); - upInfo.copyFrom(other.upInfo); + historyUrl.copyFrom(other.historyUrl); featured.copyFrom(other.featured); + upInfo.copyFrom(other.upInfo); } return this; } @@ -539,18 +539,18 @@ public GachaInfo mergeFrom(final GachaInfo other) { if (other.hasGachaCeiling()) { getMutableGachaCeiling().mergeFrom(other.gachaCeiling); } - if (other.hasHistoryUrl()) { - getMutableHistoryUrlBytes().copyFrom(other.historyUrl); - } if (other.hasDetailUrl()) { getMutableDetailUrlBytes().copyFrom(other.detailUrl); } - if (other.hasUpInfo()) { - getMutableUpInfo().addAll(other.upInfo); + if (other.hasHistoryUrl()) { + getMutableHistoryUrlBytes().copyFrom(other.historyUrl); } if (other.hasFeatured()) { getMutableFeatured().addAll(other.featured); } + if (other.hasUpInfo()) { + getMutableUpInfo().addAll(other.upInfo); + } return this; } @@ -565,10 +565,10 @@ public GachaInfo clear() { endTime = 0L; gachaId = 0; gachaCeiling.clear(); - historyUrl.clear(); detailUrl.clear(); - upInfo.clear(); + historyUrl.clear(); featured.clear(); + upInfo.clear(); return this; } @@ -580,10 +580,10 @@ public GachaInfo clearQuick() { cachedSize = -1; bitField0_ = 0; gachaCeiling.clearQuick(); - historyUrl.clear(); detailUrl.clear(); - upInfo.clear(); + historyUrl.clear(); featured.clear(); + upInfo.clear(); return this; } @@ -601,48 +601,48 @@ public boolean equals(Object o) { && (!hasEndTime() || endTime == other.endTime) && (!hasGachaId() || gachaId == other.gachaId) && (!hasGachaCeiling() || gachaCeiling.equals(other.gachaCeiling)) - && (!hasHistoryUrl() || historyUrl.equals(other.historyUrl)) && (!hasDetailUrl() || detailUrl.equals(other.detailUrl)) - && (!hasUpInfo() || upInfo.equals(other.upInfo)) - && (!hasFeatured() || featured.equals(other.featured)); + && (!hasHistoryUrl() || historyUrl.equals(other.historyUrl)) + && (!hasFeatured() || featured.equals(other.featured)) + && (!hasUpInfo() || upInfo.equals(other.upInfo)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 80); output.writeInt64NoTag(beginTime); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 96); output.writeInt64NoTag(endTime); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(gachaId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 10); + output.writeRawByte((byte) 74); output.writeMessageNoTag(gachaCeiling); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 106); - output.writeStringNoTag(historyUrl); + output.writeRawByte((byte) 18); + output.writeStringNoTag(detailUrl); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 114); - output.writeStringNoTag(detailUrl); + output.writeRawByte((byte) 50); + output.writeStringNoTag(historyUrl); } if ((bitField0_ & 0x00000040) != 0) { - for (int i = 0; i < upInfo.length(); i++) { - output.writeRawByte((byte) 48); - output.writeUInt32NoTag(upInfo.array()[i]); + for (int i = 0; i < featured.length(); i++) { + output.writeRawByte((byte) 8); + output.writeUInt32NoTag(featured.array()[i]); } } if ((bitField0_ & 0x00000080) != 0) { - for (int i = 0; i < featured.length(); i++) { - output.writeRawByte((byte) 72); - output.writeUInt32NoTag(featured.array()[i]); + for (int i = 0; i < upInfo.length(); i++) { + output.writeRawByte((byte) 40); + output.writeUInt32NoTag(upInfo.array()[i]); } } } @@ -663,16 +663,16 @@ protected int computeSerializedSize() { size += 1 + ProtoSink.computeMessageSizeNoTag(gachaCeiling); } if ((bitField0_ & 0x00000010) != 0) { - size += 1 + ProtoSink.computeStringSizeNoTag(historyUrl); + size += 1 + ProtoSink.computeStringSizeNoTag(detailUrl); } if ((bitField0_ & 0x00000020) != 0) { - size += 1 + ProtoSink.computeStringSizeNoTag(detailUrl); + size += 1 + ProtoSink.computeStringSizeNoTag(historyUrl); } if ((bitField0_ & 0x00000040) != 0) { - size += (1 * upInfo.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(upInfo); + size += (1 * featured.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(featured); } if ((bitField0_ & 0x00000080) != 0) { - size += (1 * featured.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(featured); + size += (1 * upInfo.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(upInfo); } return size; } @@ -684,72 +684,72 @@ public GachaInfo mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { + case 80: { // beginTime beginTime = input.readInt64(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 120) { + if (tag != 96) { break; } } - case 120: { + case 96: { // endTime endTime = input.readInt64(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 24) { + if (tag != 104) { break; } } - case 24: { + case 104: { // gachaId gachaId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 10) { + if (tag != 74) { break; } } - case 10: { + case 74: { // gachaCeiling input.readMessage(gachaCeiling); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 106) { + if (tag != 18) { break; } } - case 106: { - // historyUrl - input.readString(historyUrl); + case 18: { + // detailUrl + input.readString(detailUrl); bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 114) { + if (tag != 50) { break; } } - case 114: { - // detailUrl - input.readString(detailUrl); + case 50: { + // historyUrl + input.readString(historyUrl); bitField0_ |= 0x00000020; tag = input.readTag(); - if (tag != 50) { + if (tag != 10) { break; } } - case 50: { - // upInfo [packed=true] - input.readPackedUInt32(upInfo, tag); + case 10: { + // featured [packed=true] + input.readPackedUInt32(featured, tag); bitField0_ |= 0x00000040; tag = input.readTag(); - if (tag != 74) { + if (tag != 42) { break; } } - case 74: { - // featured [packed=true] - input.readPackedUInt32(featured, tag); + case 42: { + // upInfo [packed=true] + input.readPackedUInt32(upInfo, tag); bitField0_ |= 0x00000080; tag = input.readTag(); if (tag != 0) { @@ -766,15 +766,15 @@ public GachaInfo mergeFrom(final ProtoSource input) throws IOException { tag = input.readTag(); break; } - case 48: { - // upInfo [packed=false] - tag = input.readRepeatedUInt32(upInfo, tag); + case 8: { + // featured [packed=false] + tag = input.readRepeatedUInt32(featured, tag); bitField0_ |= 0x00000040; break; } - case 72: { - // featured [packed=false] - tag = input.readRepeatedUInt32(featured, tag); + case 40: { + // upInfo [packed=false] + tag = input.readRepeatedUInt32(upInfo, tag); bitField0_ |= 0x00000080; break; } @@ -798,16 +798,16 @@ public void writeTo(final JsonSink output) throws IOException { output.writeMessage(FieldNames.gachaCeiling, gachaCeiling); } if ((bitField0_ & 0x00000010) != 0) { - output.writeString(FieldNames.historyUrl, historyUrl); + output.writeString(FieldNames.detailUrl, detailUrl); } if ((bitField0_ & 0x00000020) != 0) { - output.writeString(FieldNames.detailUrl, detailUrl); + output.writeString(FieldNames.historyUrl, historyUrl); } if ((bitField0_ & 0x00000040) != 0) { - output.writeRepeatedUInt32(FieldNames.upInfo, upInfo); + output.writeRepeatedUInt32(FieldNames.featured, featured); } if ((bitField0_ & 0x00000080) != 0) { - output.writeRepeatedUInt32(FieldNames.featured, featured); + output.writeRepeatedUInt32(FieldNames.upInfo, upInfo); } output.endObject(); } @@ -867,11 +867,11 @@ public GachaInfo mergeFrom(final JsonSource input) throws IOException { } break; } - case 1951019067: - case 352350020: { - if (input.isAtField(FieldNames.historyUrl)) { + case -1973090466: + case -1035961215: { + if (input.isAtField(FieldNames.detailUrl)) { if (!input.trySkipNullValue()) { - input.readString(historyUrl); + input.readString(detailUrl); bitField0_ |= 0x00000010; } } else { @@ -879,11 +879,11 @@ public GachaInfo mergeFrom(final JsonSource input) throws IOException { } break; } - case -1973090466: - case -1035961215: { - if (input.isAtField(FieldNames.detailUrl)) { + case 1951019067: + case 352350020: { + if (input.isAtField(FieldNames.historyUrl)) { if (!input.trySkipNullValue()) { - input.readString(detailUrl); + input.readString(historyUrl); bitField0_ |= 0x00000020; } } else { @@ -891,11 +891,10 @@ public GachaInfo mergeFrom(final JsonSource input) throws IOException { } break; } - case -839638551: - case -238815278: { - if (input.isAtField(FieldNames.upInfo)) { + case -290659282: { + if (input.isAtField(FieldNames.featured)) { if (!input.trySkipNullValue()) { - input.readRepeatedUInt32(upInfo); + input.readRepeatedUInt32(featured); bitField0_ |= 0x00000040; } } else { @@ -903,10 +902,11 @@ public GachaInfo mergeFrom(final JsonSource input) throws IOException { } break; } - case -290659282: { - if (input.isAtField(FieldNames.featured)) { + case -839638551: + case -238815278: { + if (input.isAtField(FieldNames.upInfo)) { if (!input.trySkipNullValue()) { - input.readRepeatedUInt32(featured); + input.readRepeatedUInt32(upInfo); bitField0_ |= 0x00000080; } } else { @@ -974,13 +974,13 @@ static class FieldNames { static final FieldName gachaCeiling = FieldName.forField("gachaCeiling", "gacha_ceiling"); - static final FieldName historyUrl = FieldName.forField("historyUrl", "history_url"); - static final FieldName detailUrl = FieldName.forField("detailUrl", "detail_url"); - static final FieldName upInfo = FieldName.forField("upInfo", "up_info"); + static final FieldName historyUrl = FieldName.forField("historyUrl", "history_url"); static final FieldName featured = FieldName.forField("featured"); + + static final FieldName upInfo = FieldName.forField("upInfo", "up_info"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/GachaItemOuterClass.java b/src/generated/main/emu/lunarcore/proto/GachaItemOuterClass.java index a26346351..011bdbd66 100644 --- a/src/generated/main/emu/lunarcore/proto/GachaItemOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GachaItemOuterClass.java @@ -19,22 +19,22 @@ public static final class GachaItem extends ProtoMessage implements C private static final long serialVersionUID = 0L; /** - * optional bool is_new = 8; + * optional bool is_new = 4; */ private boolean isNew; /** - * optional .Item gacha_item = 1; + * optional .ItemList token_item = 6; */ - private final ItemOuterClass.Item gachaItem = ItemOuterClass.Item.newInstance(); + private final ItemListOuterClass.ItemList tokenItem = ItemListOuterClass.ItemList.newInstance(); /** - * optional .ItemList token_item = 9; + * optional .Item gacha_item = 7; */ - private final ItemListOuterClass.ItemList tokenItem = ItemListOuterClass.ItemList.newInstance(); + private final ItemOuterClass.Item gachaItem = ItemOuterClass.Item.newInstance(); /** - * optional .ItemList transfer_item_list = 12; + * optional .ItemList transfer_item_list = 10; */ private final ItemListOuterClass.ItemList transferItemList = ItemListOuterClass.ItemList.newInstance(); @@ -49,7 +49,7 @@ public static GachaItem newInstance() { } /** - * optional bool is_new = 8; + * optional bool is_new = 4; * @return whether the isNew field is set */ public boolean hasIsNew() { @@ -57,7 +57,7 @@ public boolean hasIsNew() { } /** - * optional bool is_new = 8; + * optional bool is_new = 4; * @return this */ public GachaItem clearIsNew() { @@ -67,7 +67,7 @@ public GachaItem clearIsNew() { } /** - * optional bool is_new = 8; + * optional bool is_new = 4; * @return the isNew */ public boolean getIsNew() { @@ -75,7 +75,7 @@ public boolean getIsNew() { } /** - * optional bool is_new = 8; + * optional bool is_new = 4; * @param value the isNew to set * @return this */ @@ -86,39 +86,39 @@ public GachaItem setIsNew(final boolean value) { } /** - * optional .Item gacha_item = 1; - * @return whether the gachaItem field is set + * optional .ItemList token_item = 6; + * @return whether the tokenItem field is set */ - public boolean hasGachaItem() { + public boolean hasTokenItem() { return (bitField0_ & 0x00000002) != 0; } /** - * optional .Item gacha_item = 1; + * optional .ItemList token_item = 6; * @return this */ - public GachaItem clearGachaItem() { + public GachaItem clearTokenItem() { bitField0_ &= ~0x00000002; - gachaItem.clear(); + tokenItem.clear(); return this; } /** - * optional .Item gacha_item = 1; + * optional .ItemList token_item = 6; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. * - * Use {@link #getMutableGachaItem()} if you want to modify it. + * Use {@link #getMutableTokenItem()} if you want to modify it. * * @return internal storage object for reading */ - public ItemOuterClass.Item getGachaItem() { - return gachaItem; + public ItemListOuterClass.ItemList getTokenItem() { + return tokenItem; } /** - * optional .Item gacha_item = 1; + * optional .ItemList token_item = 6; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -126,56 +126,56 @@ public ItemOuterClass.Item getGachaItem() { * * @return internal storage object for modifications */ - public ItemOuterClass.Item getMutableGachaItem() { + public ItemListOuterClass.ItemList getMutableTokenItem() { bitField0_ |= 0x00000002; - return gachaItem; + return tokenItem; } /** - * optional .Item gacha_item = 1; - * @param value the gachaItem to set + * optional .ItemList token_item = 6; + * @param value the tokenItem to set * @return this */ - public GachaItem setGachaItem(final ItemOuterClass.Item value) { + public GachaItem setTokenItem(final ItemListOuterClass.ItemList value) { bitField0_ |= 0x00000002; - gachaItem.copyFrom(value); + tokenItem.copyFrom(value); return this; } /** - * optional .ItemList token_item = 9; - * @return whether the tokenItem field is set + * optional .Item gacha_item = 7; + * @return whether the gachaItem field is set */ - public boolean hasTokenItem() { + public boolean hasGachaItem() { return (bitField0_ & 0x00000004) != 0; } /** - * optional .ItemList token_item = 9; + * optional .Item gacha_item = 7; * @return this */ - public GachaItem clearTokenItem() { + public GachaItem clearGachaItem() { bitField0_ &= ~0x00000004; - tokenItem.clear(); + gachaItem.clear(); return this; } /** - * optional .ItemList token_item = 9; + * optional .Item gacha_item = 7; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. * - * Use {@link #getMutableTokenItem()} if you want to modify it. + * Use {@link #getMutableGachaItem()} if you want to modify it. * * @return internal storage object for reading */ - public ItemListOuterClass.ItemList getTokenItem() { - return tokenItem; + public ItemOuterClass.Item getGachaItem() { + return gachaItem; } /** - * optional .ItemList token_item = 9; + * optional .Item gacha_item = 7; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -183,24 +183,24 @@ public ItemListOuterClass.ItemList getTokenItem() { * * @return internal storage object for modifications */ - public ItemListOuterClass.ItemList getMutableTokenItem() { + public ItemOuterClass.Item getMutableGachaItem() { bitField0_ |= 0x00000004; - return tokenItem; + return gachaItem; } /** - * optional .ItemList token_item = 9; - * @param value the tokenItem to set + * optional .Item gacha_item = 7; + * @param value the gachaItem to set * @return this */ - public GachaItem setTokenItem(final ItemListOuterClass.ItemList value) { + public GachaItem setGachaItem(final ItemOuterClass.Item value) { bitField0_ |= 0x00000004; - tokenItem.copyFrom(value); + gachaItem.copyFrom(value); return this; } /** - * optional .ItemList transfer_item_list = 12; + * optional .ItemList transfer_item_list = 10; * @return whether the transferItemList field is set */ public boolean hasTransferItemList() { @@ -208,7 +208,7 @@ public boolean hasTransferItemList() { } /** - * optional .ItemList transfer_item_list = 12; + * optional .ItemList transfer_item_list = 10; * @return this */ public GachaItem clearTransferItemList() { @@ -218,7 +218,7 @@ public GachaItem clearTransferItemList() { } /** - * optional .ItemList transfer_item_list = 12; + * optional .ItemList transfer_item_list = 10; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -232,7 +232,7 @@ public ItemListOuterClass.ItemList getTransferItemList() { } /** - * optional .ItemList transfer_item_list = 12; + * optional .ItemList transfer_item_list = 10; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -246,7 +246,7 @@ public ItemListOuterClass.ItemList getMutableTransferItemList() { } /** - * optional .ItemList transfer_item_list = 12; + * optional .ItemList transfer_item_list = 10; * @param value the transferItemList to set * @return this */ @@ -262,8 +262,8 @@ public GachaItem copyFrom(final GachaItem other) { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; isNew = other.isNew; - gachaItem.copyFrom(other.gachaItem); tokenItem.copyFrom(other.tokenItem); + gachaItem.copyFrom(other.gachaItem); transferItemList.copyFrom(other.transferItemList); } return this; @@ -278,12 +278,12 @@ public GachaItem mergeFrom(final GachaItem other) { if (other.hasIsNew()) { setIsNew(other.isNew); } - if (other.hasGachaItem()) { - getMutableGachaItem().mergeFrom(other.gachaItem); - } if (other.hasTokenItem()) { getMutableTokenItem().mergeFrom(other.tokenItem); } + if (other.hasGachaItem()) { + getMutableGachaItem().mergeFrom(other.gachaItem); + } if (other.hasTransferItemList()) { getMutableTransferItemList().mergeFrom(other.transferItemList); } @@ -298,8 +298,8 @@ public GachaItem clear() { cachedSize = -1; bitField0_ = 0; isNew = false; - gachaItem.clear(); tokenItem.clear(); + gachaItem.clear(); transferItemList.clear(); return this; } @@ -311,8 +311,8 @@ public GachaItem clearQuick() { } cachedSize = -1; bitField0_ = 0; - gachaItem.clearQuick(); tokenItem.clearQuick(); + gachaItem.clearQuick(); transferItemList.clearQuick(); return this; } @@ -328,27 +328,27 @@ public boolean equals(Object o) { GachaItem other = (GachaItem) o; return bitField0_ == other.bitField0_ && (!hasIsNew() || isNew == other.isNew) - && (!hasGachaItem() || gachaItem.equals(other.gachaItem)) && (!hasTokenItem() || tokenItem.equals(other.tokenItem)) + && (!hasGachaItem() || gachaItem.equals(other.gachaItem)) && (!hasTransferItemList() || transferItemList.equals(other.transferItemList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 32); output.writeBoolNoTag(isNew); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 10); - output.writeMessageNoTag(gachaItem); + output.writeRawByte((byte) 50); + output.writeMessageNoTag(tokenItem); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 74); - output.writeMessageNoTag(tokenItem); + output.writeRawByte((byte) 58); + output.writeMessageNoTag(gachaItem); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 98); + output.writeRawByte((byte) 82); output.writeMessageNoTag(transferItemList); } } @@ -360,10 +360,10 @@ protected int computeSerializedSize() { size += 2; } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(gachaItem); + size += 1 + ProtoSink.computeMessageSizeNoTag(tokenItem); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(tokenItem); + size += 1 + ProtoSink.computeMessageSizeNoTag(gachaItem); } if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(transferItemList); @@ -378,34 +378,34 @@ public GachaItem mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { + case 32: { // isNew isNew = input.readBool(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 10) { + if (tag != 50) { break; } } - case 10: { - // gachaItem - input.readMessage(gachaItem); + case 50: { + // tokenItem + input.readMessage(tokenItem); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 74) { + if (tag != 58) { break; } } - case 74: { - // tokenItem - input.readMessage(tokenItem); + case 58: { + // gachaItem + input.readMessage(gachaItem); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 98) { + if (tag != 82) { break; } } - case 98: { + case 82: { // transferItemList input.readMessage(transferItemList); bitField0_ |= 0x00000008; @@ -435,10 +435,10 @@ public void writeTo(final JsonSink output) throws IOException { output.writeBool(FieldNames.isNew, isNew); } if ((bitField0_ & 0x00000002) != 0) { - output.writeMessage(FieldNames.gachaItem, gachaItem); + output.writeMessage(FieldNames.tokenItem, tokenItem); } if ((bitField0_ & 0x00000004) != 0) { - output.writeMessage(FieldNames.tokenItem, tokenItem); + output.writeMessage(FieldNames.gachaItem, gachaItem); } if ((bitField0_ & 0x00000008) != 0) { output.writeMessage(FieldNames.transferItemList, transferItemList); @@ -465,11 +465,11 @@ public GachaItem mergeFrom(final JsonSource input) throws IOException { } break; } - case 802515893: - case -871807056: { - if (input.isAtField(FieldNames.gachaItem)) { + case 141165740: + case 101174681: { + if (input.isAtField(FieldNames.tokenItem)) { if (!input.trySkipNullValue()) { - input.readMessage(gachaItem); + input.readMessage(tokenItem); bitField0_ |= 0x00000002; } } else { @@ -477,11 +477,11 @@ public GachaItem mergeFrom(final JsonSource input) throws IOException { } break; } - case 141165740: - case 101174681: { - if (input.isAtField(FieldNames.tokenItem)) { + case 802515893: + case -871807056: { + if (input.isAtField(FieldNames.gachaItem)) { if (!input.trySkipNullValue()) { - input.readMessage(tokenItem); + input.readMessage(gachaItem); bitField0_ |= 0x00000004; } } else { @@ -555,10 +555,10 @@ public GachaItem create() { static class FieldNames { static final FieldName isNew = FieldName.forField("isNew", "is_new"); - static final FieldName gachaItem = FieldName.forField("gachaItem", "gacha_item"); - static final FieldName tokenItem = FieldName.forField("tokenItem", "token_item"); + static final FieldName gachaItem = FieldName.forField("gachaItem", "gacha_item"); + static final FieldName transferItemList = FieldName.forField("transferItemList", "transfer_item_list"); } } diff --git a/src/generated/main/emu/lunarcore/proto/GateserverOuterClass.java b/src/generated/main/emu/lunarcore/proto/GateserverOuterClass.java index d3be56433..56aba700e 100644 --- a/src/generated/main/emu/lunarcore/proto/GateserverOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GateserverOuterClass.java @@ -20,82 +20,91 @@ public static final class Gateserver extends ProtoMessage implements private static final long serialVersionUID = 0L; /** - * optional uint32 port = 15; + * optional uint32 port = 7; */ private int port; /** - * optional bool unk1 = 5; + * optional bool unk1 = 4; */ private boolean unk1; /** - * optional bool unk2 = 9; + * optional bool unk2 = 8; */ private boolean unk2; /** - * optional bool unk3 = 170; + * optional bool unk3 = 66; */ private boolean unk3; /** - * optional bool unk4 = 1397; + * optional bool unk4 = 551; */ private boolean unk4; /** - * optional bool unk5 = 1649; + * 
+     * bool unk5 = 646;
+     *
+ * + * optional bool unk5 = 929; */ private boolean unk5; /** - * optional string msg = 1; + * optional bool unk6 = 979; */ - private final Utf8String msg = Utf8String.newEmptyInstance(); + private boolean unk6; /** - * optional string ip = 3; + * optional string asset_bundle_url = 1; */ - private final Utf8String ip = Utf8String.newEmptyInstance(); + private final Utf8String assetBundleUrl = Utf8String.newEmptyInstance(); /** - * optional string region_name = 4; + * optional string ex_resource_url = 9; */ - private final Utf8String regionName = Utf8String.newEmptyInstance(); + private final Utf8String exResourceUrl = Utf8String.newEmptyInstance(); /** - * optional string lua_url = 10; + * optional string lua_url = 11; */ private final Utf8String luaUrl = Utf8String.newEmptyInstance(); /** - * optional string ex_resource_url = 12; + * optional string ip = 12; */ - private final Utf8String exResourceUrl = Utf8String.newEmptyInstance(); + private final Utf8String ip = Utf8String.newEmptyInstance(); /** - * optional string asset_bundle_url = 14; + * optional string region_name = 13; */ - private final Utf8String assetBundleUrl = Utf8String.newEmptyInstance(); + private final Utf8String regionName = Utf8String.newEmptyInstance(); /** - * optional string ifix_version = 20; + * optional string ifix_url = 140; */ - private final Utf8String ifixVersion = Utf8String.newEmptyInstance(); + private final Utf8String ifixUrl = Utf8String.newEmptyInstance(); /** - * optional string ifix_url = 98; + * optional string client_secret_key = 591; */ - private final Utf8String ifixUrl = Utf8String.newEmptyInstance(); + private final Utf8String clientSecretKey = Utf8String.newEmptyInstance(); /** - * optional string client_secret_key = 239; + * optional string msg = 1076; */ - private final Utf8String clientSecretKey = Utf8String.newEmptyInstance(); + private final Utf8String msg = Utf8String.newEmptyInstance(); + + /** + * optional string ifix_version = 1444; + */ + private final Utf8String ifixVersion = Utf8String.newEmptyInstance(); /** - * optional string mdk_res_version = 1506; + * optional string mdk_res_version = 1456; */ private final Utf8String mdkResVersion = Utf8String.newEmptyInstance(); @@ -110,7 +119,7 @@ public static Gateserver newInstance() { } /** - * optional uint32 port = 15; + * optional uint32 port = 7; * @return whether the port field is set */ public boolean hasPort() { @@ -118,7 +127,7 @@ public boolean hasPort() { } /** - * optional uint32 port = 15; + * optional uint32 port = 7; * @return this */ public Gateserver clearPort() { @@ -128,7 +137,7 @@ public Gateserver clearPort() { } /** - * optional uint32 port = 15; + * optional uint32 port = 7; * @return the port */ public int getPort() { @@ -136,7 +145,7 @@ public int getPort() { } /** - * optional uint32 port = 15; + * optional uint32 port = 7; * @param value the port to set * @return this */ @@ -147,7 +156,7 @@ public Gateserver setPort(final int value) { } /** - * optional bool unk1 = 5; + * optional bool unk1 = 4; * @return whether the unk1 field is set */ public boolean hasUnk1() { @@ -155,7 +164,7 @@ public boolean hasUnk1() { } /** - * optional bool unk1 = 5; + * optional bool unk1 = 4; * @return this */ public Gateserver clearUnk1() { @@ -165,7 +174,7 @@ public Gateserver clearUnk1() { } /** - * optional bool unk1 = 5; + * optional bool unk1 = 4; * @return the unk1 */ public boolean getUnk1() { @@ -173,7 +182,7 @@ public boolean getUnk1() { } /** - * optional bool unk1 = 5; + * optional bool unk1 = 4; * @param value the unk1 to set * @return this */ @@ -184,7 +193,7 @@ public Gateserver setUnk1(final boolean value) { } /** - * optional bool unk2 = 9; + * optional bool unk2 = 8; * @return whether the unk2 field is set */ public boolean hasUnk2() { @@ -192,7 +201,7 @@ public boolean hasUnk2() { } /** - * optional bool unk2 = 9; + * optional bool unk2 = 8; * @return this */ public Gateserver clearUnk2() { @@ -202,7 +211,7 @@ public Gateserver clearUnk2() { } /** - * optional bool unk2 = 9; + * optional bool unk2 = 8; * @return the unk2 */ public boolean getUnk2() { @@ -210,7 +219,7 @@ public boolean getUnk2() { } /** - * optional bool unk2 = 9; + * optional bool unk2 = 8; * @param value the unk2 to set * @return this */ @@ -221,7 +230,7 @@ public Gateserver setUnk2(final boolean value) { } /** - * optional bool unk3 = 170; + * optional bool unk3 = 66; * @return whether the unk3 field is set */ public boolean hasUnk3() { @@ -229,7 +238,7 @@ public boolean hasUnk3() { } /** - * optional bool unk3 = 170; + * optional bool unk3 = 66; * @return this */ public Gateserver clearUnk3() { @@ -239,7 +248,7 @@ public Gateserver clearUnk3() { } /** - * optional bool unk3 = 170; + * optional bool unk3 = 66; * @return the unk3 */ public boolean getUnk3() { @@ -247,7 +256,7 @@ public boolean getUnk3() { } /** - * optional bool unk3 = 170; + * optional bool unk3 = 66; * @param value the unk3 to set * @return this */ @@ -258,7 +267,7 @@ public Gateserver setUnk3(final boolean value) { } /** - * optional bool unk4 = 1397; + * optional bool unk4 = 551; * @return whether the unk4 field is set */ public boolean hasUnk4() { @@ -266,7 +275,7 @@ public boolean hasUnk4() { } /** - * optional bool unk4 = 1397; + * optional bool unk4 = 551; * @return this */ public Gateserver clearUnk4() { @@ -276,7 +285,7 @@ public Gateserver clearUnk4() { } /** - * optional bool unk4 = 1397; + * optional bool unk4 = 551; * @return the unk4 */ public boolean getUnk4() { @@ -284,7 +293,7 @@ public boolean getUnk4() { } /** - * optional bool unk4 = 1397; + * optional bool unk4 = 551; * @param value the unk4 to set * @return this */ @@ -295,7 +304,11 @@ public Gateserver setUnk4(final boolean value) { } /** - * optional bool unk5 = 1649; + * 
+     * bool unk5 = 646;
+     *
+ * + * optional bool unk5 = 929; * @return whether the unk5 field is set */ public boolean hasUnk5() { @@ -303,7 +316,11 @@ public boolean hasUnk5() { } /** - * optional bool unk5 = 1649; + * 
+     * bool unk5 = 646;
+     *
+ * + * optional bool unk5 = 929; * @return this */ public Gateserver clearUnk5() { @@ -313,7 +330,11 @@ public Gateserver clearUnk5() { } /** - * optional bool unk5 = 1649; + * 
+     * bool unk5 = 646;
+     *
+ * + * optional bool unk5 = 929; * @return the unk5 */ public boolean getUnk5() { @@ -321,7 +342,11 @@ public boolean getUnk5() { } /** - * optional bool unk5 = 1649; + * 
+     * bool unk5 = 646;
+     *
+ * + * optional bool unk5 = 929; * @param value the unk5 to set * @return this */ @@ -332,202 +357,174 @@ public Gateserver setUnk5(final boolean value) { } /** - * optional string msg = 1; - * @return whether the msg field is set + * optional bool unk6 = 979; + * @return whether the unk6 field is set */ - public boolean hasMsg() { + public boolean hasUnk6() { return (bitField0_ & 0x00000040) != 0; } /** - * optional string msg = 1; + * optional bool unk6 = 979; * @return this */ - public Gateserver clearMsg() { + public Gateserver clearUnk6() { bitField0_ &= ~0x00000040; - msg.clear(); + unk6 = false; return this; } /** - * optional string msg = 1; - * @return the msg - */ - public String getMsg() { - return msg.getString(); - } - - /** - * optional string msg = 1; - * @return internal {@code Utf8String} representation of msg for reading - */ - public Utf8String getMsgBytes() { - return this.msg; - } - - /** - * optional string msg = 1; - * @return internal {@code Utf8String} representation of msg for modifications - */ - public Utf8String getMutableMsgBytes() { - bitField0_ |= 0x00000040; - return this.msg; - } - - /** - * optional string msg = 1; - * @param value the msg to set - * @return this + * optional bool unk6 = 979; + * @return the unk6 */ - public Gateserver setMsg(final CharSequence value) { - bitField0_ |= 0x00000040; - msg.copyFrom(value); - return this; + public boolean getUnk6() { + return unk6; } /** - * optional string msg = 1; - * @param value the msg to set + * optional bool unk6 = 979; + * @param value the unk6 to set * @return this */ - public Gateserver setMsg(final Utf8String value) { + public Gateserver setUnk6(final boolean value) { bitField0_ |= 0x00000040; - msg.copyFrom(value); + unk6 = value; return this; } /** - * optional string ip = 3; - * @return whether the ip field is set + * optional string asset_bundle_url = 1; + * @return whether the assetBundleUrl field is set */ - public boolean hasIp() { + public boolean hasAssetBundleUrl() { return (bitField0_ & 0x00000080) != 0; } /** - * optional string ip = 3; + * optional string asset_bundle_url = 1; * @return this */ - public Gateserver clearIp() { + public Gateserver clearAssetBundleUrl() { bitField0_ &= ~0x00000080; - ip.clear(); + assetBundleUrl.clear(); return this; } /** - * optional string ip = 3; - * @return the ip + * optional string asset_bundle_url = 1; + * @return the assetBundleUrl */ - public String getIp() { - return ip.getString(); + public String getAssetBundleUrl() { + return assetBundleUrl.getString(); } /** - * optional string ip = 3; - * @return internal {@code Utf8String} representation of ip for reading + * optional string asset_bundle_url = 1; + * @return internal {@code Utf8String} representation of assetBundleUrl for reading */ - public Utf8String getIpBytes() { - return this.ip; + public Utf8String getAssetBundleUrlBytes() { + return this.assetBundleUrl; } /** - * optional string ip = 3; - * @return internal {@code Utf8String} representation of ip for modifications + * optional string asset_bundle_url = 1; + * @return internal {@code Utf8String} representation of assetBundleUrl for modifications */ - public Utf8String getMutableIpBytes() { + public Utf8String getMutableAssetBundleUrlBytes() { bitField0_ |= 0x00000080; - return this.ip; + return this.assetBundleUrl; } /** - * optional string ip = 3; - * @param value the ip to set + * optional string asset_bundle_url = 1; + * @param value the assetBundleUrl to set * @return this */ - public Gateserver setIp(final CharSequence value) { + public Gateserver setAssetBundleUrl(final CharSequence value) { bitField0_ |= 0x00000080; - ip.copyFrom(value); + assetBundleUrl.copyFrom(value); return this; } /** - * optional string ip = 3; - * @param value the ip to set + * optional string asset_bundle_url = 1; + * @param value the assetBundleUrl to set * @return this */ - public Gateserver setIp(final Utf8String value) { + public Gateserver setAssetBundleUrl(final Utf8String value) { bitField0_ |= 0x00000080; - ip.copyFrom(value); + assetBundleUrl.copyFrom(value); return this; } /** - * optional string region_name = 4; - * @return whether the regionName field is set + * optional string ex_resource_url = 9; + * @return whether the exResourceUrl field is set */ - public boolean hasRegionName() { + public boolean hasExResourceUrl() { return (bitField0_ & 0x00000100) != 0; } /** - * optional string region_name = 4; + * optional string ex_resource_url = 9; * @return this */ - public Gateserver clearRegionName() { + public Gateserver clearExResourceUrl() { bitField0_ &= ~0x00000100; - regionName.clear(); + exResourceUrl.clear(); return this; } /** - * optional string region_name = 4; - * @return the regionName + * optional string ex_resource_url = 9; + * @return the exResourceUrl */ - public String getRegionName() { - return regionName.getString(); + public String getExResourceUrl() { + return exResourceUrl.getString(); } /** - * optional string region_name = 4; - * @return internal {@code Utf8String} representation of regionName for reading + * optional string ex_resource_url = 9; + * @return internal {@code Utf8String} representation of exResourceUrl for reading */ - public Utf8String getRegionNameBytes() { - return this.regionName; + public Utf8String getExResourceUrlBytes() { + return this.exResourceUrl; } /** - * optional string region_name = 4; - * @return internal {@code Utf8String} representation of regionName for modifications + * optional string ex_resource_url = 9; + * @return internal {@code Utf8String} representation of exResourceUrl for modifications */ - public Utf8String getMutableRegionNameBytes() { + public Utf8String getMutableExResourceUrlBytes() { bitField0_ |= 0x00000100; - return this.regionName; + return this.exResourceUrl; } /** - * optional string region_name = 4; - * @param value the regionName to set + * optional string ex_resource_url = 9; + * @param value the exResourceUrl to set * @return this */ - public Gateserver setRegionName(final CharSequence value) { + public Gateserver setExResourceUrl(final CharSequence value) { bitField0_ |= 0x00000100; - regionName.copyFrom(value); + exResourceUrl.copyFrom(value); return this; } /** - * optional string region_name = 4; - * @param value the regionName to set + * optional string ex_resource_url = 9; + * @param value the exResourceUrl to set * @return this */ - public Gateserver setRegionName(final Utf8String value) { + public Gateserver setExResourceUrl(final Utf8String value) { bitField0_ |= 0x00000100; - regionName.copyFrom(value); + exResourceUrl.copyFrom(value); return this; } /** - * optional string lua_url = 10; + * optional string lua_url = 11; * @return whether the luaUrl field is set */ public boolean hasLuaUrl() { @@ -535,7 +532,7 @@ public boolean hasLuaUrl() { } /** - * optional string lua_url = 10; + * optional string lua_url = 11; * @return this */ public Gateserver clearLuaUrl() { @@ -545,7 +542,7 @@ public Gateserver clearLuaUrl() { } /** - * optional string lua_url = 10; + * optional string lua_url = 11; * @return the luaUrl */ public String getLuaUrl() { @@ -553,7 +550,7 @@ public String getLuaUrl() { } /** - * optional string lua_url = 10; + * optional string lua_url = 11; * @return internal {@code Utf8String} representation of luaUrl for reading */ public Utf8String getLuaUrlBytes() { @@ -561,7 +558,7 @@ public Utf8String getLuaUrlBytes() { } /** - * optional string lua_url = 10; + * optional string lua_url = 11; * @return internal {@code Utf8String} representation of luaUrl for modifications */ public Utf8String getMutableLuaUrlBytes() { @@ -570,7 +567,7 @@ public Utf8String getMutableLuaUrlBytes() { } /** - * optional string lua_url = 10; + * optional string lua_url = 11; * @param value the luaUrl to set * @return this */ @@ -581,7 +578,7 @@ public Gateserver setLuaUrl(final CharSequence value) { } /** - * optional string lua_url = 10; + * optional string lua_url = 11; * @param value the luaUrl to set * @return this */ @@ -592,350 +589,415 @@ public Gateserver setLuaUrl(final Utf8String value) { } /** - * optional string ex_resource_url = 12; - * @return whether the exResourceUrl field is set + * optional string ip = 12; + * @return whether the ip field is set */ - public boolean hasExResourceUrl() { + public boolean hasIp() { return (bitField0_ & 0x00000400) != 0; } /** - * optional string ex_resource_url = 12; + * optional string ip = 12; * @return this */ - public Gateserver clearExResourceUrl() { + public Gateserver clearIp() { bitField0_ &= ~0x00000400; - exResourceUrl.clear(); + ip.clear(); return this; } /** - * optional string ex_resource_url = 12; - * @return the exResourceUrl + * optional string ip = 12; + * @return the ip */ - public String getExResourceUrl() { - return exResourceUrl.getString(); + public String getIp() { + return ip.getString(); } /** - * optional string ex_resource_url = 12; - * @return internal {@code Utf8String} representation of exResourceUrl for reading + * optional string ip = 12; + * @return internal {@code Utf8String} representation of ip for reading */ - public Utf8String getExResourceUrlBytes() { - return this.exResourceUrl; + public Utf8String getIpBytes() { + return this.ip; } /** - * optional string ex_resource_url = 12; - * @return internal {@code Utf8String} representation of exResourceUrl for modifications + * optional string ip = 12; + * @return internal {@code Utf8String} representation of ip for modifications */ - public Utf8String getMutableExResourceUrlBytes() { + public Utf8String getMutableIpBytes() { bitField0_ |= 0x00000400; - return this.exResourceUrl; + return this.ip; } /** - * optional string ex_resource_url = 12; - * @param value the exResourceUrl to set + * optional string ip = 12; + * @param value the ip to set * @return this */ - public Gateserver setExResourceUrl(final CharSequence value) { + public Gateserver setIp(final CharSequence value) { bitField0_ |= 0x00000400; - exResourceUrl.copyFrom(value); + ip.copyFrom(value); return this; } /** - * optional string ex_resource_url = 12; - * @param value the exResourceUrl to set + * optional string ip = 12; + * @param value the ip to set * @return this */ - public Gateserver setExResourceUrl(final Utf8String value) { + public Gateserver setIp(final Utf8String value) { bitField0_ |= 0x00000400; - exResourceUrl.copyFrom(value); + ip.copyFrom(value); return this; } /** - * optional string asset_bundle_url = 14; - * @return whether the assetBundleUrl field is set + * optional string region_name = 13; + * @return whether the regionName field is set */ - public boolean hasAssetBundleUrl() { + public boolean hasRegionName() { return (bitField0_ & 0x00000800) != 0; } /** - * optional string asset_bundle_url = 14; + * optional string region_name = 13; * @return this */ - public Gateserver clearAssetBundleUrl() { + public Gateserver clearRegionName() { bitField0_ &= ~0x00000800; - assetBundleUrl.clear(); + regionName.clear(); return this; } /** - * optional string asset_bundle_url = 14; - * @return the assetBundleUrl + * optional string region_name = 13; + * @return the regionName */ - public String getAssetBundleUrl() { - return assetBundleUrl.getString(); + public String getRegionName() { + return regionName.getString(); } /** - * optional string asset_bundle_url = 14; - * @return internal {@code Utf8String} representation of assetBundleUrl for reading + * optional string region_name = 13; + * @return internal {@code Utf8String} representation of regionName for reading */ - public Utf8String getAssetBundleUrlBytes() { - return this.assetBundleUrl; + public Utf8String getRegionNameBytes() { + return this.regionName; } /** - * optional string asset_bundle_url = 14; - * @return internal {@code Utf8String} representation of assetBundleUrl for modifications + * optional string region_name = 13; + * @return internal {@code Utf8String} representation of regionName for modifications */ - public Utf8String getMutableAssetBundleUrlBytes() { + public Utf8String getMutableRegionNameBytes() { bitField0_ |= 0x00000800; - return this.assetBundleUrl; + return this.regionName; } /** - * optional string asset_bundle_url = 14; - * @param value the assetBundleUrl to set + * optional string region_name = 13; + * @param value the regionName to set * @return this */ - public Gateserver setAssetBundleUrl(final CharSequence value) { + public Gateserver setRegionName(final CharSequence value) { bitField0_ |= 0x00000800; - assetBundleUrl.copyFrom(value); + regionName.copyFrom(value); return this; } /** - * optional string asset_bundle_url = 14; - * @param value the assetBundleUrl to set + * optional string region_name = 13; + * @param value the regionName to set * @return this */ - public Gateserver setAssetBundleUrl(final Utf8String value) { + public Gateserver setRegionName(final Utf8String value) { bitField0_ |= 0x00000800; - assetBundleUrl.copyFrom(value); + regionName.copyFrom(value); return this; } /** - * optional string ifix_version = 20; - * @return whether the ifixVersion field is set + * optional string ifix_url = 140; + * @return whether the ifixUrl field is set */ - public boolean hasIfixVersion() { + public boolean hasIfixUrl() { return (bitField0_ & 0x00001000) != 0; } /** - * optional string ifix_version = 20; + * optional string ifix_url = 140; * @return this */ - public Gateserver clearIfixVersion() { + public Gateserver clearIfixUrl() { bitField0_ &= ~0x00001000; - ifixVersion.clear(); + ifixUrl.clear(); return this; } /** - * optional string ifix_version = 20; - * @return the ifixVersion + * optional string ifix_url = 140; + * @return the ifixUrl */ - public String getIfixVersion() { - return ifixVersion.getString(); + public String getIfixUrl() { + return ifixUrl.getString(); } /** - * optional string ifix_version = 20; - * @return internal {@code Utf8String} representation of ifixVersion for reading + * optional string ifix_url = 140; + * @return internal {@code Utf8String} representation of ifixUrl for reading */ - public Utf8String getIfixVersionBytes() { - return this.ifixVersion; + public Utf8String getIfixUrlBytes() { + return this.ifixUrl; } /** - * optional string ifix_version = 20; - * @return internal {@code Utf8String} representation of ifixVersion for modifications + * optional string ifix_url = 140; + * @return internal {@code Utf8String} representation of ifixUrl for modifications */ - public Utf8String getMutableIfixVersionBytes() { + public Utf8String getMutableIfixUrlBytes() { bitField0_ |= 0x00001000; - return this.ifixVersion; + return this.ifixUrl; } /** - * optional string ifix_version = 20; - * @param value the ifixVersion to set + * optional string ifix_url = 140; + * @param value the ifixUrl to set * @return this */ - public Gateserver setIfixVersion(final CharSequence value) { + public Gateserver setIfixUrl(final CharSequence value) { bitField0_ |= 0x00001000; - ifixVersion.copyFrom(value); + ifixUrl.copyFrom(value); return this; } /** - * optional string ifix_version = 20; - * @param value the ifixVersion to set + * optional string ifix_url = 140; + * @param value the ifixUrl to set * @return this */ - public Gateserver setIfixVersion(final Utf8String value) { + public Gateserver setIfixUrl(final Utf8String value) { bitField0_ |= 0x00001000; - ifixVersion.copyFrom(value); + ifixUrl.copyFrom(value); return this; } /** - * optional string ifix_url = 98; - * @return whether the ifixUrl field is set + * optional string client_secret_key = 591; + * @return whether the clientSecretKey field is set */ - public boolean hasIfixUrl() { + public boolean hasClientSecretKey() { return (bitField0_ & 0x00002000) != 0; } /** - * optional string ifix_url = 98; + * optional string client_secret_key = 591; * @return this */ - public Gateserver clearIfixUrl() { + public Gateserver clearClientSecretKey() { bitField0_ &= ~0x00002000; - ifixUrl.clear(); + clientSecretKey.clear(); return this; } /** - * optional string ifix_url = 98; - * @return the ifixUrl + * optional string client_secret_key = 591; + * @return the clientSecretKey */ - public String getIfixUrl() { - return ifixUrl.getString(); + public String getClientSecretKey() { + return clientSecretKey.getString(); } /** - * optional string ifix_url = 98; - * @return internal {@code Utf8String} representation of ifixUrl for reading + * optional string client_secret_key = 591; + * @return internal {@code Utf8String} representation of clientSecretKey for reading */ - public Utf8String getIfixUrlBytes() { - return this.ifixUrl; + public Utf8String getClientSecretKeyBytes() { + return this.clientSecretKey; } /** - * optional string ifix_url = 98; - * @return internal {@code Utf8String} representation of ifixUrl for modifications + * optional string client_secret_key = 591; + * @return internal {@code Utf8String} representation of clientSecretKey for modifications */ - public Utf8String getMutableIfixUrlBytes() { + public Utf8String getMutableClientSecretKeyBytes() { bitField0_ |= 0x00002000; - return this.ifixUrl; + return this.clientSecretKey; } /** - * optional string ifix_url = 98; - * @param value the ifixUrl to set + * optional string client_secret_key = 591; + * @param value the clientSecretKey to set * @return this */ - public Gateserver setIfixUrl(final CharSequence value) { + public Gateserver setClientSecretKey(final CharSequence value) { bitField0_ |= 0x00002000; - ifixUrl.copyFrom(value); + clientSecretKey.copyFrom(value); return this; } /** - * optional string ifix_url = 98; - * @param value the ifixUrl to set + * optional string client_secret_key = 591; + * @param value the clientSecretKey to set * @return this */ - public Gateserver setIfixUrl(final Utf8String value) { + public Gateserver setClientSecretKey(final Utf8String value) { bitField0_ |= 0x00002000; - ifixUrl.copyFrom(value); + clientSecretKey.copyFrom(value); return this; } /** - * optional string client_secret_key = 239; - * @return whether the clientSecretKey field is set + * optional string msg = 1076; + * @return whether the msg field is set */ - public boolean hasClientSecretKey() { + public boolean hasMsg() { return (bitField0_ & 0x00004000) != 0; } /** - * optional string client_secret_key = 239; + * optional string msg = 1076; * @return this */ - public Gateserver clearClientSecretKey() { + public Gateserver clearMsg() { bitField0_ &= ~0x00004000; - clientSecretKey.clear(); + msg.clear(); return this; } /** - * optional string client_secret_key = 239; - * @return the clientSecretKey + * optional string msg = 1076; + * @return the msg */ - public String getClientSecretKey() { - return clientSecretKey.getString(); + public String getMsg() { + return msg.getString(); } /** - * optional string client_secret_key = 239; - * @return internal {@code Utf8String} representation of clientSecretKey for reading + * optional string msg = 1076; + * @return internal {@code Utf8String} representation of msg for reading */ - public Utf8String getClientSecretKeyBytes() { - return this.clientSecretKey; + public Utf8String getMsgBytes() { + return this.msg; } /** - * optional string client_secret_key = 239; - * @return internal {@code Utf8String} representation of clientSecretKey for modifications + * optional string msg = 1076; + * @return internal {@code Utf8String} representation of msg for modifications */ - public Utf8String getMutableClientSecretKeyBytes() { + public Utf8String getMutableMsgBytes() { bitField0_ |= 0x00004000; - return this.clientSecretKey; + return this.msg; } /** - * optional string client_secret_key = 239; - * @param value the clientSecretKey to set + * optional string msg = 1076; + * @param value the msg to set * @return this */ - public Gateserver setClientSecretKey(final CharSequence value) { + public Gateserver setMsg(final CharSequence value) { bitField0_ |= 0x00004000; - clientSecretKey.copyFrom(value); + msg.copyFrom(value); return this; } /** - * optional string client_secret_key = 239; - * @param value the clientSecretKey to set + * optional string msg = 1076; + * @param value the msg to set + * @return this + */ + public Gateserver setMsg(final Utf8String value) { + bitField0_ |= 0x00004000; + msg.copyFrom(value); + return this; + } + + /** + * optional string ifix_version = 1444; + * @return whether the ifixVersion field is set + */ + public boolean hasIfixVersion() { + return (bitField0_ & 0x00008000) != 0; + } + + /** + * optional string ifix_version = 1444; + * @return this + */ + public Gateserver clearIfixVersion() { + bitField0_ &= ~0x00008000; + ifixVersion.clear(); + return this; + } + + /** + * optional string ifix_version = 1444; + * @return the ifixVersion + */ + public String getIfixVersion() { + return ifixVersion.getString(); + } + + /** + * optional string ifix_version = 1444; + * @return internal {@code Utf8String} representation of ifixVersion for reading + */ + public Utf8String getIfixVersionBytes() { + return this.ifixVersion; + } + + /** + * optional string ifix_version = 1444; + * @return internal {@code Utf8String} representation of ifixVersion for modifications + */ + public Utf8String getMutableIfixVersionBytes() { + bitField0_ |= 0x00008000; + return this.ifixVersion; + } + + /** + * optional string ifix_version = 1444; + * @param value the ifixVersion to set + * @return this + */ + public Gateserver setIfixVersion(final CharSequence value) { + bitField0_ |= 0x00008000; + ifixVersion.copyFrom(value); + return this; + } + + /** + * optional string ifix_version = 1444; + * @param value the ifixVersion to set * @return this */ - public Gateserver setClientSecretKey(final Utf8String value) { - bitField0_ |= 0x00004000; - clientSecretKey.copyFrom(value); + public Gateserver setIfixVersion(final Utf8String value) { + bitField0_ |= 0x00008000; + ifixVersion.copyFrom(value); return this; } /** - * optional string mdk_res_version = 1506; + * optional string mdk_res_version = 1456; * @return whether the mdkResVersion field is set */ public boolean hasMdkResVersion() { - return (bitField0_ & 0x00008000) != 0; + return (bitField0_ & 0x00010000) != 0; } /** - * optional string mdk_res_version = 1506; + * optional string mdk_res_version = 1456; * @return this */ public Gateserver clearMdkResVersion() { - bitField0_ &= ~0x00008000; + bitField0_ &= ~0x00010000; mdkResVersion.clear(); return this; } /** - * optional string mdk_res_version = 1506; + * optional string mdk_res_version = 1456; * @return the mdkResVersion */ public String getMdkResVersion() { @@ -943,7 +1005,7 @@ public String getMdkResVersion() { } /** - * optional string mdk_res_version = 1506; + * optional string mdk_res_version = 1456; * @return internal {@code Utf8String} representation of mdkResVersion for reading */ public Utf8String getMdkResVersionBytes() { @@ -951,32 +1013,32 @@ public Utf8String getMdkResVersionBytes() { } /** - * optional string mdk_res_version = 1506; + * optional string mdk_res_version = 1456; * @return internal {@code Utf8String} representation of mdkResVersion for modifications */ public Utf8String getMutableMdkResVersionBytes() { - bitField0_ |= 0x00008000; + bitField0_ |= 0x00010000; return this.mdkResVersion; } /** - * optional string mdk_res_version = 1506; + * optional string mdk_res_version = 1456; * @param value the mdkResVersion to set * @return this */ public Gateserver setMdkResVersion(final CharSequence value) { - bitField0_ |= 0x00008000; + bitField0_ |= 0x00010000; mdkResVersion.copyFrom(value); return this; } /** - * optional string mdk_res_version = 1506; + * optional string mdk_res_version = 1456; * @param value the mdkResVersion to set * @return this */ public Gateserver setMdkResVersion(final Utf8String value) { - bitField0_ |= 0x00008000; + bitField0_ |= 0x00010000; mdkResVersion.copyFrom(value); return this; } @@ -992,15 +1054,16 @@ public Gateserver copyFrom(final Gateserver other) { unk3 = other.unk3; unk4 = other.unk4; unk5 = other.unk5; - msg.copyFrom(other.msg); + unk6 = other.unk6; + assetBundleUrl.copyFrom(other.assetBundleUrl); + exResourceUrl.copyFrom(other.exResourceUrl); + luaUrl.copyFrom(other.luaUrl); ip.copyFrom(other.ip); regionName.copyFrom(other.regionName); - luaUrl.copyFrom(other.luaUrl); - exResourceUrl.copyFrom(other.exResourceUrl); - assetBundleUrl.copyFrom(other.assetBundleUrl); - ifixVersion.copyFrom(other.ifixVersion); ifixUrl.copyFrom(other.ifixUrl); clientSecretKey.copyFrom(other.clientSecretKey); + msg.copyFrom(other.msg); + ifixVersion.copyFrom(other.ifixVersion); mdkResVersion.copyFrom(other.mdkResVersion); } return this; @@ -1030,26 +1093,23 @@ public Gateserver mergeFrom(final Gateserver other) { if (other.hasUnk5()) { setUnk5(other.unk5); } - if (other.hasMsg()) { - getMutableMsgBytes().copyFrom(other.msg); + if (other.hasUnk6()) { + setUnk6(other.unk6); } - if (other.hasIp()) { - getMutableIpBytes().copyFrom(other.ip); + if (other.hasAssetBundleUrl()) { + getMutableAssetBundleUrlBytes().copyFrom(other.assetBundleUrl); } - if (other.hasRegionName()) { - getMutableRegionNameBytes().copyFrom(other.regionName); + if (other.hasExResourceUrl()) { + getMutableExResourceUrlBytes().copyFrom(other.exResourceUrl); } if (other.hasLuaUrl()) { getMutableLuaUrlBytes().copyFrom(other.luaUrl); } - if (other.hasExResourceUrl()) { - getMutableExResourceUrlBytes().copyFrom(other.exResourceUrl); - } - if (other.hasAssetBundleUrl()) { - getMutableAssetBundleUrlBytes().copyFrom(other.assetBundleUrl); + if (other.hasIp()) { + getMutableIpBytes().copyFrom(other.ip); } - if (other.hasIfixVersion()) { - getMutableIfixVersionBytes().copyFrom(other.ifixVersion); + if (other.hasRegionName()) { + getMutableRegionNameBytes().copyFrom(other.regionName); } if (other.hasIfixUrl()) { getMutableIfixUrlBytes().copyFrom(other.ifixUrl); @@ -1057,6 +1117,12 @@ public Gateserver mergeFrom(final Gateserver other) { if (other.hasClientSecretKey()) { getMutableClientSecretKeyBytes().copyFrom(other.clientSecretKey); } + if (other.hasMsg()) { + getMutableMsgBytes().copyFrom(other.msg); + } + if (other.hasIfixVersion()) { + getMutableIfixVersionBytes().copyFrom(other.ifixVersion); + } if (other.hasMdkResVersion()) { getMutableMdkResVersionBytes().copyFrom(other.mdkResVersion); } @@ -1076,15 +1142,16 @@ public Gateserver clear() { unk3 = false; unk4 = false; unk5 = false; - msg.clear(); + unk6 = false; + assetBundleUrl.clear(); + exResourceUrl.clear(); + luaUrl.clear(); ip.clear(); regionName.clear(); - luaUrl.clear(); - exResourceUrl.clear(); - assetBundleUrl.clear(); - ifixVersion.clear(); ifixUrl.clear(); clientSecretKey.clear(); + msg.clear(); + ifixVersion.clear(); mdkResVersion.clear(); return this; } @@ -1096,15 +1163,15 @@ public Gateserver clearQuick() { } cachedSize = -1; bitField0_ = 0; - msg.clear(); + assetBundleUrl.clear(); + exResourceUrl.clear(); + luaUrl.clear(); ip.clear(); regionName.clear(); - luaUrl.clear(); - exResourceUrl.clear(); - assetBundleUrl.clear(); - ifixVersion.clear(); ifixUrl.clear(); clientSecretKey.clear(); + msg.clear(); + ifixVersion.clear(); mdkResVersion.clear(); return this; } @@ -1125,82 +1192,87 @@ public boolean equals(Object o) { && (!hasUnk3() || unk3 == other.unk3) && (!hasUnk4() || unk4 == other.unk4) && (!hasUnk5() || unk5 == other.unk5) - && (!hasMsg() || msg.equals(other.msg)) + && (!hasUnk6() || unk6 == other.unk6) + && (!hasAssetBundleUrl() || assetBundleUrl.equals(other.assetBundleUrl)) + && (!hasExResourceUrl() || exResourceUrl.equals(other.exResourceUrl)) + && (!hasLuaUrl() || luaUrl.equals(other.luaUrl)) && (!hasIp() || ip.equals(other.ip)) && (!hasRegionName() || regionName.equals(other.regionName)) - && (!hasLuaUrl() || luaUrl.equals(other.luaUrl)) - && (!hasExResourceUrl() || exResourceUrl.equals(other.exResourceUrl)) - && (!hasAssetBundleUrl() || assetBundleUrl.equals(other.assetBundleUrl)) - && (!hasIfixVersion() || ifixVersion.equals(other.ifixVersion)) && (!hasIfixUrl() || ifixUrl.equals(other.ifixUrl)) && (!hasClientSecretKey() || clientSecretKey.equals(other.clientSecretKey)) + && (!hasMsg() || msg.equals(other.msg)) + && (!hasIfixVersion() || ifixVersion.equals(other.ifixVersion)) && (!hasMdkResVersion() || mdkResVersion.equals(other.mdkResVersion)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(port); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 32); output.writeBoolNoTag(unk1); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 64); output.writeBoolNoTag(unk2); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawLittleEndian16((short) 2768); + output.writeRawLittleEndian16((short) 1168); output.writeBoolNoTag(unk3); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawLittleEndian16((short) 22440); + output.writeRawLittleEndian16((short) 8888); output.writeBoolNoTag(unk4); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawLittleEndian16((short) 26504); + output.writeRawLittleEndian16((short) 14984); output.writeBoolNoTag(unk5); } if ((bitField0_ & 0x00000040) != 0) { - output.writeRawByte((byte) 10); - output.writeStringNoTag(msg); + output.writeRawLittleEndian16((short) 15768); + output.writeBoolNoTag(unk6); } if ((bitField0_ & 0x00000080) != 0) { - output.writeRawByte((byte) 26); - output.writeStringNoTag(ip); + output.writeRawByte((byte) 10); + output.writeStringNoTag(assetBundleUrl); } if ((bitField0_ & 0x00000100) != 0) { - output.writeRawByte((byte) 34); - output.writeStringNoTag(regionName); + output.writeRawByte((byte) 74); + output.writeStringNoTag(exResourceUrl); } if ((bitField0_ & 0x00000200) != 0) { - output.writeRawByte((byte) 82); + output.writeRawByte((byte) 90); output.writeStringNoTag(luaUrl); } if ((bitField0_ & 0x00000400) != 0) { output.writeRawByte((byte) 98); - output.writeStringNoTag(exResourceUrl); + output.writeStringNoTag(ip); } if ((bitField0_ & 0x00000800) != 0) { - output.writeRawByte((byte) 114); - output.writeStringNoTag(assetBundleUrl); + output.writeRawByte((byte) 106); + output.writeStringNoTag(regionName); } if ((bitField0_ & 0x00001000) != 0) { - output.writeRawLittleEndian16((short) 418); - output.writeStringNoTag(ifixVersion); + output.writeRawLittleEndian16((short) 2274); + output.writeStringNoTag(ifixUrl); } if ((bitField0_ & 0x00002000) != 0) { - output.writeRawLittleEndian16((short) 1682); - output.writeStringNoTag(ifixUrl); + output.writeRawLittleEndian16((short) 9466); + output.writeStringNoTag(clientSecretKey); } if ((bitField0_ & 0x00004000) != 0) { - output.writeRawLittleEndian16((short) 3834); - output.writeStringNoTag(clientSecretKey); + output.writeRawLittleEndian16((short) 17314); + output.writeStringNoTag(msg); } if ((bitField0_ & 0x00008000) != 0) { - output.writeRawLittleEndian16((short) 24210); + output.writeRawLittleEndian16((short) 23202); + output.writeStringNoTag(ifixVersion); + } + if ((bitField0_ & 0x00010000) != 0) { + output.writeRawLittleEndian16((short) 23426); output.writeStringNoTag(mdkResVersion); } } @@ -1227,33 +1299,36 @@ protected int computeSerializedSize() { size += 3; } if ((bitField0_ & 0x00000040) != 0) { - size += 1 + ProtoSink.computeStringSizeNoTag(msg); + size += 3; } if ((bitField0_ & 0x00000080) != 0) { - size += 1 + ProtoSink.computeStringSizeNoTag(ip); + size += 1 + ProtoSink.computeStringSizeNoTag(assetBundleUrl); } if ((bitField0_ & 0x00000100) != 0) { - size += 1 + ProtoSink.computeStringSizeNoTag(regionName); + size += 1 + ProtoSink.computeStringSizeNoTag(exResourceUrl); } if ((bitField0_ & 0x00000200) != 0) { size += 1 + ProtoSink.computeStringSizeNoTag(luaUrl); } if ((bitField0_ & 0x00000400) != 0) { - size += 1 + ProtoSink.computeStringSizeNoTag(exResourceUrl); + size += 1 + ProtoSink.computeStringSizeNoTag(ip); } if ((bitField0_ & 0x00000800) != 0) { - size += 1 + ProtoSink.computeStringSizeNoTag(assetBundleUrl); + size += 1 + ProtoSink.computeStringSizeNoTag(regionName); } if ((bitField0_ & 0x00001000) != 0) { - size += 2 + ProtoSink.computeStringSizeNoTag(ifixVersion); + size += 2 + ProtoSink.computeStringSizeNoTag(ifixUrl); } if ((bitField0_ & 0x00002000) != 0) { - size += 2 + ProtoSink.computeStringSizeNoTag(ifixUrl); + size += 2 + ProtoSink.computeStringSizeNoTag(clientSecretKey); } if ((bitField0_ & 0x00004000) != 0) { - size += 2 + ProtoSink.computeStringSizeNoTag(clientSecretKey); + size += 2 + ProtoSink.computeStringSizeNoTag(msg); } if ((bitField0_ & 0x00008000) != 0) { + size += 2 + ProtoSink.computeStringSizeNoTag(ifixVersion); + } + if ((bitField0_ & 0x00010000) != 0) { size += 2 + ProtoSink.computeStringSizeNoTag(mdkResVersion); } return size; @@ -1266,88 +1341,88 @@ public Gateserver mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 120: { + case 56: { // port port = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 40) { + if (tag != 32) { break; } } - case 40: { + case 32: { // unk1 unk1 = input.readBool(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 72) { + if (tag != 64) { break; } } - case 72: { + case 64: { // unk2 unk2 = input.readBool(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 1360) { + if (tag != 528) { break; } } - case 1360: { + case 528: { // unk3 unk3 = input.readBool(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 11176) { + if (tag != 4408) { break; } } - case 11176: { + case 4408: { // unk4 unk4 = input.readBool(); bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 13192) { + if (tag != 7432) { break; } } - case 13192: { + case 7432: { // unk5 unk5 = input.readBool(); bitField0_ |= 0x00000020; tag = input.readTag(); - if (tag != 10) { + if (tag != 7832) { break; } } - case 10: { - // msg - input.readString(msg); + case 7832: { + // unk6 + unk6 = input.readBool(); bitField0_ |= 0x00000040; tag = input.readTag(); - if (tag != 26) { + if (tag != 10) { break; } } - case 26: { - // ip - input.readString(ip); + case 10: { + // assetBundleUrl + input.readString(assetBundleUrl); bitField0_ |= 0x00000080; tag = input.readTag(); - if (tag != 34) { + if (tag != 74) { break; } } - case 34: { - // regionName - input.readString(regionName); + case 74: { + // exResourceUrl + input.readString(exResourceUrl); bitField0_ |= 0x00000100; tag = input.readTag(); - if (tag != 82) { + if (tag != 90) { break; } } - case 82: { + case 90: { // luaUrl input.readString(luaUrl); bitField0_ |= 0x00000200; @@ -1357,54 +1432,63 @@ public Gateserver mergeFrom(final ProtoSource input) throws IOException { } } case 98: { - // exResourceUrl - input.readString(exResourceUrl); + // ip + input.readString(ip); bitField0_ |= 0x00000400; tag = input.readTag(); - if (tag != 114) { + if (tag != 106) { break; } } - case 114: { - // assetBundleUrl - input.readString(assetBundleUrl); + case 106: { + // regionName + input.readString(regionName); bitField0_ |= 0x00000800; tag = input.readTag(); - if (tag != 162) { + if (tag != 1122) { break; } } - case 162: { - // ifixVersion - input.readString(ifixVersion); + case 1122: { + // ifixUrl + input.readString(ifixUrl); bitField0_ |= 0x00001000; tag = input.readTag(); - if (tag != 786) { + if (tag != 4730) { break; } } - case 786: { - // ifixUrl - input.readString(ifixUrl); + case 4730: { + // clientSecretKey + input.readString(clientSecretKey); bitField0_ |= 0x00002000; tag = input.readTag(); - if (tag != 1914) { + if (tag != 8610) { break; } } - case 1914: { - // clientSecretKey - input.readString(clientSecretKey); + case 8610: { + // msg + input.readString(msg); bitField0_ |= 0x00004000; tag = input.readTag(); - if (tag != 12050) { + if (tag != 11554) { + break; + } + } + case 11554: { + // ifixVersion + input.readString(ifixVersion); + bitField0_ |= 0x00008000; + tag = input.readTag(); + if (tag != 11650) { break; } } - case 12050: { + case 11650: { // mdkResVersion input.readString(mdkResVersion); - bitField0_ |= 0x00008000; + bitField0_ |= 0x00010000; tag = input.readTag(); if (tag != 0) { break; @@ -1446,33 +1530,36 @@ public void writeTo(final JsonSink output) throws IOException { output.writeBool(FieldNames.unk5, unk5); } if ((bitField0_ & 0x00000040) != 0) { - output.writeString(FieldNames.msg, msg); + output.writeBool(FieldNames.unk6, unk6); } if ((bitField0_ & 0x00000080) != 0) { - output.writeString(FieldNames.ip, ip); + output.writeString(FieldNames.assetBundleUrl, assetBundleUrl); } if ((bitField0_ & 0x00000100) != 0) { - output.writeString(FieldNames.regionName, regionName); + output.writeString(FieldNames.exResourceUrl, exResourceUrl); } if ((bitField0_ & 0x00000200) != 0) { output.writeString(FieldNames.luaUrl, luaUrl); } if ((bitField0_ & 0x00000400) != 0) { - output.writeString(FieldNames.exResourceUrl, exResourceUrl); + output.writeString(FieldNames.ip, ip); } if ((bitField0_ & 0x00000800) != 0) { - output.writeString(FieldNames.assetBundleUrl, assetBundleUrl); + output.writeString(FieldNames.regionName, regionName); } if ((bitField0_ & 0x00001000) != 0) { - output.writeString(FieldNames.ifixVersion, ifixVersion); + output.writeString(FieldNames.ifixUrl, ifixUrl); } if ((bitField0_ & 0x00002000) != 0) { - output.writeString(FieldNames.ifixUrl, ifixUrl); + output.writeString(FieldNames.clientSecretKey, clientSecretKey); } if ((bitField0_ & 0x00004000) != 0) { - output.writeString(FieldNames.clientSecretKey, clientSecretKey); + output.writeString(FieldNames.msg, msg); } if ((bitField0_ & 0x00008000) != 0) { + output.writeString(FieldNames.ifixVersion, ifixVersion); + } + if ((bitField0_ & 0x00010000) != 0) { output.writeString(FieldNames.mdkResVersion, mdkResVersion); } output.endObject(); @@ -1551,10 +1638,10 @@ public Gateserver mergeFrom(final JsonSource input) throws IOException { } break; } - case 108417: { - if (input.isAtField(FieldNames.msg)) { + case 3594628: { + if (input.isAtField(FieldNames.unk6)) { if (!input.trySkipNullValue()) { - input.readString(msg); + unk6 = input.readBool(); bitField0_ |= 0x00000040; } } else { @@ -1562,10 +1649,11 @@ public Gateserver mergeFrom(final JsonSource input) throws IOException { } break; } - case 3367: { - if (input.isAtField(FieldNames.ip)) { + case -1116358531: + case 1973569761: { + if (input.isAtField(FieldNames.assetBundleUrl)) { if (!input.trySkipNullValue()) { - input.readString(ip); + input.readString(assetBundleUrl); bitField0_ |= 0x00000080; } } else { @@ -1573,11 +1661,11 @@ public Gateserver mergeFrom(final JsonSource input) throws IOException { } break; } - case -1990689889: - case -1565768458: { - if (input.isAtField(FieldNames.regionName)) { + case 1643520974: + case -1086137910: { + if (input.isAtField(FieldNames.exResourceUrl)) { if (!input.trySkipNullValue()) { - input.readString(regionName); + input.readString(exResourceUrl); bitField0_ |= 0x00000100; } } else { @@ -1597,11 +1685,10 @@ public Gateserver mergeFrom(final JsonSource input) throws IOException { } break; } - case 1643520974: - case -1086137910: { - if (input.isAtField(FieldNames.exResourceUrl)) { + case 3367: { + if (input.isAtField(FieldNames.ip)) { if (!input.trySkipNullValue()) { - input.readString(exResourceUrl); + input.readString(ip); bitField0_ |= 0x00000400; } } else { @@ -1609,11 +1696,11 @@ public Gateserver mergeFrom(final JsonSource input) throws IOException { } break; } - case -1116358531: - case 1973569761: { - if (input.isAtField(FieldNames.assetBundleUrl)) { + case -1990689889: + case -1565768458: { + if (input.isAtField(FieldNames.regionName)) { if (!input.trySkipNullValue()) { - input.readString(assetBundleUrl); + input.readString(regionName); bitField0_ |= 0x00000800; } } else { @@ -1621,11 +1708,11 @@ public Gateserver mergeFrom(final JsonSource input) throws IOException { } break; } - case 1625073708: - case -827048283: { - if (input.isAtField(FieldNames.ifixVersion)) { + case 1719409347: + case 1762383292: { + if (input.isAtField(FieldNames.ifixUrl)) { if (!input.trySkipNullValue()) { - input.readString(ifixVersion); + input.readString(ifixUrl); bitField0_ |= 0x00001000; } } else { @@ -1633,11 +1720,11 @@ public Gateserver mergeFrom(final JsonSource input) throws IOException { } break; } - case 1719409347: - case 1762383292: { - if (input.isAtField(FieldNames.ifixUrl)) { + case -584558076: + case 904194372: { + if (input.isAtField(FieldNames.clientSecretKey)) { if (!input.trySkipNullValue()) { - input.readString(ifixUrl); + input.readString(clientSecretKey); bitField0_ |= 0x00002000; } } else { @@ -1645,11 +1732,10 @@ public Gateserver mergeFrom(final JsonSource input) throws IOException { } break; } - case -584558076: - case 904194372: { - if (input.isAtField(FieldNames.clientSecretKey)) { + case 108417: { + if (input.isAtField(FieldNames.msg)) { if (!input.trySkipNullValue()) { - input.readString(clientSecretKey); + input.readString(msg); bitField0_ |= 0x00004000; } } else { @@ -1657,12 +1743,24 @@ public Gateserver mergeFrom(final JsonSource input) throws IOException { } break; } + case 1625073708: + case -827048283: { + if (input.isAtField(FieldNames.ifixVersion)) { + if (!input.trySkipNullValue()) { + input.readString(ifixVersion); + bitField0_ |= 0x00008000; + } + } else { + input.skipUnknownField(); + } + break; + } case -1415579412: case -204279250: { if (input.isAtField(FieldNames.mdkResVersion)) { if (!input.trySkipNullValue()) { input.readString(mdkResVersion); - bitField0_ |= 0x00008000; + bitField0_ |= 0x00010000; } } else { input.skipUnknownField(); @@ -1733,24 +1831,26 @@ static class FieldNames { static final FieldName unk5 = FieldName.forField("unk5"); - static final FieldName msg = FieldName.forField("msg"); + static final FieldName unk6 = FieldName.forField("unk6"); - static final FieldName ip = FieldName.forField("ip"); + static final FieldName assetBundleUrl = FieldName.forField("assetBundleUrl", "asset_bundle_url"); - static final FieldName regionName = FieldName.forField("regionName", "region_name"); + static final FieldName exResourceUrl = FieldName.forField("exResourceUrl", "ex_resource_url"); static final FieldName luaUrl = FieldName.forField("luaUrl", "lua_url"); - static final FieldName exResourceUrl = FieldName.forField("exResourceUrl", "ex_resource_url"); - - static final FieldName assetBundleUrl = FieldName.forField("assetBundleUrl", "asset_bundle_url"); + static final FieldName ip = FieldName.forField("ip"); - static final FieldName ifixVersion = FieldName.forField("ifixVersion", "ifix_version"); + static final FieldName regionName = FieldName.forField("regionName", "region_name"); static final FieldName ifixUrl = FieldName.forField("ifixUrl", "ifix_url"); static final FieldName clientSecretKey = FieldName.forField("clientSecretKey", "client_secret_key"); + static final FieldName msg = FieldName.forField("msg"); + + static final FieldName ifixVersion = FieldName.forField("ifixVersion", "ifix_version"); + static final FieldName mdkResVersion = FieldName.forField("mdkResVersion", "mdk_res_version"); } } diff --git a/src/generated/main/emu/lunarcore/proto/GetActivityScheduleConfigScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetActivityScheduleConfigScRspOuterClass.java index b642ee831..ae92faf5a 100644 --- a/src/generated/main/emu/lunarcore/proto/GetActivityScheduleConfigScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetActivityScheduleConfigScRspOuterClass.java @@ -20,12 +20,12 @@ public static final class GetActivityScheduleConfigScRsp extends ProtoMessageoptional uint32 retcode = 2; + * optional uint32 retcode = 3; */ private int retcode; /** - * repeated .ActivityScheduleInfo activity_schedule_list = 10; + * repeated .ActivityScheduleInfo activity_schedule_list = 9; */ private final RepeatedMessage activityScheduleList = RepeatedMessage.newEmptyInstance(ActivityScheduleInfoOuterClass.ActivityScheduleInfo.getFactory()); @@ -40,7 +40,7 @@ public static GetActivityScheduleConfigScRsp newInstance() { } /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 3; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -48,7 +48,7 @@ public boolean hasRetcode() { } /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 3; * @return this */ public GetActivityScheduleConfigScRsp clearRetcode() { @@ -58,7 +58,7 @@ public GetActivityScheduleConfigScRsp clearRetcode() { } /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 3; * @return the retcode */ public int getRetcode() { @@ -66,7 +66,7 @@ public int getRetcode() { } /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 3; * @param value the retcode to set * @return this */ @@ -77,7 +77,7 @@ public GetActivityScheduleConfigScRsp setRetcode(final int value) { } /** - * repeated .ActivityScheduleInfo activity_schedule_list = 10; + * repeated .ActivityScheduleInfo activity_schedule_list = 9; * @return whether the activityScheduleList field is set */ public boolean hasActivityScheduleList() { @@ -85,7 +85,7 @@ public boolean hasActivityScheduleList() { } /** - * repeated .ActivityScheduleInfo activity_schedule_list = 10; + * repeated .ActivityScheduleInfo activity_schedule_list = 9; * @return this */ public GetActivityScheduleConfigScRsp clearActivityScheduleList() { @@ -95,7 +95,7 @@ public GetActivityScheduleConfigScRsp clearActivityScheduleList() { } /** - * repeated .ActivityScheduleInfo activity_schedule_list = 10; + * repeated .ActivityScheduleInfo activity_schedule_list = 9; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -110,7 +110,7 @@ public RepeatedMessage getA } /** - * repeated .ActivityScheduleInfo activity_schedule_list = 10; + * repeated .ActivityScheduleInfo activity_schedule_list = 9; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -125,7 +125,7 @@ public RepeatedMessage getM } /** - * repeated .ActivityScheduleInfo activity_schedule_list = 10; + * repeated .ActivityScheduleInfo activity_schedule_list = 9; * @param value the activityScheduleList to add * @return this */ @@ -137,7 +137,7 @@ public GetActivityScheduleConfigScRsp addActivityScheduleList( } /** - * repeated .ActivityScheduleInfo activity_schedule_list = 10; + * repeated .ActivityScheduleInfo activity_schedule_list = 9; * @param values the activityScheduleList to add * @return this */ @@ -214,12 +214,12 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < activityScheduleList.length(); i++) { - output.writeRawByte((byte) 82); + output.writeRawByte((byte) 74); output.writeMessageNoTag(activityScheduleList.get(i)); } } @@ -244,16 +244,16 @@ public GetActivityScheduleConfigScRsp mergeFrom(final ProtoSource input) throws int tag = input.readTag(); while (true) { switch (tag) { - case 16: { + case 24: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 82) { + if (tag != 74) { break; } } - case 82: { + case 74: { // activityScheduleList tag = input.readRepeatedMessage(activityScheduleList, tag); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/GetAllLineupDataScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetAllLineupDataScRspOuterClass.java index 8f7fb91ff..97d0d41a9 100644 --- a/src/generated/main/emu/lunarcore/proto/GetAllLineupDataScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetAllLineupDataScRspOuterClass.java @@ -20,17 +20,17 @@ public static final class GetAllLineupDataScRsp extends ProtoMessageoptional uint32 cur_index = 5; + * optional uint32 retcode = 3; */ - private int curIndex; + private int retcode; /** - * optional uint32 retcode = 6; + * optional uint32 cur_index = 15; */ - private int retcode; + private int curIndex; /** - * repeated .LineupInfo lineup_list = 10; + * repeated .LineupInfo lineup_list = 2; */ private final RepeatedMessage lineupList = RepeatedMessage.newEmptyInstance(LineupInfoOuterClass.LineupInfo.getFactory()); @@ -45,81 +45,81 @@ public static GetAllLineupDataScRsp newInstance() { } /** - * optional uint32 cur_index = 5; - * @return whether the curIndex field is set + * optional uint32 retcode = 3; + * @return whether the retcode field is set */ - public boolean hasCurIndex() { + public boolean hasRetcode() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 cur_index = 5; + * optional uint32 retcode = 3; * @return this */ - public GetAllLineupDataScRsp clearCurIndex() { + public GetAllLineupDataScRsp clearRetcode() { bitField0_ &= ~0x00000001; - curIndex = 0; + retcode = 0; return this; } /** - * optional uint32 cur_index = 5; - * @return the curIndex + * optional uint32 retcode = 3; + * @return the retcode */ - public int getCurIndex() { - return curIndex; + public int getRetcode() { + return retcode; } /** - * optional uint32 cur_index = 5; - * @param value the curIndex to set + * optional uint32 retcode = 3; + * @param value the retcode to set * @return this */ - public GetAllLineupDataScRsp setCurIndex(final int value) { + public GetAllLineupDataScRsp setRetcode(final int value) { bitField0_ |= 0x00000001; - curIndex = value; + retcode = value; return this; } /** - * optional uint32 retcode = 6; - * @return whether the retcode field is set + * optional uint32 cur_index = 15; + * @return whether the curIndex field is set */ - public boolean hasRetcode() { + public boolean hasCurIndex() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 retcode = 6; + * optional uint32 cur_index = 15; * @return this */ - public GetAllLineupDataScRsp clearRetcode() { + public GetAllLineupDataScRsp clearCurIndex() { bitField0_ &= ~0x00000002; - retcode = 0; + curIndex = 0; return this; } /** - * optional uint32 retcode = 6; - * @return the retcode + * optional uint32 cur_index = 15; + * @return the curIndex */ - public int getRetcode() { - return retcode; + public int getCurIndex() { + return curIndex; } /** - * optional uint32 retcode = 6; - * @param value the retcode to set + * optional uint32 cur_index = 15; + * @param value the curIndex to set * @return this */ - public GetAllLineupDataScRsp setRetcode(final int value) { + public GetAllLineupDataScRsp setCurIndex(final int value) { bitField0_ |= 0x00000002; - retcode = value; + curIndex = value; return this; } /** - * repeated .LineupInfo lineup_list = 10; + * repeated .LineupInfo lineup_list = 2; * @return whether the lineupList field is set */ public boolean hasLineupList() { @@ -127,7 +127,7 @@ public boolean hasLineupList() { } /** - * repeated .LineupInfo lineup_list = 10; + * repeated .LineupInfo lineup_list = 2; * @return this */ public GetAllLineupDataScRsp clearLineupList() { @@ -137,7 +137,7 @@ public GetAllLineupDataScRsp clearLineupList() { } /** - * repeated .LineupInfo lineup_list = 10; + * repeated .LineupInfo lineup_list = 2; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -151,7 +151,7 @@ public RepeatedMessage getLineupList() { } /** - * repeated .LineupInfo lineup_list = 10; + * repeated .LineupInfo lineup_list = 2; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -165,7 +165,7 @@ public RepeatedMessage getMutableLineupList() { } /** - * repeated .LineupInfo lineup_list = 10; + * repeated .LineupInfo lineup_list = 2; * @param value the lineupList to add * @return this */ @@ -176,7 +176,7 @@ public GetAllLineupDataScRsp addLineupList(final LineupInfoOuterClass.LineupInfo } /** - * repeated .LineupInfo lineup_list = 10; + * repeated .LineupInfo lineup_list = 2; * @param values the lineupList to add * @return this */ @@ -191,8 +191,8 @@ public GetAllLineupDataScRsp copyFrom(final GetAllLineupDataScRsp other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - curIndex = other.curIndex; retcode = other.retcode; + curIndex = other.curIndex; lineupList.copyFrom(other.lineupList); } return this; @@ -204,12 +204,12 @@ public GetAllLineupDataScRsp mergeFrom(final GetAllLineupDataScRsp other) { return this; } cachedSize = -1; - if (other.hasCurIndex()) { - setCurIndex(other.curIndex); - } if (other.hasRetcode()) { setRetcode(other.retcode); } + if (other.hasCurIndex()) { + setCurIndex(other.curIndex); + } if (other.hasLineupList()) { getMutableLineupList().addAll(other.lineupList); } @@ -223,8 +223,8 @@ public GetAllLineupDataScRsp clear() { } cachedSize = -1; bitField0_ = 0; - curIndex = 0; retcode = 0; + curIndex = 0; lineupList.clear(); return this; } @@ -250,24 +250,24 @@ public boolean equals(Object o) { } GetAllLineupDataScRsp other = (GetAllLineupDataScRsp) o; return bitField0_ == other.bitField0_ - && (!hasCurIndex() || curIndex == other.curIndex) && (!hasRetcode() || retcode == other.retcode) + && (!hasCurIndex() || curIndex == other.curIndex) && (!hasLineupList() || lineupList.equals(other.lineupList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 40); - output.writeUInt32NoTag(curIndex); + output.writeRawByte((byte) 24); + output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 48); - output.writeUInt32NoTag(retcode); + output.writeRawByte((byte) 120); + output.writeUInt32NoTag(curIndex); } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < lineupList.length(); i++) { - output.writeRawByte((byte) 82); + output.writeRawByte((byte) 18); output.writeMessageNoTag(lineupList.get(i)); } } @@ -277,10 +277,10 @@ public void writeTo(final ProtoSink output) throws IOException { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(curIndex); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(curIndex); } if ((bitField0_ & 0x00000004) != 0) { size += (1 * lineupList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(lineupList); @@ -295,25 +295,25 @@ public GetAllLineupDataScRsp mergeFrom(final ProtoSource input) throws IOExcepti int tag = input.readTag(); while (true) { switch (tag) { - case 40: { - // curIndex - curIndex = input.readUInt32(); + case 24: { + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 48) { + if (tag != 120) { break; } } - case 48: { - // retcode - retcode = input.readUInt32(); + case 120: { + // curIndex + curIndex = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 82) { + if (tag != 18) { break; } } - case 82: { + case 18: { // lineupList tag = input.readRepeatedMessage(lineupList, tag); bitField0_ |= 0x00000004; @@ -339,10 +339,10 @@ public GetAllLineupDataScRsp mergeFrom(final ProtoSource input) throws IOExcepti public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.curIndex, curIndex); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.curIndex, curIndex); } if ((bitField0_ & 0x00000004) != 0) { output.writeRepeatedMessage(FieldNames.lineupList, lineupList); @@ -357,11 +357,10 @@ public GetAllLineupDataScRsp mergeFrom(final JsonSource input) throws IOExceptio } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 537796210: - case 117333523: { - if (input.isAtField(FieldNames.curIndex)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - curIndex = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -369,10 +368,11 @@ public GetAllLineupDataScRsp mergeFrom(final JsonSource input) throws IOExceptio } break; } - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case 537796210: + case 117333523: { + if (input.isAtField(FieldNames.curIndex)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + curIndex = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -445,10 +445,10 @@ public GetAllLineupDataScRsp create() { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName curIndex = FieldName.forField("curIndex", "cur_index"); - static final FieldName retcode = FieldName.forField("retcode"); + static final FieldName curIndex = FieldName.forField("curIndex", "cur_index"); + static final FieldName lineupList = FieldName.forField("lineupList", "lineup_list"); } } diff --git a/src/generated/main/emu/lunarcore/proto/GetArchiveDataScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetArchiveDataScRspOuterClass.java index d32f5e638..3cc88a68a 100644 --- a/src/generated/main/emu/lunarcore/proto/GetArchiveDataScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetArchiveDataScRspOuterClass.java @@ -24,7 +24,7 @@ public static final class GetArchiveDataScRsp extends ProtoMessageoptional .ArchiveData archive_data = 1; + * optional .ArchiveData archive_data = 15; */ private final ArchiveDataOuterClass.ArchiveData archiveData = ArchiveDataOuterClass.ArchiveData.newInstance(); @@ -76,7 +76,7 @@ public GetArchiveDataScRsp setRetcode(final int value) { } /** - * optional .ArchiveData archive_data = 1; + * optional .ArchiveData archive_data = 15; * @return whether the archiveData field is set */ public boolean hasArchiveData() { @@ -84,7 +84,7 @@ public boolean hasArchiveData() { } /** - * optional .ArchiveData archive_data = 1; + * optional .ArchiveData archive_data = 15; * @return this */ public GetArchiveDataScRsp clearArchiveData() { @@ -94,7 +94,7 @@ public GetArchiveDataScRsp clearArchiveData() { } /** - * optional .ArchiveData archive_data = 1; + * optional .ArchiveData archive_data = 15; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -108,7 +108,7 @@ public ArchiveDataOuterClass.ArchiveData getArchiveData() { } /** - * optional .ArchiveData archive_data = 1; + * optional .ArchiveData archive_data = 15; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -122,7 +122,7 @@ public ArchiveDataOuterClass.ArchiveData getMutableArchiveData() { } /** - * optional .ArchiveData archive_data = 1; + * optional .ArchiveData archive_data = 15; * @param value the archiveData to set * @return this */ @@ -202,7 +202,7 @@ public void writeTo(final ProtoSink output) throws IOException { output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 10); + output.writeRawByte((byte) 122); output.writeMessageNoTag(archiveData); } } @@ -231,11 +231,11 @@ public GetArchiveDataScRsp mergeFrom(final ProtoSource input) throws IOException retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 10) { + if (tag != 122) { break; } } - case 10: { + case 122: { // archiveData input.readMessage(archiveData); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/GetAvatarDataCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetAvatarDataCsReqOuterClass.java index af1a8453c..564a0ed3b 100644 --- a/src/generated/main/emu/lunarcore/proto/GetAvatarDataCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetAvatarDataCsReqOuterClass.java @@ -20,7 +20,7 @@ public static final class GetAvatarDataCsReq extends ProtoMessageoptional bool is_get_all = 5; + * optional bool is_get_all = 6; */ private boolean isGetAll; @@ -40,7 +40,7 @@ public static GetAvatarDataCsReq newInstance() { } /** - * optional bool is_get_all = 5; + * optional bool is_get_all = 6; * @return whether the isGetAll field is set */ public boolean hasIsGetAll() { @@ -48,7 +48,7 @@ public boolean hasIsGetAll() { } /** - * optional bool is_get_all = 5; + * optional bool is_get_all = 6; * @return this */ public GetAvatarDataCsReq clearIsGetAll() { @@ -58,7 +58,7 @@ public GetAvatarDataCsReq clearIsGetAll() { } /** - * optional bool is_get_all = 5; + * optional bool is_get_all = 6; * @return the isGetAll */ public boolean getIsGetAll() { @@ -66,7 +66,7 @@ public boolean getIsGetAll() { } /** - * optional bool is_get_all = 5; + * optional bool is_get_all = 6; * @param value the isGetAll to set * @return this */ @@ -210,7 +210,7 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 48); output.writeBoolNoTag(isGetAll); } if ((bitField0_ & 0x00000002) != 0) { @@ -240,7 +240,7 @@ public GetAvatarDataCsReq mergeFrom(final ProtoSource input) throws IOException int tag = input.readTag(); while (true) { switch (tag) { - case 40: { + case 48: { // isGetAll isGetAll = input.readBool(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/GetAvatarDataScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetAvatarDataScRspOuterClass.java index 515028936..28978f48d 100644 --- a/src/generated/main/emu/lunarcore/proto/GetAvatarDataScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetAvatarDataScRspOuterClass.java @@ -20,17 +20,17 @@ public static final class GetAvatarDataScRsp extends ProtoMessageoptional uint32 retcode = 10; + * optional uint32 retcode = 6; */ private int retcode; /** - * optional bool is_get_all = 6; + * optional bool is_get_all = 10; */ private boolean isGetAll; /** - * repeated .Avatar avatar_list = 14; + * repeated .Avatar avatar_list = 7; */ private final RepeatedMessage avatarList = RepeatedMessage.newEmptyInstance(AvatarOuterClass.Avatar.getFactory()); @@ -45,7 +45,7 @@ public static GetAvatarDataScRsp newInstance() { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 6; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -53,7 +53,7 @@ public boolean hasRetcode() { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 6; * @return this */ public GetAvatarDataScRsp clearRetcode() { @@ -63,7 +63,7 @@ public GetAvatarDataScRsp clearRetcode() { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 6; * @return the retcode */ public int getRetcode() { @@ -71,7 +71,7 @@ public int getRetcode() { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 6; * @param value the retcode to set * @return this */ @@ -82,7 +82,7 @@ public GetAvatarDataScRsp setRetcode(final int value) { } /** - * optional bool is_get_all = 6; + * optional bool is_get_all = 10; * @return whether the isGetAll field is set */ public boolean hasIsGetAll() { @@ -90,7 +90,7 @@ public boolean hasIsGetAll() { } /** - * optional bool is_get_all = 6; + * optional bool is_get_all = 10; * @return this */ public GetAvatarDataScRsp clearIsGetAll() { @@ -100,7 +100,7 @@ public GetAvatarDataScRsp clearIsGetAll() { } /** - * optional bool is_get_all = 6; + * optional bool is_get_all = 10; * @return the isGetAll */ public boolean getIsGetAll() { @@ -108,7 +108,7 @@ public boolean getIsGetAll() { } /** - * optional bool is_get_all = 6; + * optional bool is_get_all = 10; * @param value the isGetAll to set * @return this */ @@ -119,7 +119,7 @@ public GetAvatarDataScRsp setIsGetAll(final boolean value) { } /** - * repeated .Avatar avatar_list = 14; + * repeated .Avatar avatar_list = 7; * @return whether the avatarList field is set */ public boolean hasAvatarList() { @@ -127,7 +127,7 @@ public boolean hasAvatarList() { } /** - * repeated .Avatar avatar_list = 14; + * repeated .Avatar avatar_list = 7; * @return this */ public GetAvatarDataScRsp clearAvatarList() { @@ -137,7 +137,7 @@ public GetAvatarDataScRsp clearAvatarList() { } /** - * repeated .Avatar avatar_list = 14; + * repeated .Avatar avatar_list = 7; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -151,7 +151,7 @@ public RepeatedMessage getAvatarList() { } /** - * repeated .Avatar avatar_list = 14; + * repeated .Avatar avatar_list = 7; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -165,7 +165,7 @@ public RepeatedMessage getMutableAvatarList() { } /** - * repeated .Avatar avatar_list = 14; + * repeated .Avatar avatar_list = 7; * @param value the avatarList to add * @return this */ @@ -176,7 +176,7 @@ public GetAvatarDataScRsp addAvatarList(final AvatarOuterClass.Avatar value) { } /** - * repeated .Avatar avatar_list = 14; + * repeated .Avatar avatar_list = 7; * @param values the avatarList to add * @return this */ @@ -258,16 +258,16 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 80); output.writeBoolNoTag(isGetAll); } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < avatarList.length(); i++) { - output.writeRawByte((byte) 114); + output.writeRawByte((byte) 58); output.writeMessageNoTag(avatarList.get(i)); } } @@ -295,25 +295,25 @@ public GetAvatarDataScRsp mergeFrom(final ProtoSource input) throws IOException int tag = input.readTag(); while (true) { switch (tag) { - case 80: { + case 48: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 48) { + if (tag != 80) { break; } } - case 48: { + case 80: { // isGetAll isGetAll = input.readBool(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 114) { + if (tag != 58) { break; } } - case 114: { + case 58: { // avatarList tag = input.readRepeatedMessage(avatarList, tag); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/GetBagScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetBagScRspOuterClass.java index e3a66a62d..0506b02a6 100644 --- a/src/generated/main/emu/lunarcore/proto/GetBagScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetBagScRspOuterClass.java @@ -20,24 +20,24 @@ public static final class GetBagScRsp extends ProtoMessage implemen private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 2; */ private int retcode; /** - * repeated .Equipment equipment_list = 1; + * repeated .Relic relic_list = 1; */ - private final RepeatedMessage equipmentList = RepeatedMessage.newEmptyInstance(EquipmentOuterClass.Equipment.getFactory()); + private final RepeatedMessage relicList = RepeatedMessage.newEmptyInstance(RelicOuterClass.Relic.getFactory()); /** - * repeated .Material material_list = 2; + * repeated .Equipment equipment_list = 10; */ - private final RepeatedMessage materialList = RepeatedMessage.newEmptyInstance(MaterialOuterClass.Material.getFactory()); + private final RepeatedMessage equipmentList = RepeatedMessage.newEmptyInstance(EquipmentOuterClass.Equipment.getFactory()); /** - * repeated .Relic relic_list = 13; + * repeated .Material material_list = 14; */ - private final RepeatedMessage relicList = RepeatedMessage.newEmptyInstance(RelicOuterClass.Relic.getFactory()); + private final RepeatedMessage materialList = RepeatedMessage.newEmptyInstance(MaterialOuterClass.Material.getFactory()); private GetBagScRsp() { } @@ -50,7 +50,7 @@ public static GetBagScRsp newInstance() { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 2; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -58,7 +58,7 @@ public boolean hasRetcode() { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 2; * @return this */ public GetBagScRsp clearRetcode() { @@ -68,7 +68,7 @@ public GetBagScRsp clearRetcode() { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 2; * @return the retcode */ public int getRetcode() { @@ -76,7 +76,7 @@ public int getRetcode() { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 2; * @param value the retcode to set * @return this */ @@ -87,39 +87,39 @@ public GetBagScRsp setRetcode(final int value) { } /** - * repeated .Equipment equipment_list = 1; - * @return whether the equipmentList field is set + * repeated .Relic relic_list = 1; + * @return whether the relicList field is set */ - public boolean hasEquipmentList() { + public boolean hasRelicList() { return (bitField0_ & 0x00000002) != 0; } /** - * repeated .Equipment equipment_list = 1; + * repeated .Relic relic_list = 1; * @return this */ - public GetBagScRsp clearEquipmentList() { + public GetBagScRsp clearRelicList() { bitField0_ &= ~0x00000002; - equipmentList.clear(); + relicList.clear(); return this; } /** - * repeated .Equipment equipment_list = 1; + * repeated .Relic relic_list = 1; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. * - * Use {@link #getMutableEquipmentList()} if you want to modify it. + * Use {@link #getMutableRelicList()} if you want to modify it. * * @return internal storage object for reading */ - public RepeatedMessage getEquipmentList() { - return equipmentList; + public RepeatedMessage getRelicList() { + return relicList; } /** - * repeated .Equipment equipment_list = 1; + * repeated .Relic relic_list = 1; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -127,67 +127,67 @@ public RepeatedMessage getEquipmentList() { * * @return internal storage object for modifications */ - public RepeatedMessage getMutableEquipmentList() { + public RepeatedMessage getMutableRelicList() { bitField0_ |= 0x00000002; - return equipmentList; + return relicList; } /** - * repeated .Equipment equipment_list = 1; - * @param value the equipmentList to add + * repeated .Relic relic_list = 1; + * @param value the relicList to add * @return this */ - public GetBagScRsp addEquipmentList(final EquipmentOuterClass.Equipment value) { + public GetBagScRsp addRelicList(final RelicOuterClass.Relic value) { bitField0_ |= 0x00000002; - equipmentList.add(value); + relicList.add(value); return this; } /** - * repeated .Equipment equipment_list = 1; - * @param values the equipmentList to add + * repeated .Relic relic_list = 1; + * @param values the relicList to add * @return this */ - public GetBagScRsp addAllEquipmentList(final EquipmentOuterClass.Equipment... values) { + public GetBagScRsp addAllRelicList(final RelicOuterClass.Relic... values) { bitField0_ |= 0x00000002; - equipmentList.addAll(values); + relicList.addAll(values); return this; } /** - * repeated .Material material_list = 2; - * @return whether the materialList field is set + * repeated .Equipment equipment_list = 10; + * @return whether the equipmentList field is set */ - public boolean hasMaterialList() { + public boolean hasEquipmentList() { return (bitField0_ & 0x00000004) != 0; } /** - * repeated .Material material_list = 2; + * repeated .Equipment equipment_list = 10; * @return this */ - public GetBagScRsp clearMaterialList() { + public GetBagScRsp clearEquipmentList() { bitField0_ &= ~0x00000004; - materialList.clear(); + equipmentList.clear(); return this; } /** - * repeated .Material material_list = 2; + * repeated .Equipment equipment_list = 10; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. * - * Use {@link #getMutableMaterialList()} if you want to modify it. + * Use {@link #getMutableEquipmentList()} if you want to modify it. * * @return internal storage object for reading */ - public RepeatedMessage getMaterialList() { - return materialList; + public RepeatedMessage getEquipmentList() { + return equipmentList; } /** - * repeated .Material material_list = 2; + * repeated .Equipment equipment_list = 10; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -195,67 +195,67 @@ public RepeatedMessage getMaterialList() { * * @return internal storage object for modifications */ - public RepeatedMessage getMutableMaterialList() { + public RepeatedMessage getMutableEquipmentList() { bitField0_ |= 0x00000004; - return materialList; + return equipmentList; } /** - * repeated .Material material_list = 2; - * @param value the materialList to add + * repeated .Equipment equipment_list = 10; + * @param value the equipmentList to add * @return this */ - public GetBagScRsp addMaterialList(final MaterialOuterClass.Material value) { + public GetBagScRsp addEquipmentList(final EquipmentOuterClass.Equipment value) { bitField0_ |= 0x00000004; - materialList.add(value); + equipmentList.add(value); return this; } /** - * repeated .Material material_list = 2; - * @param values the materialList to add + * repeated .Equipment equipment_list = 10; + * @param values the equipmentList to add * @return this */ - public GetBagScRsp addAllMaterialList(final MaterialOuterClass.Material... values) { + public GetBagScRsp addAllEquipmentList(final EquipmentOuterClass.Equipment... values) { bitField0_ |= 0x00000004; - materialList.addAll(values); + equipmentList.addAll(values); return this; } /** - * repeated .Relic relic_list = 13; - * @return whether the relicList field is set + * repeated .Material material_list = 14; + * @return whether the materialList field is set */ - public boolean hasRelicList() { + public boolean hasMaterialList() { return (bitField0_ & 0x00000008) != 0; } /** - * repeated .Relic relic_list = 13; + * repeated .Material material_list = 14; * @return this */ - public GetBagScRsp clearRelicList() { + public GetBagScRsp clearMaterialList() { bitField0_ &= ~0x00000008; - relicList.clear(); + materialList.clear(); return this; } /** - * repeated .Relic relic_list = 13; + * repeated .Material material_list = 14; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. * - * Use {@link #getMutableRelicList()} if you want to modify it. + * Use {@link #getMutableMaterialList()} if you want to modify it. * * @return internal storage object for reading */ - public RepeatedMessage getRelicList() { - return relicList; + public RepeatedMessage getMaterialList() { + return materialList; } /** - * repeated .Relic relic_list = 13; + * repeated .Material material_list = 14; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -263,30 +263,30 @@ public RepeatedMessage getRelicList() { * * @return internal storage object for modifications */ - public RepeatedMessage getMutableRelicList() { + public RepeatedMessage getMutableMaterialList() { bitField0_ |= 0x00000008; - return relicList; + return materialList; } /** - * repeated .Relic relic_list = 13; - * @param value the relicList to add + * repeated .Material material_list = 14; + * @param value the materialList to add * @return this */ - public GetBagScRsp addRelicList(final RelicOuterClass.Relic value) { + public GetBagScRsp addMaterialList(final MaterialOuterClass.Material value) { bitField0_ |= 0x00000008; - relicList.add(value); + materialList.add(value); return this; } /** - * repeated .Relic relic_list = 13; - * @param values the relicList to add + * repeated .Material material_list = 14; + * @param values the materialList to add * @return this */ - public GetBagScRsp addAllRelicList(final RelicOuterClass.Relic... values) { + public GetBagScRsp addAllMaterialList(final MaterialOuterClass.Material... values) { bitField0_ |= 0x00000008; - relicList.addAll(values); + materialList.addAll(values); return this; } @@ -296,9 +296,9 @@ public GetBagScRsp copyFrom(final GetBagScRsp other) { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; retcode = other.retcode; + relicList.copyFrom(other.relicList); equipmentList.copyFrom(other.equipmentList); materialList.copyFrom(other.materialList); - relicList.copyFrom(other.relicList); } return this; } @@ -312,15 +312,15 @@ public GetBagScRsp mergeFrom(final GetBagScRsp other) { if (other.hasRetcode()) { setRetcode(other.retcode); } + if (other.hasRelicList()) { + getMutableRelicList().addAll(other.relicList); + } if (other.hasEquipmentList()) { getMutableEquipmentList().addAll(other.equipmentList); } if (other.hasMaterialList()) { getMutableMaterialList().addAll(other.materialList); } - if (other.hasRelicList()) { - getMutableRelicList().addAll(other.relicList); - } return this; } @@ -332,9 +332,9 @@ public GetBagScRsp clear() { cachedSize = -1; bitField0_ = 0; retcode = 0; + relicList.clear(); equipmentList.clear(); materialList.clear(); - relicList.clear(); return this; } @@ -345,9 +345,9 @@ public GetBagScRsp clearQuick() { } cachedSize = -1; bitField0_ = 0; + relicList.clearQuick(); equipmentList.clearQuick(); materialList.clearQuick(); - relicList.clearQuick(); return this; } @@ -362,33 +362,33 @@ public boolean equals(Object o) { GetBagScRsp other = (GetBagScRsp) o; return bitField0_ == other.bitField0_ && (!hasRetcode() || retcode == other.retcode) + && (!hasRelicList() || relicList.equals(other.relicList)) && (!hasEquipmentList() || equipmentList.equals(other.equipmentList)) - && (!hasMaterialList() || materialList.equals(other.materialList)) - && (!hasRelicList() || relicList.equals(other.relicList)); + && (!hasMaterialList() || materialList.equals(other.materialList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - for (int i = 0; i < equipmentList.length(); i++) { + for (int i = 0; i < relicList.length(); i++) { output.writeRawByte((byte) 10); - output.writeMessageNoTag(equipmentList.get(i)); + output.writeMessageNoTag(relicList.get(i)); } } if ((bitField0_ & 0x00000004) != 0) { - for (int i = 0; i < materialList.length(); i++) { - output.writeRawByte((byte) 18); - output.writeMessageNoTag(materialList.get(i)); + for (int i = 0; i < equipmentList.length(); i++) { + output.writeRawByte((byte) 82); + output.writeMessageNoTag(equipmentList.get(i)); } } if ((bitField0_ & 0x00000008) != 0) { - for (int i = 0; i < relicList.length(); i++) { - output.writeRawByte((byte) 106); - output.writeMessageNoTag(relicList.get(i)); + for (int i = 0; i < materialList.length(); i++) { + output.writeRawByte((byte) 114); + output.writeMessageNoTag(materialList.get(i)); } } } @@ -400,13 +400,13 @@ protected int computeSerializedSize() { size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - size += (1 * equipmentList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(equipmentList); + size += (1 * relicList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(relicList); } if ((bitField0_ & 0x00000004) != 0) { - size += (1 * materialList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(materialList); + size += (1 * equipmentList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(equipmentList); } if ((bitField0_ & 0x00000008) != 0) { - size += (1 * relicList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(relicList); + size += (1 * materialList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(materialList); } return size; } @@ -418,7 +418,7 @@ public GetBagScRsp mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 120: { + case 16: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; @@ -428,24 +428,24 @@ public GetBagScRsp mergeFrom(final ProtoSource input) throws IOException { } } case 10: { - // equipmentList - tag = input.readRepeatedMessage(equipmentList, tag); + // relicList + tag = input.readRepeatedMessage(relicList, tag); bitField0_ |= 0x00000002; - if (tag != 18) { + if (tag != 82) { break; } } - case 18: { - // materialList - tag = input.readRepeatedMessage(materialList, tag); + case 82: { + // equipmentList + tag = input.readRepeatedMessage(equipmentList, tag); bitField0_ |= 0x00000004; - if (tag != 106) { + if (tag != 114) { break; } } - case 106: { - // relicList - tag = input.readRepeatedMessage(relicList, tag); + case 114: { + // materialList + tag = input.readRepeatedMessage(materialList, tag); bitField0_ |= 0x00000008; if (tag != 0) { break; @@ -472,13 +472,13 @@ public void writeTo(final JsonSink output) throws IOException { output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRepeatedMessage(FieldNames.equipmentList, equipmentList); + output.writeRepeatedMessage(FieldNames.relicList, relicList); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRepeatedMessage(FieldNames.materialList, materialList); + output.writeRepeatedMessage(FieldNames.equipmentList, equipmentList); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRepeatedMessage(FieldNames.relicList, relicList); + output.writeRepeatedMessage(FieldNames.materialList, materialList); } output.endObject(); } @@ -501,11 +501,11 @@ public GetBagScRsp mergeFrom(final JsonSource input) throws IOException { } break; } - case 2007143244: - case 2109525167: { - if (input.isAtField(FieldNames.equipmentList)) { + case 204814001: + case 2071893482: { + if (input.isAtField(FieldNames.relicList)) { if (!input.trySkipNullValue()) { - input.readRepeatedMessage(equipmentList); + input.readRepeatedMessage(relicList); bitField0_ |= 0x00000002; } } else { @@ -513,11 +513,11 @@ public GetBagScRsp mergeFrom(final JsonSource input) throws IOException { } break; } - case -2115854747: - case -1149360970: { - if (input.isAtField(FieldNames.materialList)) { + case 2007143244: + case 2109525167: { + if (input.isAtField(FieldNames.equipmentList)) { if (!input.trySkipNullValue()) { - input.readRepeatedMessage(materialList); + input.readRepeatedMessage(equipmentList); bitField0_ |= 0x00000004; } } else { @@ -525,11 +525,11 @@ public GetBagScRsp mergeFrom(final JsonSource input) throws IOException { } break; } - case 204814001: - case 2071893482: { - if (input.isAtField(FieldNames.relicList)) { + case -2115854747: + case -1149360970: { + if (input.isAtField(FieldNames.materialList)) { if (!input.trySkipNullValue()) { - input.readRepeatedMessage(relicList); + input.readRepeatedMessage(materialList); bitField0_ |= 0x00000008; } } else { @@ -591,11 +591,11 @@ public GetBagScRsp create() { static class FieldNames { static final FieldName retcode = FieldName.forField("retcode"); + static final FieldName relicList = FieldName.forField("relicList", "relic_list"); + static final FieldName equipmentList = FieldName.forField("equipmentList", "equipment_list"); static final FieldName materialList = FieldName.forField("materialList", "material_list"); - - static final FieldName relicList = FieldName.forField("relicList", "relic_list"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/GetBasicInfoScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetBasicInfoScRspOuterClass.java index 5fc5fcbe3..348356ab3 100644 --- a/src/generated/main/emu/lunarcore/proto/GetBasicInfoScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetBasicInfoScRspOuterClass.java @@ -19,42 +19,42 @@ public static final class GetBasicInfoScRsp extends ProtoMessageoptional int64 last_set_nickname_time = 3; + * optional int64 next_recover_time = 1; */ - private long lastSetNicknameTime; + private long nextRecoverTime; /** - * optional int64 next_recover_time = 15; + * optional int64 last_set_nickname_time = 11; */ - private long nextRecoverTime; + private long lastSetNicknameTime; /** - * optional uint32 cur_day = 1; + * optional uint32 cur_day = 2; */ private int curDay; /** - * optional uint32 week_cocoon_finished_count = 2; + * optional uint32 exchange_times = 4; */ - private int weekCocoonFinishedCount; + private int exchangeTimes; /** - * optional uint32 exchange_times = 6; + * optional uint32 week_cocoon_finished_count = 9; */ - private int exchangeTimes; + private int weekCocoonFinishedCount; /** - * optional uint32 gameplay_birthday = 9; + * optional uint32 retcode = 13; */ - private int gameplayBirthday; + private int retcode; /** - * optional uint32 retcode = 10; + * optional uint32 gameplay_birthday = 14; */ - private int retcode; + private int gameplayBirthday; /** - * optional .PlayerSettingInfo player_setting_info = 14; + * optional .PlayerSettingInfo player_setting_info = 6; */ private final PlayerSettingInfoOuterClass.PlayerSettingInfo playerSettingInfo = PlayerSettingInfoOuterClass.PlayerSettingInfo.newInstance(); @@ -69,81 +69,81 @@ public static GetBasicInfoScRsp newInstance() { } /** - * optional int64 last_set_nickname_time = 3; - * @return whether the lastSetNicknameTime field is set + * optional int64 next_recover_time = 1; + * @return whether the nextRecoverTime field is set */ - public boolean hasLastSetNicknameTime() { + public boolean hasNextRecoverTime() { return (bitField0_ & 0x00000001) != 0; } /** - * optional int64 last_set_nickname_time = 3; + * optional int64 next_recover_time = 1; * @return this */ - public GetBasicInfoScRsp clearLastSetNicknameTime() { + public GetBasicInfoScRsp clearNextRecoverTime() { bitField0_ &= ~0x00000001; - lastSetNicknameTime = 0L; + nextRecoverTime = 0L; return this; } /** - * optional int64 last_set_nickname_time = 3; - * @return the lastSetNicknameTime + * optional int64 next_recover_time = 1; + * @return the nextRecoverTime */ - public long getLastSetNicknameTime() { - return lastSetNicknameTime; + public long getNextRecoverTime() { + return nextRecoverTime; } /** - * optional int64 last_set_nickname_time = 3; - * @param value the lastSetNicknameTime to set + * optional int64 next_recover_time = 1; + * @param value the nextRecoverTime to set * @return this */ - public GetBasicInfoScRsp setLastSetNicknameTime(final long value) { + public GetBasicInfoScRsp setNextRecoverTime(final long value) { bitField0_ |= 0x00000001; - lastSetNicknameTime = value; + nextRecoverTime = value; return this; } /** - * optional int64 next_recover_time = 15; - * @return whether the nextRecoverTime field is set + * optional int64 last_set_nickname_time = 11; + * @return whether the lastSetNicknameTime field is set */ - public boolean hasNextRecoverTime() { + public boolean hasLastSetNicknameTime() { return (bitField0_ & 0x00000002) != 0; } /** - * optional int64 next_recover_time = 15; + * optional int64 last_set_nickname_time = 11; * @return this */ - public GetBasicInfoScRsp clearNextRecoverTime() { + public GetBasicInfoScRsp clearLastSetNicknameTime() { bitField0_ &= ~0x00000002; - nextRecoverTime = 0L; + lastSetNicknameTime = 0L; return this; } /** - * optional int64 next_recover_time = 15; - * @return the nextRecoverTime + * optional int64 last_set_nickname_time = 11; + * @return the lastSetNicknameTime */ - public long getNextRecoverTime() { - return nextRecoverTime; + public long getLastSetNicknameTime() { + return lastSetNicknameTime; } /** - * optional int64 next_recover_time = 15; - * @param value the nextRecoverTime to set + * optional int64 last_set_nickname_time = 11; + * @param value the lastSetNicknameTime to set * @return this */ - public GetBasicInfoScRsp setNextRecoverTime(final long value) { + public GetBasicInfoScRsp setLastSetNicknameTime(final long value) { bitField0_ |= 0x00000002; - nextRecoverTime = value; + lastSetNicknameTime = value; return this; } /** - * optional uint32 cur_day = 1; + * optional uint32 cur_day = 2; * @return whether the curDay field is set */ public boolean hasCurDay() { @@ -151,7 +151,7 @@ public boolean hasCurDay() { } /** - * optional uint32 cur_day = 1; + * optional uint32 cur_day = 2; * @return this */ public GetBasicInfoScRsp clearCurDay() { @@ -161,7 +161,7 @@ public GetBasicInfoScRsp clearCurDay() { } /** - * optional uint32 cur_day = 1; + * optional uint32 cur_day = 2; * @return the curDay */ public int getCurDay() { @@ -169,7 +169,7 @@ public int getCurDay() { } /** - * optional uint32 cur_day = 1; + * optional uint32 cur_day = 2; * @param value the curDay to set * @return this */ @@ -180,155 +180,155 @@ public GetBasicInfoScRsp setCurDay(final int value) { } /** - * optional uint32 week_cocoon_finished_count = 2; - * @return whether the weekCocoonFinishedCount field is set + * optional uint32 exchange_times = 4; + * @return whether the exchangeTimes field is set */ - public boolean hasWeekCocoonFinishedCount() { + public boolean hasExchangeTimes() { return (bitField0_ & 0x00000008) != 0; } /** - * optional uint32 week_cocoon_finished_count = 2; + * optional uint32 exchange_times = 4; * @return this */ - public GetBasicInfoScRsp clearWeekCocoonFinishedCount() { + public GetBasicInfoScRsp clearExchangeTimes() { bitField0_ &= ~0x00000008; - weekCocoonFinishedCount = 0; + exchangeTimes = 0; return this; } /** - * optional uint32 week_cocoon_finished_count = 2; - * @return the weekCocoonFinishedCount + * optional uint32 exchange_times = 4; + * @return the exchangeTimes */ - public int getWeekCocoonFinishedCount() { - return weekCocoonFinishedCount; + public int getExchangeTimes() { + return exchangeTimes; } /** - * optional uint32 week_cocoon_finished_count = 2; - * @param value the weekCocoonFinishedCount to set + * optional uint32 exchange_times = 4; + * @param value the exchangeTimes to set * @return this */ - public GetBasicInfoScRsp setWeekCocoonFinishedCount(final int value) { + public GetBasicInfoScRsp setExchangeTimes(final int value) { bitField0_ |= 0x00000008; - weekCocoonFinishedCount = value; + exchangeTimes = value; return this; } /** - * optional uint32 exchange_times = 6; - * @return whether the exchangeTimes field is set + * optional uint32 week_cocoon_finished_count = 9; + * @return whether the weekCocoonFinishedCount field is set */ - public boolean hasExchangeTimes() { + public boolean hasWeekCocoonFinishedCount() { return (bitField0_ & 0x00000010) != 0; } /** - * optional uint32 exchange_times = 6; + * optional uint32 week_cocoon_finished_count = 9; * @return this */ - public GetBasicInfoScRsp clearExchangeTimes() { + public GetBasicInfoScRsp clearWeekCocoonFinishedCount() { bitField0_ &= ~0x00000010; - exchangeTimes = 0; + weekCocoonFinishedCount = 0; return this; } /** - * optional uint32 exchange_times = 6; - * @return the exchangeTimes + * optional uint32 week_cocoon_finished_count = 9; + * @return the weekCocoonFinishedCount */ - public int getExchangeTimes() { - return exchangeTimes; + public int getWeekCocoonFinishedCount() { + return weekCocoonFinishedCount; } /** - * optional uint32 exchange_times = 6; - * @param value the exchangeTimes to set + * optional uint32 week_cocoon_finished_count = 9; + * @param value the weekCocoonFinishedCount to set * @return this */ - public GetBasicInfoScRsp setExchangeTimes(final int value) { + public GetBasicInfoScRsp setWeekCocoonFinishedCount(final int value) { bitField0_ |= 0x00000010; - exchangeTimes = value; + weekCocoonFinishedCount = value; return this; } /** - * optional uint32 gameplay_birthday = 9; - * @return whether the gameplayBirthday field is set + * optional uint32 retcode = 13; + * @return whether the retcode field is set */ - public boolean hasGameplayBirthday() { + public boolean hasRetcode() { return (bitField0_ & 0x00000020) != 0; } /** - * optional uint32 gameplay_birthday = 9; + * optional uint32 retcode = 13; * @return this */ - public GetBasicInfoScRsp clearGameplayBirthday() { + public GetBasicInfoScRsp clearRetcode() { bitField0_ &= ~0x00000020; - gameplayBirthday = 0; + retcode = 0; return this; } /** - * optional uint32 gameplay_birthday = 9; - * @return the gameplayBirthday + * optional uint32 retcode = 13; + * @return the retcode */ - public int getGameplayBirthday() { - return gameplayBirthday; + public int getRetcode() { + return retcode; } /** - * optional uint32 gameplay_birthday = 9; - * @param value the gameplayBirthday to set + * optional uint32 retcode = 13; + * @param value the retcode to set * @return this */ - public GetBasicInfoScRsp setGameplayBirthday(final int value) { + public GetBasicInfoScRsp setRetcode(final int value) { bitField0_ |= 0x00000020; - gameplayBirthday = value; + retcode = value; return this; } /** - * optional uint32 retcode = 10; - * @return whether the retcode field is set + * optional uint32 gameplay_birthday = 14; + * @return whether the gameplayBirthday field is set */ - public boolean hasRetcode() { + public boolean hasGameplayBirthday() { return (bitField0_ & 0x00000040) != 0; } /** - * optional uint32 retcode = 10; + * optional uint32 gameplay_birthday = 14; * @return this */ - public GetBasicInfoScRsp clearRetcode() { + public GetBasicInfoScRsp clearGameplayBirthday() { bitField0_ &= ~0x00000040; - retcode = 0; + gameplayBirthday = 0; return this; } /** - * optional uint32 retcode = 10; - * @return the retcode + * optional uint32 gameplay_birthday = 14; + * @return the gameplayBirthday */ - public int getRetcode() { - return retcode; + public int getGameplayBirthday() { + return gameplayBirthday; } /** - * optional uint32 retcode = 10; - * @param value the retcode to set + * optional uint32 gameplay_birthday = 14; + * @param value the gameplayBirthday to set * @return this */ - public GetBasicInfoScRsp setRetcode(final int value) { + public GetBasicInfoScRsp setGameplayBirthday(final int value) { bitField0_ |= 0x00000040; - retcode = value; + gameplayBirthday = value; return this; } /** - * optional .PlayerSettingInfo player_setting_info = 14; + * optional .PlayerSettingInfo player_setting_info = 6; * @return whether the playerSettingInfo field is set */ public boolean hasPlayerSettingInfo() { @@ -336,7 +336,7 @@ public boolean hasPlayerSettingInfo() { } /** - * optional .PlayerSettingInfo player_setting_info = 14; + * optional .PlayerSettingInfo player_setting_info = 6; * @return this */ public GetBasicInfoScRsp clearPlayerSettingInfo() { @@ -346,7 +346,7 @@ public GetBasicInfoScRsp clearPlayerSettingInfo() { } /** - * optional .PlayerSettingInfo player_setting_info = 14; + * optional .PlayerSettingInfo player_setting_info = 6; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -360,7 +360,7 @@ public PlayerSettingInfoOuterClass.PlayerSettingInfo getPlayerSettingInfo() { } /** - * optional .PlayerSettingInfo player_setting_info = 14; + * optional .PlayerSettingInfo player_setting_info = 6; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -374,7 +374,7 @@ public PlayerSettingInfoOuterClass.PlayerSettingInfo getMutablePlayerSettingInfo } /** - * optional .PlayerSettingInfo player_setting_info = 14; + * optional .PlayerSettingInfo player_setting_info = 6; * @param value the playerSettingInfo to set * @return this */ @@ -390,13 +390,13 @@ public GetBasicInfoScRsp copyFrom(final GetBasicInfoScRsp other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - lastSetNicknameTime = other.lastSetNicknameTime; nextRecoverTime = other.nextRecoverTime; + lastSetNicknameTime = other.lastSetNicknameTime; curDay = other.curDay; - weekCocoonFinishedCount = other.weekCocoonFinishedCount; exchangeTimes = other.exchangeTimes; - gameplayBirthday = other.gameplayBirthday; + weekCocoonFinishedCount = other.weekCocoonFinishedCount; retcode = other.retcode; + gameplayBirthday = other.gameplayBirthday; playerSettingInfo.copyFrom(other.playerSettingInfo); } return this; @@ -408,27 +408,27 @@ public GetBasicInfoScRsp mergeFrom(final GetBasicInfoScRsp other) { return this; } cachedSize = -1; - if (other.hasLastSetNicknameTime()) { - setLastSetNicknameTime(other.lastSetNicknameTime); - } if (other.hasNextRecoverTime()) { setNextRecoverTime(other.nextRecoverTime); } + if (other.hasLastSetNicknameTime()) { + setLastSetNicknameTime(other.lastSetNicknameTime); + } if (other.hasCurDay()) { setCurDay(other.curDay); } - if (other.hasWeekCocoonFinishedCount()) { - setWeekCocoonFinishedCount(other.weekCocoonFinishedCount); - } if (other.hasExchangeTimes()) { setExchangeTimes(other.exchangeTimes); } - if (other.hasGameplayBirthday()) { - setGameplayBirthday(other.gameplayBirthday); + if (other.hasWeekCocoonFinishedCount()) { + setWeekCocoonFinishedCount(other.weekCocoonFinishedCount); } if (other.hasRetcode()) { setRetcode(other.retcode); } + if (other.hasGameplayBirthday()) { + setGameplayBirthday(other.gameplayBirthday); + } if (other.hasPlayerSettingInfo()) { getMutablePlayerSettingInfo().mergeFrom(other.playerSettingInfo); } @@ -442,13 +442,13 @@ public GetBasicInfoScRsp clear() { } cachedSize = -1; bitField0_ = 0; - lastSetNicknameTime = 0L; nextRecoverTime = 0L; + lastSetNicknameTime = 0L; curDay = 0; - weekCocoonFinishedCount = 0; exchangeTimes = 0; - gameplayBirthday = 0; + weekCocoonFinishedCount = 0; retcode = 0; + gameplayBirthday = 0; playerSettingInfo.clear(); return this; } @@ -474,48 +474,48 @@ public boolean equals(Object o) { } GetBasicInfoScRsp other = (GetBasicInfoScRsp) o; return bitField0_ == other.bitField0_ - && (!hasLastSetNicknameTime() || lastSetNicknameTime == other.lastSetNicknameTime) && (!hasNextRecoverTime() || nextRecoverTime == other.nextRecoverTime) + && (!hasLastSetNicknameTime() || lastSetNicknameTime == other.lastSetNicknameTime) && (!hasCurDay() || curDay == other.curDay) - && (!hasWeekCocoonFinishedCount() || weekCocoonFinishedCount == other.weekCocoonFinishedCount) && (!hasExchangeTimes() || exchangeTimes == other.exchangeTimes) - && (!hasGameplayBirthday() || gameplayBirthday == other.gameplayBirthday) + && (!hasWeekCocoonFinishedCount() || weekCocoonFinishedCount == other.weekCocoonFinishedCount) && (!hasRetcode() || retcode == other.retcode) + && (!hasGameplayBirthday() || gameplayBirthday == other.gameplayBirthday) && (!hasPlayerSettingInfo() || playerSettingInfo.equals(other.playerSettingInfo)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); - output.writeInt64NoTag(lastSetNicknameTime); + output.writeRawByte((byte) 8); + output.writeInt64NoTag(nextRecoverTime); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 120); - output.writeInt64NoTag(nextRecoverTime); + output.writeRawByte((byte) 88); + output.writeInt64NoTag(lastSetNicknameTime); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(curDay); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 16); - output.writeUInt32NoTag(weekCocoonFinishedCount); + output.writeRawByte((byte) 32); + output.writeUInt32NoTag(exchangeTimes); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 48); - output.writeUInt32NoTag(exchangeTimes); + output.writeRawByte((byte) 72); + output.writeUInt32NoTag(weekCocoonFinishedCount); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 72); - output.writeUInt32NoTag(gameplayBirthday); + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000040) != 0) { - output.writeRawByte((byte) 80); - output.writeUInt32NoTag(retcode); + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(gameplayBirthday); } if ((bitField0_ & 0x00000080) != 0) { - output.writeRawByte((byte) 114); + output.writeRawByte((byte) 50); output.writeMessageNoTag(playerSettingInfo); } } @@ -524,25 +524,25 @@ public void writeTo(final ProtoSink output) throws IOException { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeInt64SizeNoTag(lastSetNicknameTime); + size += 1 + ProtoSink.computeInt64SizeNoTag(nextRecoverTime); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeInt64SizeNoTag(nextRecoverTime); + size += 1 + ProtoSink.computeInt64SizeNoTag(lastSetNicknameTime); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(curDay); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(weekCocoonFinishedCount); + size += 1 + ProtoSink.computeUInt32SizeNoTag(exchangeTimes); } if ((bitField0_ & 0x00000010) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(exchangeTimes); + size += 1 + ProtoSink.computeUInt32SizeNoTag(weekCocoonFinishedCount); } if ((bitField0_ & 0x00000020) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(gameplayBirthday); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000040) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(gameplayBirthday); } if ((bitField0_ & 0x00000080) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(playerSettingInfo); @@ -557,70 +557,70 @@ public GetBasicInfoScRsp mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { - // lastSetNicknameTime - lastSetNicknameTime = input.readInt64(); + case 8: { + // nextRecoverTime + nextRecoverTime = input.readInt64(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 120) { + if (tag != 88) { break; } } - case 120: { - // nextRecoverTime - nextRecoverTime = input.readInt64(); + case 88: { + // lastSetNicknameTime + lastSetNicknameTime = input.readInt64(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 8) { + if (tag != 16) { break; } } - case 8: { + case 16: { // curDay curDay = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 16) { + if (tag != 32) { break; } } - case 16: { - // weekCocoonFinishedCount - weekCocoonFinishedCount = input.readUInt32(); + case 32: { + // exchangeTimes + exchangeTimes = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 48) { + if (tag != 72) { break; } } - case 48: { - // exchangeTimes - exchangeTimes = input.readUInt32(); + case 72: { + // weekCocoonFinishedCount + weekCocoonFinishedCount = input.readUInt32(); bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 72) { + if (tag != 104) { break; } } - case 72: { - // gameplayBirthday - gameplayBirthday = input.readUInt32(); + case 104: { + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000020; tag = input.readTag(); - if (tag != 80) { + if (tag != 112) { break; } } - case 80: { - // retcode - retcode = input.readUInt32(); + case 112: { + // gameplayBirthday + gameplayBirthday = input.readUInt32(); bitField0_ |= 0x00000040; tag = input.readTag(); - if (tag != 114) { + if (tag != 50) { break; } } - case 114: { + case 50: { // playerSettingInfo input.readMessage(playerSettingInfo); bitField0_ |= 0x00000080; @@ -647,25 +647,25 @@ public GetBasicInfoScRsp mergeFrom(final ProtoSource input) throws IOException { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeInt64(FieldNames.lastSetNicknameTime, lastSetNicknameTime); + output.writeInt64(FieldNames.nextRecoverTime, nextRecoverTime); } if ((bitField0_ & 0x00000002) != 0) { - output.writeInt64(FieldNames.nextRecoverTime, nextRecoverTime); + output.writeInt64(FieldNames.lastSetNicknameTime, lastSetNicknameTime); } if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.curDay, curDay); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.weekCocoonFinishedCount, weekCocoonFinishedCount); + output.writeUInt32(FieldNames.exchangeTimes, exchangeTimes); } if ((bitField0_ & 0x00000010) != 0) { - output.writeUInt32(FieldNames.exchangeTimes, exchangeTimes); + output.writeUInt32(FieldNames.weekCocoonFinishedCount, weekCocoonFinishedCount); } if ((bitField0_ & 0x00000020) != 0) { - output.writeUInt32(FieldNames.gameplayBirthday, gameplayBirthday); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000040) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.gameplayBirthday, gameplayBirthday); } if ((bitField0_ & 0x00000080) != 0) { output.writeMessage(FieldNames.playerSettingInfo, playerSettingInfo); @@ -680,11 +680,11 @@ public GetBasicInfoScRsp mergeFrom(final JsonSource input) throws IOException { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1278606439: - case 400029048: { - if (input.isAtField(FieldNames.lastSetNicknameTime)) { + case -1964148386: + case 394600084: { + if (input.isAtField(FieldNames.nextRecoverTime)) { if (!input.trySkipNullValue()) { - lastSetNicknameTime = input.readInt64(); + nextRecoverTime = input.readInt64(); bitField0_ |= 0x00000001; } } else { @@ -692,11 +692,11 @@ public GetBasicInfoScRsp mergeFrom(final JsonSource input) throws IOException { } break; } - case -1964148386: - case 394600084: { - if (input.isAtField(FieldNames.nextRecoverTime)) { + case 1278606439: + case 400029048: { + if (input.isAtField(FieldNames.lastSetNicknameTime)) { if (!input.trySkipNullValue()) { - nextRecoverTime = input.readInt64(); + lastSetNicknameTime = input.readInt64(); bitField0_ |= 0x00000002; } } else { @@ -716,11 +716,11 @@ public GetBasicInfoScRsp mergeFrom(final JsonSource input) throws IOException { } break; } - case 1387396786: - case 668486783: { - if (input.isAtField(FieldNames.weekCocoonFinishedCount)) { + case 1371137763: + case -119434710: { + if (input.isAtField(FieldNames.exchangeTimes)) { if (!input.trySkipNullValue()) { - weekCocoonFinishedCount = input.readUInt32(); + exchangeTimes = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -728,11 +728,11 @@ public GetBasicInfoScRsp mergeFrom(final JsonSource input) throws IOException { } break; } - case 1371137763: - case -119434710: { - if (input.isAtField(FieldNames.exchangeTimes)) { + case 1387396786: + case 668486783: { + if (input.isAtField(FieldNames.weekCocoonFinishedCount)) { if (!input.trySkipNullValue()) { - exchangeTimes = input.readUInt32(); + weekCocoonFinishedCount = input.readUInt32(); bitField0_ |= 0x00000010; } } else { @@ -740,11 +740,10 @@ public GetBasicInfoScRsp mergeFrom(final JsonSource input) throws IOException { } break; } - case 686542531: - case 172986486: { - if (input.isAtField(FieldNames.gameplayBirthday)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - gameplayBirthday = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000020; } } else { @@ -752,10 +751,11 @@ public GetBasicInfoScRsp mergeFrom(final JsonSource input) throws IOException { } break; } - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case 686542531: + case 172986486: { + if (input.isAtField(FieldNames.gameplayBirthday)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + gameplayBirthday = input.readUInt32(); bitField0_ |= 0x00000040; } } else { @@ -828,20 +828,20 @@ public GetBasicInfoScRsp create() { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName lastSetNicknameTime = FieldName.forField("lastSetNicknameTime", "last_set_nickname_time"); - static final FieldName nextRecoverTime = FieldName.forField("nextRecoverTime", "next_recover_time"); - static final FieldName curDay = FieldName.forField("curDay", "cur_day"); + static final FieldName lastSetNicknameTime = FieldName.forField("lastSetNicknameTime", "last_set_nickname_time"); - static final FieldName weekCocoonFinishedCount = FieldName.forField("weekCocoonFinishedCount", "week_cocoon_finished_count"); + static final FieldName curDay = FieldName.forField("curDay", "cur_day"); static final FieldName exchangeTimes = FieldName.forField("exchangeTimes", "exchange_times"); - static final FieldName gameplayBirthday = FieldName.forField("gameplayBirthday", "gameplay_birthday"); + static final FieldName weekCocoonFinishedCount = FieldName.forField("weekCocoonFinishedCount", "week_cocoon_finished_count"); static final FieldName retcode = FieldName.forField("retcode"); + static final FieldName gameplayBirthday = FieldName.forField("gameplayBirthday", "gameplay_birthday"); + static final FieldName playerSettingInfo = FieldName.forField("playerSettingInfo", "player_setting_info"); } } diff --git a/src/generated/main/emu/lunarcore/proto/GetChallengeScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetChallengeScRspOuterClass.java index 3d268e000..55224c694 100644 --- a/src/generated/main/emu/lunarcore/proto/GetChallengeScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetChallengeScRspOuterClass.java @@ -20,19 +20,19 @@ public static final class GetChallengeScRsp extends ProtoMessageoptional uint32 retcode = 15; + * optional uint32 retcode = 5; */ private int retcode; /** - * repeated .Challenge challenge_list = 8; + * repeated .ChallengeReward challenge_reward_list = 1; */ - private final RepeatedMessage challengeList = RepeatedMessage.newEmptyInstance(ChallengeOuterClass.Challenge.getFactory()); + private final RepeatedMessage challengeRewardList = RepeatedMessage.newEmptyInstance(ChallengeRewardOuterClass.ChallengeReward.getFactory()); /** - * repeated .ChallengeReward challenge_reward_list = 9; + * repeated .Challenge challenge_list = 13; */ - private final RepeatedMessage challengeRewardList = RepeatedMessage.newEmptyInstance(ChallengeRewardOuterClass.ChallengeReward.getFactory()); + private final RepeatedMessage challengeList = RepeatedMessage.newEmptyInstance(ChallengeOuterClass.Challenge.getFactory()); private GetChallengeScRsp() { } @@ -45,7 +45,7 @@ public static GetChallengeScRsp newInstance() { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 5; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -53,7 +53,7 @@ public boolean hasRetcode() { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 5; * @return this */ public GetChallengeScRsp clearRetcode() { @@ -63,7 +63,7 @@ public GetChallengeScRsp clearRetcode() { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 5; * @return the retcode */ public int getRetcode() { @@ -71,7 +71,7 @@ public int getRetcode() { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 5; * @param value the retcode to set * @return this */ @@ -82,39 +82,39 @@ public GetChallengeScRsp setRetcode(final int value) { } /** - * repeated .Challenge challenge_list = 8; - * @return whether the challengeList field is set + * repeated .ChallengeReward challenge_reward_list = 1; + * @return whether the challengeRewardList field is set */ - public boolean hasChallengeList() { + public boolean hasChallengeRewardList() { return (bitField0_ & 0x00000002) != 0; } /** - * repeated .Challenge challenge_list = 8; + * repeated .ChallengeReward challenge_reward_list = 1; * @return this */ - public GetChallengeScRsp clearChallengeList() { + public GetChallengeScRsp clearChallengeRewardList() { bitField0_ &= ~0x00000002; - challengeList.clear(); + challengeRewardList.clear(); return this; } /** - * repeated .Challenge challenge_list = 8; + * repeated .ChallengeReward challenge_reward_list = 1; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. * - * Use {@link #getMutableChallengeList()} if you want to modify it. + * Use {@link #getMutableChallengeRewardList()} if you want to modify it. * * @return internal storage object for reading */ - public RepeatedMessage getChallengeList() { - return challengeList; + public RepeatedMessage getChallengeRewardList() { + return challengeRewardList; } /** - * repeated .Challenge challenge_list = 8; + * repeated .ChallengeReward challenge_reward_list = 1; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -122,67 +122,70 @@ public RepeatedMessage getChallengeList() { * * @return internal storage object for modifications */ - public RepeatedMessage getMutableChallengeList() { + public RepeatedMessage getMutableChallengeRewardList( + ) { bitField0_ |= 0x00000002; - return challengeList; + return challengeRewardList; } /** - * repeated .Challenge challenge_list = 8; - * @param value the challengeList to add + * repeated .ChallengeReward challenge_reward_list = 1; + * @param value the challengeRewardList to add * @return this */ - public GetChallengeScRsp addChallengeList(final ChallengeOuterClass.Challenge value) { + public GetChallengeScRsp addChallengeRewardList( + final ChallengeRewardOuterClass.ChallengeReward value) { bitField0_ |= 0x00000002; - challengeList.add(value); + challengeRewardList.add(value); return this; } /** - * repeated .Challenge challenge_list = 8; - * @param values the challengeList to add + * repeated .ChallengeReward challenge_reward_list = 1; + * @param values the challengeRewardList to add * @return this */ - public GetChallengeScRsp addAllChallengeList(final ChallengeOuterClass.Challenge... values) { + public GetChallengeScRsp addAllChallengeRewardList( + final ChallengeRewardOuterClass.ChallengeReward... values) { bitField0_ |= 0x00000002; - challengeList.addAll(values); + challengeRewardList.addAll(values); return this; } /** - * repeated .ChallengeReward challenge_reward_list = 9; - * @return whether the challengeRewardList field is set + * repeated .Challenge challenge_list = 13; + * @return whether the challengeList field is set */ - public boolean hasChallengeRewardList() { + public boolean hasChallengeList() { return (bitField0_ & 0x00000004) != 0; } /** - * repeated .ChallengeReward challenge_reward_list = 9; + * repeated .Challenge challenge_list = 13; * @return this */ - public GetChallengeScRsp clearChallengeRewardList() { + public GetChallengeScRsp clearChallengeList() { bitField0_ &= ~0x00000004; - challengeRewardList.clear(); + challengeList.clear(); return this; } /** - * repeated .ChallengeReward challenge_reward_list = 9; + * repeated .Challenge challenge_list = 13; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. * - * Use {@link #getMutableChallengeRewardList()} if you want to modify it. + * Use {@link #getMutableChallengeList()} if you want to modify it. * * @return internal storage object for reading */ - public RepeatedMessage getChallengeRewardList() { - return challengeRewardList; + public RepeatedMessage getChallengeList() { + return challengeList; } /** - * repeated .ChallengeReward challenge_reward_list = 9; + * repeated .Challenge challenge_list = 13; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -190,33 +193,30 @@ public RepeatedMessage getChallengeRe * * @return internal storage object for modifications */ - public RepeatedMessage getMutableChallengeRewardList( - ) { + public RepeatedMessage getMutableChallengeList() { bitField0_ |= 0x00000004; - return challengeRewardList; + return challengeList; } /** - * repeated .ChallengeReward challenge_reward_list = 9; - * @param value the challengeRewardList to add + * repeated .Challenge challenge_list = 13; + * @param value the challengeList to add * @return this */ - public GetChallengeScRsp addChallengeRewardList( - final ChallengeRewardOuterClass.ChallengeReward value) { + public GetChallengeScRsp addChallengeList(final ChallengeOuterClass.Challenge value) { bitField0_ |= 0x00000004; - challengeRewardList.add(value); + challengeList.add(value); return this; } /** - * repeated .ChallengeReward challenge_reward_list = 9; - * @param values the challengeRewardList to add + * repeated .Challenge challenge_list = 13; + * @param values the challengeList to add * @return this */ - public GetChallengeScRsp addAllChallengeRewardList( - final ChallengeRewardOuterClass.ChallengeReward... values) { + public GetChallengeScRsp addAllChallengeList(final ChallengeOuterClass.Challenge... values) { bitField0_ |= 0x00000004; - challengeRewardList.addAll(values); + challengeList.addAll(values); return this; } @@ -226,8 +226,8 @@ public GetChallengeScRsp copyFrom(final GetChallengeScRsp other) { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; retcode = other.retcode; - challengeList.copyFrom(other.challengeList); challengeRewardList.copyFrom(other.challengeRewardList); + challengeList.copyFrom(other.challengeList); } return this; } @@ -241,12 +241,12 @@ public GetChallengeScRsp mergeFrom(final GetChallengeScRsp other) { if (other.hasRetcode()) { setRetcode(other.retcode); } - if (other.hasChallengeList()) { - getMutableChallengeList().addAll(other.challengeList); - } if (other.hasChallengeRewardList()) { getMutableChallengeRewardList().addAll(other.challengeRewardList); } + if (other.hasChallengeList()) { + getMutableChallengeList().addAll(other.challengeList); + } return this; } @@ -258,8 +258,8 @@ public GetChallengeScRsp clear() { cachedSize = -1; bitField0_ = 0; retcode = 0; - challengeList.clear(); challengeRewardList.clear(); + challengeList.clear(); return this; } @@ -270,8 +270,8 @@ public GetChallengeScRsp clearQuick() { } cachedSize = -1; bitField0_ = 0; - challengeList.clearQuick(); challengeRewardList.clearQuick(); + challengeList.clearQuick(); return this; } @@ -286,26 +286,26 @@ public boolean equals(Object o) { GetChallengeScRsp other = (GetChallengeScRsp) o; return bitField0_ == other.bitField0_ && (!hasRetcode() || retcode == other.retcode) - && (!hasChallengeList() || challengeList.equals(other.challengeList)) - && (!hasChallengeRewardList() || challengeRewardList.equals(other.challengeRewardList)); + && (!hasChallengeRewardList() || challengeRewardList.equals(other.challengeRewardList)) + && (!hasChallengeList() || challengeList.equals(other.challengeList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - for (int i = 0; i < challengeList.length(); i++) { - output.writeRawByte((byte) 66); - output.writeMessageNoTag(challengeList.get(i)); + for (int i = 0; i < challengeRewardList.length(); i++) { + output.writeRawByte((byte) 10); + output.writeMessageNoTag(challengeRewardList.get(i)); } } if ((bitField0_ & 0x00000004) != 0) { - for (int i = 0; i < challengeRewardList.length(); i++) { - output.writeRawByte((byte) 74); - output.writeMessageNoTag(challengeRewardList.get(i)); + for (int i = 0; i < challengeList.length(); i++) { + output.writeRawByte((byte) 106); + output.writeMessageNoTag(challengeList.get(i)); } } } @@ -317,10 +317,10 @@ protected int computeSerializedSize() { size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - size += (1 * challengeList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(challengeList); + size += (1 * challengeRewardList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(challengeRewardList); } if ((bitField0_ & 0x00000004) != 0) { - size += (1 * challengeRewardList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(challengeRewardList); + size += (1 * challengeList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(challengeList); } return size; } @@ -332,26 +332,26 @@ public GetChallengeScRsp mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 120: { + case 40: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 66) { + if (tag != 10) { break; } } - case 66: { - // challengeList - tag = input.readRepeatedMessage(challengeList, tag); + case 10: { + // challengeRewardList + tag = input.readRepeatedMessage(challengeRewardList, tag); bitField0_ |= 0x00000002; - if (tag != 74) { + if (tag != 106) { break; } } - case 74: { - // challengeRewardList - tag = input.readRepeatedMessage(challengeRewardList, tag); + case 106: { + // challengeList + tag = input.readRepeatedMessage(challengeList, tag); bitField0_ |= 0x00000004; if (tag != 0) { break; @@ -378,10 +378,10 @@ public void writeTo(final JsonSink output) throws IOException { output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRepeatedMessage(FieldNames.challengeList, challengeList); + output.writeRepeatedMessage(FieldNames.challengeRewardList, challengeRewardList); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRepeatedMessage(FieldNames.challengeRewardList, challengeRewardList); + output.writeRepeatedMessage(FieldNames.challengeList, challengeList); } output.endObject(); } @@ -404,11 +404,11 @@ public GetChallengeScRsp mergeFrom(final JsonSource input) throws IOException { } break; } - case -812402783: - case 602944250: { - if (input.isAtField(FieldNames.challengeList)) { + case 1371323696: + case -2132566574: { + if (input.isAtField(FieldNames.challengeRewardList)) { if (!input.trySkipNullValue()) { - input.readRepeatedMessage(challengeList); + input.readRepeatedMessage(challengeRewardList); bitField0_ |= 0x00000002; } } else { @@ -416,11 +416,11 @@ public GetChallengeScRsp mergeFrom(final JsonSource input) throws IOException { } break; } - case 1371323696: - case -2132566574: { - if (input.isAtField(FieldNames.challengeRewardList)) { + case -812402783: + case 602944250: { + if (input.isAtField(FieldNames.challengeList)) { if (!input.trySkipNullValue()) { - input.readRepeatedMessage(challengeRewardList); + input.readRepeatedMessage(challengeList); bitField0_ |= 0x00000004; } } else { @@ -483,9 +483,9 @@ public GetChallengeScRsp create() { static class FieldNames { static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName challengeList = FieldName.forField("challengeList", "challenge_list"); - static final FieldName challengeRewardList = FieldName.forField("challengeRewardList", "challenge_reward_list"); + + static final FieldName challengeList = FieldName.forField("challengeList", "challenge_list"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/GetCurChallengeScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetCurChallengeScRspOuterClass.java index aa8ac8c8b..4e63fbfa4 100644 --- a/src/generated/main/emu/lunarcore/proto/GetCurChallengeScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetCurChallengeScRspOuterClass.java @@ -19,12 +19,12 @@ public static final class GetCurChallengeScRsp extends ProtoMessageoptional uint32 retcode = 5; + * optional uint32 retcode = 15; */ private int retcode; /** - * optional .ChallengeInfo challenge_info = 9; + * optional .ChallengeInfo challenge_info = 14; */ private final ChallengeInfoOuterClass.ChallengeInfo challengeInfo = ChallengeInfoOuterClass.ChallengeInfo.newInstance(); @@ -39,7 +39,7 @@ public static GetCurChallengeScRsp newInstance() { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 15; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public boolean hasRetcode() { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 15; * @return this */ public GetCurChallengeScRsp clearRetcode() { @@ -57,7 +57,7 @@ public GetCurChallengeScRsp clearRetcode() { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 15; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public int getRetcode() { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 15; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public GetCurChallengeScRsp setRetcode(final int value) { } /** - * optional .ChallengeInfo challenge_info = 9; + * optional .ChallengeInfo challenge_info = 14; * @return whether the challengeInfo field is set */ public boolean hasChallengeInfo() { @@ -84,7 +84,7 @@ public boolean hasChallengeInfo() { } /** - * optional .ChallengeInfo challenge_info = 9; + * optional .ChallengeInfo challenge_info = 14; * @return this */ public GetCurChallengeScRsp clearChallengeInfo() { @@ -94,7 +94,7 @@ public GetCurChallengeScRsp clearChallengeInfo() { } /** - * optional .ChallengeInfo challenge_info = 9; + * optional .ChallengeInfo challenge_info = 14; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -108,7 +108,7 @@ public ChallengeInfoOuterClass.ChallengeInfo getChallengeInfo() { } /** - * optional .ChallengeInfo challenge_info = 9; + * optional .ChallengeInfo challenge_info = 14; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -122,7 +122,7 @@ public ChallengeInfoOuterClass.ChallengeInfo getMutableChallengeInfo() { } /** - * optional .ChallengeInfo challenge_info = 9; + * optional .ChallengeInfo challenge_info = 14; * @param value the challengeInfo to set * @return this */ @@ -199,11 +199,11 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 74); + output.writeRawByte((byte) 114); output.writeMessageNoTag(challengeInfo); } } @@ -227,16 +227,16 @@ public GetCurChallengeScRsp mergeFrom(final ProtoSource input) throws IOExceptio int tag = input.readTag(); while (true) { switch (tag) { - case 40: { + case 120: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 74) { + if (tag != 114) { break; } } - case 74: { + case 114: { // challengeInfo input.readMessage(challengeInfo); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/GetCurLineupDataScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetCurLineupDataScRspOuterClass.java index c4f350582..28370e7d2 100644 --- a/src/generated/main/emu/lunarcore/proto/GetCurLineupDataScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetCurLineupDataScRspOuterClass.java @@ -19,12 +19,12 @@ public static final class GetCurLineupDataScRsp extends ProtoMessageoptional uint32 retcode = 7; + * optional uint32 retcode = 1; */ private int retcode; /** - * optional .LineupInfo lineup = 2; + * optional .LineupInfo lineup = 15; */ private final LineupInfoOuterClass.LineupInfo lineup = LineupInfoOuterClass.LineupInfo.newInstance(); @@ -39,7 +39,7 @@ public static GetCurLineupDataScRsp newInstance() { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 1; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public boolean hasRetcode() { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 1; * @return this */ public GetCurLineupDataScRsp clearRetcode() { @@ -57,7 +57,7 @@ public GetCurLineupDataScRsp clearRetcode() { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 1; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public int getRetcode() { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 1; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public GetCurLineupDataScRsp setRetcode(final int value) { } /** - * optional .LineupInfo lineup = 2; + * optional .LineupInfo lineup = 15; * @return whether the lineup field is set */ public boolean hasLineup() { @@ -84,7 +84,7 @@ public boolean hasLineup() { } /** - * optional .LineupInfo lineup = 2; + * optional .LineupInfo lineup = 15; * @return this */ public GetCurLineupDataScRsp clearLineup() { @@ -94,7 +94,7 @@ public GetCurLineupDataScRsp clearLineup() { } /** - * optional .LineupInfo lineup = 2; + * optional .LineupInfo lineup = 15; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -108,7 +108,7 @@ public LineupInfoOuterClass.LineupInfo getLineup() { } /** - * optional .LineupInfo lineup = 2; + * optional .LineupInfo lineup = 15; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -122,7 +122,7 @@ public LineupInfoOuterClass.LineupInfo getMutableLineup() { } /** - * optional .LineupInfo lineup = 2; + * optional .LineupInfo lineup = 15; * @param value the lineup to set * @return this */ @@ -198,11 +198,11 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 18); + output.writeRawByte((byte) 122); output.writeMessageNoTag(lineup); } } @@ -226,16 +226,16 @@ public GetCurLineupDataScRsp mergeFrom(final ProtoSource input) throws IOExcepti int tag = input.readTag(); while (true) { switch (tag) { - case 56: { + case 8: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 18) { + if (tag != 122) { break; } } - case 18: { + case 122: { // lineup input.readMessage(lineup); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/GetCurSceneInfoScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetCurSceneInfoScRspOuterClass.java index 3d803ebd7..73cf85e00 100644 --- a/src/generated/main/emu/lunarcore/proto/GetCurSceneInfoScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetCurSceneInfoScRspOuterClass.java @@ -19,12 +19,12 @@ public static final class GetCurSceneInfoScRsp extends ProtoMessageoptional uint32 retcode = 1; + * optional uint32 retcode = 15; */ private int retcode; /** - * optional .SceneInfo scene = 15; + * optional .SceneInfo scene = 13; */ private final SceneInfoOuterClass.SceneInfo scene = SceneInfoOuterClass.SceneInfo.newInstance(); @@ -39,7 +39,7 @@ public static GetCurSceneInfoScRsp newInstance() { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 15; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public boolean hasRetcode() { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 15; * @return this */ public GetCurSceneInfoScRsp clearRetcode() { @@ -57,7 +57,7 @@ public GetCurSceneInfoScRsp clearRetcode() { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 15; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public int getRetcode() { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 15; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public GetCurSceneInfoScRsp setRetcode(final int value) { } /** - * optional .SceneInfo scene = 15; + * optional .SceneInfo scene = 13; * @return whether the scene field is set */ public boolean hasScene() { @@ -84,7 +84,7 @@ public boolean hasScene() { } /** - * optional .SceneInfo scene = 15; + * optional .SceneInfo scene = 13; * @return this */ public GetCurSceneInfoScRsp clearScene() { @@ -94,7 +94,7 @@ public GetCurSceneInfoScRsp clearScene() { } /** - * optional .SceneInfo scene = 15; + * optional .SceneInfo scene = 13; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -108,7 +108,7 @@ public SceneInfoOuterClass.SceneInfo getScene() { } /** - * optional .SceneInfo scene = 15; + * optional .SceneInfo scene = 13; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -122,7 +122,7 @@ public SceneInfoOuterClass.SceneInfo getMutableScene() { } /** - * optional .SceneInfo scene = 15; + * optional .SceneInfo scene = 13; * @param value the scene to set * @return this */ @@ -198,11 +198,11 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 122); + output.writeRawByte((byte) 106); output.writeMessageNoTag(scene); } } @@ -226,16 +226,16 @@ public GetCurSceneInfoScRsp mergeFrom(final ProtoSource input) throws IOExceptio int tag = input.readTag(); while (true) { switch (tag) { - case 8: { + case 120: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 122) { + if (tag != 106) { break; } } - case 122: { + case 106: { // scene input.readMessage(scene); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/GetDailyActiveInfoScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetDailyActiveInfoScRspOuterClass.java index 33da32264..60ed7d231 100644 --- a/src/generated/main/emu/lunarcore/proto/GetDailyActiveInfoScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetDailyActiveInfoScRspOuterClass.java @@ -21,12 +21,12 @@ public static final class GetDailyActiveInfoScRsp extends ProtoMessageoptional uint32 daily_active_point = 9; + * optional uint32 daily_active_point = 4; */ private int dailyActivePoint; /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 6; */ private int retcode; @@ -51,7 +51,7 @@ public static GetDailyActiveInfoScRsp newInstance() { } /** - * optional uint32 daily_active_point = 9; + * optional uint32 daily_active_point = 4; * @return whether the dailyActivePoint field is set */ public boolean hasDailyActivePoint() { @@ -59,7 +59,7 @@ public boolean hasDailyActivePoint() { } /** - * optional uint32 daily_active_point = 9; + * optional uint32 daily_active_point = 4; * @return this */ public GetDailyActiveInfoScRsp clearDailyActivePoint() { @@ -69,7 +69,7 @@ public GetDailyActiveInfoScRsp clearDailyActivePoint() { } /** - * optional uint32 daily_active_point = 9; + * optional uint32 daily_active_point = 4; * @return the dailyActivePoint */ public int getDailyActivePoint() { @@ -77,7 +77,7 @@ public int getDailyActivePoint() { } /** - * optional uint32 daily_active_point = 9; + * optional uint32 daily_active_point = 4; * @param value the dailyActivePoint to set * @return this */ @@ -88,7 +88,7 @@ public GetDailyActiveInfoScRsp setDailyActivePoint(final int value) { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 6; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -96,7 +96,7 @@ public boolean hasRetcode() { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 6; * @return this */ public GetDailyActiveInfoScRsp clearRetcode() { @@ -106,7 +106,7 @@ public GetDailyActiveInfoScRsp clearRetcode() { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 6; * @return the retcode */ public int getRetcode() { @@ -114,7 +114,7 @@ public int getRetcode() { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 6; * @param value the retcode to set * @return this */ @@ -343,11 +343,11 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(dailyActivePoint); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { @@ -389,16 +389,16 @@ public GetDailyActiveInfoScRsp mergeFrom(final ProtoSource input) throws IOExcep int tag = input.readTag(); while (true) { switch (tag) { - case 72: { + case 32: { // dailyActivePoint dailyActivePoint = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 96) { + if (tag != 48) { break; } } - case 96: { + case 48: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/GetEnteredSceneScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetEnteredSceneScRspOuterClass.java index 9506cc429..c3c3fdbee 100644 --- a/src/generated/main/emu/lunarcore/proto/GetEnteredSceneScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetEnteredSceneScRspOuterClass.java @@ -20,12 +20,12 @@ public static final class GetEnteredSceneScRsp extends ProtoMessageoptional uint32 retcode = 3; + * optional uint32 retcode = 11; */ private int retcode; /** - * repeated .EnteredSceneInfo entered_scene_info = 4; + * repeated .EnteredSceneInfo entered_scene_info = 6; */ private final RepeatedMessage enteredSceneInfo = RepeatedMessage.newEmptyInstance(EnteredSceneInfoOuterClass.EnteredSceneInfo.getFactory()); @@ -40,7 +40,7 @@ public static GetEnteredSceneScRsp newInstance() { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 11; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -48,7 +48,7 @@ public boolean hasRetcode() { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 11; * @return this */ public GetEnteredSceneScRsp clearRetcode() { @@ -58,7 +58,7 @@ public GetEnteredSceneScRsp clearRetcode() { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 11; * @return the retcode */ public int getRetcode() { @@ -66,7 +66,7 @@ public int getRetcode() { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 11; * @param value the retcode to set * @return this */ @@ -77,7 +77,7 @@ public GetEnteredSceneScRsp setRetcode(final int value) { } /** - * repeated .EnteredSceneInfo entered_scene_info = 4; + * repeated .EnteredSceneInfo entered_scene_info = 6; * @return whether the enteredSceneInfo field is set */ public boolean hasEnteredSceneInfo() { @@ -85,7 +85,7 @@ public boolean hasEnteredSceneInfo() { } /** - * repeated .EnteredSceneInfo entered_scene_info = 4; + * repeated .EnteredSceneInfo entered_scene_info = 6; * @return this */ public GetEnteredSceneScRsp clearEnteredSceneInfo() { @@ -95,7 +95,7 @@ public GetEnteredSceneScRsp clearEnteredSceneInfo() { } /** - * repeated .EnteredSceneInfo entered_scene_info = 4; + * repeated .EnteredSceneInfo entered_scene_info = 6; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -109,7 +109,7 @@ public RepeatedMessage getEnteredSc } /** - * repeated .EnteredSceneInfo entered_scene_info = 4; + * repeated .EnteredSceneInfo entered_scene_info = 6; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -124,7 +124,7 @@ public RepeatedMessage getMutableEn } /** - * repeated .EnteredSceneInfo entered_scene_info = 4; + * repeated .EnteredSceneInfo entered_scene_info = 6; * @param value the enteredSceneInfo to add * @return this */ @@ -136,7 +136,7 @@ public GetEnteredSceneScRsp addEnteredSceneInfo( } /** - * repeated .EnteredSceneInfo entered_scene_info = 4; + * repeated .EnteredSceneInfo entered_scene_info = 6; * @param values the enteredSceneInfo to add * @return this */ @@ -213,12 +213,12 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < enteredSceneInfo.length(); i++) { - output.writeRawByte((byte) 34); + output.writeRawByte((byte) 50); output.writeMessageNoTag(enteredSceneInfo.get(i)); } } @@ -243,16 +243,16 @@ public GetEnteredSceneScRsp mergeFrom(final ProtoSource input) throws IOExceptio int tag = input.readTag(); while (true) { switch (tag) { - case 24: { + case 88: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 34) { + if (tag != 50) { break; } } - case 34: { + case 50: { // enteredSceneInfo tag = input.readRepeatedMessage(enteredSceneInfo, tag); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/GetFirstTalkByPerformanceNpcCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetFirstTalkByPerformanceNpcCsReqOuterClass.java index 5340f10ef..789832d36 100644 --- a/src/generated/main/emu/lunarcore/proto/GetFirstTalkByPerformanceNpcCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetFirstTalkByPerformanceNpcCsReqOuterClass.java @@ -20,7 +20,7 @@ public static final class GetFirstTalkByPerformanceNpcCsReq extends ProtoMessage private static final long serialVersionUID = 0L; /** - * repeated uint32 npc_talk_list = 2; + * repeated uint32 npc_talk_list = 6; */ private final RepeatedInt npcTalkList = RepeatedInt.newEmptyInstance(); @@ -35,7 +35,7 @@ public static GetFirstTalkByPerformanceNpcCsReq newInstance() { } /** - * repeated uint32 npc_talk_list = 2; + * repeated uint32 npc_talk_list = 6; * @return whether the npcTalkList field is set */ public boolean hasNpcTalkList() { @@ -43,7 +43,7 @@ public boolean hasNpcTalkList() { } /** - * repeated uint32 npc_talk_list = 2; + * repeated uint32 npc_talk_list = 6; * @return this */ public GetFirstTalkByPerformanceNpcCsReq clearNpcTalkList() { @@ -53,7 +53,7 @@ public GetFirstTalkByPerformanceNpcCsReq clearNpcTalkList() { } /** - * repeated uint32 npc_talk_list = 2; + * repeated uint32 npc_talk_list = 6; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -67,7 +67,7 @@ public RepeatedInt getNpcTalkList() { } /** - * repeated uint32 npc_talk_list = 2; + * repeated uint32 npc_talk_list = 6; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -81,7 +81,7 @@ public RepeatedInt getMutableNpcTalkList() { } /** - * repeated uint32 npc_talk_list = 2; + * repeated uint32 npc_talk_list = 6; * @param value the npcTalkList to add * @return this */ @@ -92,7 +92,7 @@ public GetFirstTalkByPerformanceNpcCsReq addNpcTalkList(final int value) { } /** - * repeated uint32 npc_talk_list = 2; + * repeated uint32 npc_talk_list = 6; * @param values the npcTalkList to add * @return this */ @@ -165,7 +165,7 @@ public boolean equals(Object o) { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { for (int i = 0; i < npcTalkList.length(); i++) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(npcTalkList.array()[i]); } } @@ -187,7 +187,7 @@ public GetFirstTalkByPerformanceNpcCsReq mergeFrom(final ProtoSource input) thro int tag = input.readTag(); while (true) { switch (tag) { - case 18: { + case 50: { // npcTalkList [packed=true] input.readPackedUInt32(npcTalkList, tag); bitField0_ |= 0x00000001; @@ -206,7 +206,7 @@ public GetFirstTalkByPerformanceNpcCsReq mergeFrom(final ProtoSource input) thro tag = input.readTag(); break; } - case 16: { + case 48: { // npcTalkList [packed=false] tag = input.readRepeatedUInt32(npcTalkList, tag); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/GetFirstTalkByPerformanceNpcScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetFirstTalkByPerformanceNpcScRspOuterClass.java index 811b5c2a8..f8b2d1c69 100644 --- a/src/generated/main/emu/lunarcore/proto/GetFirstTalkByPerformanceNpcScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetFirstTalkByPerformanceNpcScRspOuterClass.java @@ -20,12 +20,12 @@ public static final class GetFirstTalkByPerformanceNpcScRsp extends ProtoMessage private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 14; */ private int retcode; /** - * repeated .NpcTalkInfo npc_talk_info_list = 11; + * repeated .NpcTalkInfo npc_talk_info_list = 4; */ private final RepeatedMessage npcTalkInfoList = RepeatedMessage.newEmptyInstance(NpcTalkInfoOuterClass.NpcTalkInfo.getFactory()); @@ -40,7 +40,7 @@ public static GetFirstTalkByPerformanceNpcScRsp newInstance() { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 14; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -48,7 +48,7 @@ public boolean hasRetcode() { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 14; * @return this */ public GetFirstTalkByPerformanceNpcScRsp clearRetcode() { @@ -58,7 +58,7 @@ public GetFirstTalkByPerformanceNpcScRsp clearRetcode() { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 14; * @return the retcode */ public int getRetcode() { @@ -66,7 +66,7 @@ public int getRetcode() { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 14; * @param value the retcode to set * @return this */ @@ -77,7 +77,7 @@ public GetFirstTalkByPerformanceNpcScRsp setRetcode(final int value) { } /** - * repeated .NpcTalkInfo npc_talk_info_list = 11; + * repeated .NpcTalkInfo npc_talk_info_list = 4; * @return whether the npcTalkInfoList field is set */ public boolean hasNpcTalkInfoList() { @@ -85,7 +85,7 @@ public boolean hasNpcTalkInfoList() { } /** - * repeated .NpcTalkInfo npc_talk_info_list = 11; + * repeated .NpcTalkInfo npc_talk_info_list = 4; * @return this */ public GetFirstTalkByPerformanceNpcScRsp clearNpcTalkInfoList() { @@ -95,7 +95,7 @@ public GetFirstTalkByPerformanceNpcScRsp clearNpcTalkInfoList() { } /** - * repeated .NpcTalkInfo npc_talk_info_list = 11; + * repeated .NpcTalkInfo npc_talk_info_list = 4; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -109,7 +109,7 @@ public RepeatedMessage getNpcTalkInfoList() { } /** - * repeated .NpcTalkInfo npc_talk_info_list = 11; + * repeated .NpcTalkInfo npc_talk_info_list = 4; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -123,7 +123,7 @@ public RepeatedMessage getMutableNpcTalkInfoL } /** - * repeated .NpcTalkInfo npc_talk_info_list = 11; + * repeated .NpcTalkInfo npc_talk_info_list = 4; * @param value the npcTalkInfoList to add * @return this */ @@ -135,7 +135,7 @@ public GetFirstTalkByPerformanceNpcScRsp addNpcTalkInfoList( } /** - * repeated .NpcTalkInfo npc_talk_info_list = 11; + * repeated .NpcTalkInfo npc_talk_info_list = 4; * @param values the npcTalkInfoList to add * @return this */ @@ -214,12 +214,12 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < npcTalkInfoList.length(); i++) { - output.writeRawByte((byte) 90); + output.writeRawByte((byte) 34); output.writeMessageNoTag(npcTalkInfoList.get(i)); } } @@ -244,16 +244,16 @@ public GetFirstTalkByPerformanceNpcScRsp mergeFrom(final ProtoSource input) thro int tag = input.readTag(); while (true) { switch (tag) { - case 64: { + case 112: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 90) { + if (tag != 34) { break; } } - case 90: { + case 34: { // npcTalkInfoList tag = input.readRepeatedMessage(npcTalkInfoList, tag); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/GetFriendApplyListInfoScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetFriendApplyListInfoScRspOuterClass.java index 02c9f3619..75c2a1e2b 100644 --- a/src/generated/main/emu/lunarcore/proto/GetFriendApplyListInfoScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetFriendApplyListInfoScRspOuterClass.java @@ -20,12 +20,12 @@ public static final class GetFriendApplyListInfoScRsp extends ProtoMessageoptional uint32 retcode = 3; + * optional uint32 retcode = 9; */ private int retcode; /** - * repeated .FriendApplyInfo friend_apply_list = 1; + * repeated .FriendApplyInfo friend_apply_list = 5; */ private final RepeatedMessage friendApplyList = RepeatedMessage.newEmptyInstance(FriendApplyInfoOuterClass.FriendApplyInfo.getFactory()); @@ -40,7 +40,7 @@ public static GetFriendApplyListInfoScRsp newInstance() { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 9; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -48,7 +48,7 @@ public boolean hasRetcode() { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 9; * @return this */ public GetFriendApplyListInfoScRsp clearRetcode() { @@ -58,7 +58,7 @@ public GetFriendApplyListInfoScRsp clearRetcode() { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 9; * @return the retcode */ public int getRetcode() { @@ -66,7 +66,7 @@ public int getRetcode() { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 9; * @param value the retcode to set * @return this */ @@ -77,7 +77,7 @@ public GetFriendApplyListInfoScRsp setRetcode(final int value) { } /** - * repeated .FriendApplyInfo friend_apply_list = 1; + * repeated .FriendApplyInfo friend_apply_list = 5; * @return whether the friendApplyList field is set */ public boolean hasFriendApplyList() { @@ -85,7 +85,7 @@ public boolean hasFriendApplyList() { } /** - * repeated .FriendApplyInfo friend_apply_list = 1; + * repeated .FriendApplyInfo friend_apply_list = 5; * @return this */ public GetFriendApplyListInfoScRsp clearFriendApplyList() { @@ -95,7 +95,7 @@ public GetFriendApplyListInfoScRsp clearFriendApplyList() { } /** - * repeated .FriendApplyInfo friend_apply_list = 1; + * repeated .FriendApplyInfo friend_apply_list = 5; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -109,7 +109,7 @@ public RepeatedMessage getFriendApply } /** - * repeated .FriendApplyInfo friend_apply_list = 1; + * repeated .FriendApplyInfo friend_apply_list = 5; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -123,7 +123,7 @@ public RepeatedMessage getMutableFrie } /** - * repeated .FriendApplyInfo friend_apply_list = 1; + * repeated .FriendApplyInfo friend_apply_list = 5; * @param value the friendApplyList to add * @return this */ @@ -135,7 +135,7 @@ public GetFriendApplyListInfoScRsp addFriendApplyList( } /** - * repeated .FriendApplyInfo friend_apply_list = 1; + * repeated .FriendApplyInfo friend_apply_list = 5; * @param values the friendApplyList to add * @return this */ @@ -212,12 +212,12 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < friendApplyList.length(); i++) { - output.writeRawByte((byte) 10); + output.writeRawByte((byte) 42); output.writeMessageNoTag(friendApplyList.get(i)); } } @@ -242,16 +242,16 @@ public GetFriendApplyListInfoScRsp mergeFrom(final ProtoSource input) throws IOE int tag = input.readTag(); while (true) { switch (tag) { - case 24: { + case 72: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 10) { + if (tag != 42) { break; } } - case 10: { + case 42: { // friendApplyList tag = input.readRepeatedMessage(friendApplyList, tag); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/GetFriendListInfoScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetFriendListInfoScRspOuterClass.java index e3af62198..a879dd3cc 100644 --- a/src/generated/main/emu/lunarcore/proto/GetFriendListInfoScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetFriendListInfoScRspOuterClass.java @@ -20,17 +20,12 @@ public static final class GetFriendListInfoScRsp extends ProtoMessageoptional uint32 retcode = 14; + * optional uint32 retcode = 6; */ private int retcode; /** - * repeated .SimpleInfo simple_info = 1; - */ - private final RepeatedMessage simpleInfo = RepeatedMessage.newEmptyInstance(SimpleInfoOuterClass.SimpleInfo.getFactory()); - - /** - * repeated .FriendListInfo friend_list = 3; + * repeated .FriendListInfo friend_list = 2; */ private final RepeatedMessage friendList = RepeatedMessage.newEmptyInstance(FriendListInfoOuterClass.FriendListInfo.getFactory()); @@ -45,7 +40,7 @@ public static GetFriendListInfoScRsp newInstance() { } /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 6; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -53,7 +48,7 @@ public boolean hasRetcode() { } /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 6; * @return this */ public GetFriendListInfoScRsp clearRetcode() { @@ -63,7 +58,7 @@ public GetFriendListInfoScRsp clearRetcode() { } /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 6; * @return the retcode */ public int getRetcode() { @@ -71,7 +66,7 @@ public int getRetcode() { } /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 6; * @param value the retcode to set * @return this */ @@ -82,94 +77,25 @@ public GetFriendListInfoScRsp setRetcode(final int value) { } /** - * repeated .SimpleInfo simple_info = 1; - * @return whether the simpleInfo field is set - */ - public boolean hasSimpleInfo() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * repeated .SimpleInfo simple_info = 1; - * @return this - */ - public GetFriendListInfoScRsp clearSimpleInfo() { - bitField0_ &= ~0x00000002; - simpleInfo.clear(); - return this; - } - - /** - * repeated .SimpleInfo simple_info = 1; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * Use {@link #getMutableSimpleInfo()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedMessage getSimpleInfo() { - return simpleInfo; - } - - /** - * repeated .SimpleInfo simple_info = 1; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public RepeatedMessage getMutableSimpleInfo() { - bitField0_ |= 0x00000002; - return simpleInfo; - } - - /** - * repeated .SimpleInfo simple_info = 1; - * @param value the simpleInfo to add - * @return this - */ - public GetFriendListInfoScRsp addSimpleInfo(final SimpleInfoOuterClass.SimpleInfo value) { - bitField0_ |= 0x00000002; - simpleInfo.add(value); - return this; - } - - /** - * repeated .SimpleInfo simple_info = 1; - * @param values the simpleInfo to add - * @return this - */ - public GetFriendListInfoScRsp addAllSimpleInfo( - final SimpleInfoOuterClass.SimpleInfo... values) { - bitField0_ |= 0x00000002; - simpleInfo.addAll(values); - return this; - } - - /** - * repeated .FriendListInfo friend_list = 3; + * repeated .FriendListInfo friend_list = 2; * @return whether the friendList field is set */ public boolean hasFriendList() { - return (bitField0_ & 0x00000004) != 0; + return (bitField0_ & 0x00000002) != 0; } /** - * repeated .FriendListInfo friend_list = 3; + * repeated .FriendListInfo friend_list = 2; * @return this */ public GetFriendListInfoScRsp clearFriendList() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; friendList.clear(); return this; } /** - * repeated .FriendListInfo friend_list = 3; + * repeated .FriendListInfo friend_list = 2; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -183,7 +109,7 @@ public RepeatedMessage getFriendList() } /** - * repeated .FriendListInfo friend_list = 3; + * repeated .FriendListInfo friend_list = 2; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -192,30 +118,30 @@ public RepeatedMessage getFriendList() * @return internal storage object for modifications */ public RepeatedMessage getMutableFriendList() { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; return friendList; } /** - * repeated .FriendListInfo friend_list = 3; + * repeated .FriendListInfo friend_list = 2; * @param value the friendList to add * @return this */ public GetFriendListInfoScRsp addFriendList( final FriendListInfoOuterClass.FriendListInfo value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; friendList.add(value); return this; } /** - * repeated .FriendListInfo friend_list = 3; + * repeated .FriendListInfo friend_list = 2; * @param values the friendList to add * @return this */ public GetFriendListInfoScRsp addAllFriendList( final FriendListInfoOuterClass.FriendListInfo... values) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; friendList.addAll(values); return this; } @@ -226,7 +152,6 @@ public GetFriendListInfoScRsp copyFrom(final GetFriendListInfoScRsp other) { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; retcode = other.retcode; - simpleInfo.copyFrom(other.simpleInfo); friendList.copyFrom(other.friendList); } return this; @@ -241,9 +166,6 @@ public GetFriendListInfoScRsp mergeFrom(final GetFriendListInfoScRsp other) { if (other.hasRetcode()) { setRetcode(other.retcode); } - if (other.hasSimpleInfo()) { - getMutableSimpleInfo().addAll(other.simpleInfo); - } if (other.hasFriendList()) { getMutableFriendList().addAll(other.friendList); } @@ -258,7 +180,6 @@ public GetFriendListInfoScRsp clear() { cachedSize = -1; bitField0_ = 0; retcode = 0; - simpleInfo.clear(); friendList.clear(); return this; } @@ -270,7 +191,6 @@ public GetFriendListInfoScRsp clearQuick() { } cachedSize = -1; bitField0_ = 0; - simpleInfo.clearQuick(); friendList.clearQuick(); return this; } @@ -286,25 +206,18 @@ public boolean equals(Object o) { GetFriendListInfoScRsp other = (GetFriendListInfoScRsp) o; return bitField0_ == other.bitField0_ && (!hasRetcode() || retcode == other.retcode) - && (!hasSimpleInfo() || simpleInfo.equals(other.simpleInfo)) && (!hasFriendList() || friendList.equals(other.friendList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - for (int i = 0; i < simpleInfo.length(); i++) { - output.writeRawByte((byte) 10); - output.writeMessageNoTag(simpleInfo.get(i)); - } - } - if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < friendList.length(); i++) { - output.writeRawByte((byte) 26); + output.writeRawByte((byte) 18); output.writeMessageNoTag(friendList.get(i)); } } @@ -317,9 +230,6 @@ protected int computeSerializedSize() { size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - size += (1 * simpleInfo.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(simpleInfo); - } - if ((bitField0_ & 0x00000004) != 0) { size += (1 * friendList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(friendList); } return size; @@ -332,27 +242,19 @@ public GetFriendListInfoScRsp mergeFrom(final ProtoSource input) throws IOExcept int tag = input.readTag(); while (true) { switch (tag) { - case 112: { + case 48: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 10) { + if (tag != 18) { break; } } - case 10: { - // simpleInfo - tag = input.readRepeatedMessage(simpleInfo, tag); - bitField0_ |= 0x00000002; - if (tag != 26) { - break; - } - } - case 26: { + case 18: { // friendList tag = input.readRepeatedMessage(friendList, tag); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; if (tag != 0) { break; } @@ -378,9 +280,6 @@ public void writeTo(final JsonSink output) throws IOException { output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRepeatedMessage(FieldNames.simpleInfo, simpleInfo); - } - if ((bitField0_ & 0x00000004) != 0) { output.writeRepeatedMessage(FieldNames.friendList, friendList); } output.endObject(); @@ -404,24 +303,12 @@ public GetFriendListInfoScRsp mergeFrom(final JsonSource input) throws IOExcepti } break; } - case -1431903872: - case -1419171045: { - if (input.isAtField(FieldNames.simpleInfo)) { - if (!input.trySkipNullValue()) { - input.readRepeatedMessage(simpleInfo); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } case -1756909476: case 1388007839: { if (input.isAtField(FieldNames.friendList)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(friendList); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; } } else { input.skipUnknownField(); @@ -483,8 +370,6 @@ public GetFriendListInfoScRsp create() { static class FieldNames { static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName simpleInfo = FieldName.forField("simpleInfo", "simple_info"); - static final FieldName friendList = FieldName.forField("friendList", "friend_list"); } } diff --git a/src/generated/main/emu/lunarcore/proto/GetFriendLoginInfoScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetFriendLoginInfoScRspOuterClass.java index 83e99f063..9676d8450 100644 --- a/src/generated/main/emu/lunarcore/proto/GetFriendLoginInfoScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetFriendLoginInfoScRspOuterClass.java @@ -20,19 +20,19 @@ public static final class GetFriendLoginInfoScRsp extends ProtoMessageoptional uint32 retcode = 11; + * optional uint32 retcode = 4; */ private int retcode; /** - * repeated uint32 friend_uid_list = 5; + * repeated uint32 friend_uid_list = 11; */ private final RepeatedInt friendUidList = RepeatedInt.newEmptyInstance(); /** - * repeated uint32 black_uid_list = 15; + * repeated uint32 DKOGBHPIFKJ = 12; */ - private final RepeatedInt blackUidList = RepeatedInt.newEmptyInstance(); + private final RepeatedInt dKOGBHPIFKJ = RepeatedInt.newEmptyInstance(); private GetFriendLoginInfoScRsp() { } @@ -45,7 +45,7 @@ public static GetFriendLoginInfoScRsp newInstance() { } /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 4; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -53,7 +53,7 @@ public boolean hasRetcode() { } /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 4; * @return this */ public GetFriendLoginInfoScRsp clearRetcode() { @@ -63,7 +63,7 @@ public GetFriendLoginInfoScRsp clearRetcode() { } /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 4; * @return the retcode */ public int getRetcode() { @@ -71,7 +71,7 @@ public int getRetcode() { } /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 4; * @param value the retcode to set * @return this */ @@ -82,7 +82,7 @@ public GetFriendLoginInfoScRsp setRetcode(final int value) { } /** - * repeated uint32 friend_uid_list = 5; + * repeated uint32 friend_uid_list = 11; * @return whether the friendUidList field is set */ public boolean hasFriendUidList() { @@ -90,7 +90,7 @@ public boolean hasFriendUidList() { } /** - * repeated uint32 friend_uid_list = 5; + * repeated uint32 friend_uid_list = 11; * @return this */ public GetFriendLoginInfoScRsp clearFriendUidList() { @@ -100,7 +100,7 @@ public GetFriendLoginInfoScRsp clearFriendUidList() { } /** - * repeated uint32 friend_uid_list = 5; + * repeated uint32 friend_uid_list = 11; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -114,7 +114,7 @@ public RepeatedInt getFriendUidList() { } /** - * repeated uint32 friend_uid_list = 5; + * repeated uint32 friend_uid_list = 11; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -128,7 +128,7 @@ public RepeatedInt getMutableFriendUidList() { } /** - * repeated uint32 friend_uid_list = 5; + * repeated uint32 friend_uid_list = 11; * @param value the friendUidList to add * @return this */ @@ -139,7 +139,7 @@ public GetFriendLoginInfoScRsp addFriendUidList(final int value) { } /** - * repeated uint32 friend_uid_list = 5; + * repeated uint32 friend_uid_list = 11; * @param values the friendUidList to add * @return this */ @@ -150,39 +150,39 @@ public GetFriendLoginInfoScRsp addAllFriendUidList(final int... values) { } /** - * repeated uint32 black_uid_list = 15; - * @return whether the blackUidList field is set + * repeated uint32 DKOGBHPIFKJ = 12; + * @return whether the dKOGBHPIFKJ field is set */ - public boolean hasBlackUidList() { + public boolean hasDKOGBHPIFKJ() { return (bitField0_ & 0x00000004) != 0; } /** - * repeated uint32 black_uid_list = 15; + * repeated uint32 DKOGBHPIFKJ = 12; * @return this */ - public GetFriendLoginInfoScRsp clearBlackUidList() { + public GetFriendLoginInfoScRsp clearDKOGBHPIFKJ() { bitField0_ &= ~0x00000004; - blackUidList.clear(); + dKOGBHPIFKJ.clear(); return this; } /** - * repeated uint32 black_uid_list = 15; + * repeated uint32 DKOGBHPIFKJ = 12; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. * - * Use {@link #getMutableBlackUidList()} if you want to modify it. + * Use {@link #getMutableDKOGBHPIFKJ()} if you want to modify it. * * @return internal storage object for reading */ - public RepeatedInt getBlackUidList() { - return blackUidList; + public RepeatedInt getDKOGBHPIFKJ() { + return dKOGBHPIFKJ; } /** - * repeated uint32 black_uid_list = 15; + * repeated uint32 DKOGBHPIFKJ = 12; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -190,30 +190,30 @@ public RepeatedInt getBlackUidList() { * * @return internal storage object for modifications */ - public RepeatedInt getMutableBlackUidList() { + public RepeatedInt getMutableDKOGBHPIFKJ() { bitField0_ |= 0x00000004; - return blackUidList; + return dKOGBHPIFKJ; } /** - * repeated uint32 black_uid_list = 15; - * @param value the blackUidList to add + * repeated uint32 DKOGBHPIFKJ = 12; + * @param value the dKOGBHPIFKJ to add * @return this */ - public GetFriendLoginInfoScRsp addBlackUidList(final int value) { + public GetFriendLoginInfoScRsp addDKOGBHPIFKJ(final int value) { bitField0_ |= 0x00000004; - blackUidList.add(value); + dKOGBHPIFKJ.add(value); return this; } /** - * repeated uint32 black_uid_list = 15; - * @param values the blackUidList to add + * repeated uint32 DKOGBHPIFKJ = 12; + * @param values the dKOGBHPIFKJ to add * @return this */ - public GetFriendLoginInfoScRsp addAllBlackUidList(final int... values) { + public GetFriendLoginInfoScRsp addAllDKOGBHPIFKJ(final int... values) { bitField0_ |= 0x00000004; - blackUidList.addAll(values); + dKOGBHPIFKJ.addAll(values); return this; } @@ -224,7 +224,7 @@ public GetFriendLoginInfoScRsp copyFrom(final GetFriendLoginInfoScRsp other) { bitField0_ = other.bitField0_; retcode = other.retcode; friendUidList.copyFrom(other.friendUidList); - blackUidList.copyFrom(other.blackUidList); + dKOGBHPIFKJ.copyFrom(other.dKOGBHPIFKJ); } return this; } @@ -241,8 +241,8 @@ public GetFriendLoginInfoScRsp mergeFrom(final GetFriendLoginInfoScRsp other) { if (other.hasFriendUidList()) { getMutableFriendUidList().addAll(other.friendUidList); } - if (other.hasBlackUidList()) { - getMutableBlackUidList().addAll(other.blackUidList); + if (other.hasDKOGBHPIFKJ()) { + getMutableDKOGBHPIFKJ().addAll(other.dKOGBHPIFKJ); } return this; } @@ -256,7 +256,7 @@ public GetFriendLoginInfoScRsp clear() { bitField0_ = 0; retcode = 0; friendUidList.clear(); - blackUidList.clear(); + dKOGBHPIFKJ.clear(); return this; } @@ -268,7 +268,7 @@ public GetFriendLoginInfoScRsp clearQuick() { cachedSize = -1; bitField0_ = 0; friendUidList.clear(); - blackUidList.clear(); + dKOGBHPIFKJ.clear(); return this; } @@ -284,25 +284,25 @@ public boolean equals(Object o) { return bitField0_ == other.bitField0_ && (!hasRetcode() || retcode == other.retcode) && (!hasFriendUidList() || friendUidList.equals(other.friendUidList)) - && (!hasBlackUidList() || blackUidList.equals(other.blackUidList)); + && (!hasDKOGBHPIFKJ() || dKOGBHPIFKJ.equals(other.dKOGBHPIFKJ)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < friendUidList.length(); i++) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(friendUidList.array()[i]); } } if ((bitField0_ & 0x00000004) != 0) { - for (int i = 0; i < blackUidList.length(); i++) { - output.writeRawByte((byte) 120); - output.writeUInt32NoTag(blackUidList.array()[i]); + for (int i = 0; i < dKOGBHPIFKJ.length(); i++) { + output.writeRawByte((byte) 96); + output.writeUInt32NoTag(dKOGBHPIFKJ.array()[i]); } } } @@ -317,7 +317,7 @@ protected int computeSerializedSize() { size += (1 * friendUidList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(friendUidList); } if ((bitField0_ & 0x00000004) != 0) { - size += (1 * blackUidList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(blackUidList); + size += (1 * dKOGBHPIFKJ.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(dKOGBHPIFKJ); } return size; } @@ -329,27 +329,27 @@ public GetFriendLoginInfoScRsp mergeFrom(final ProtoSource input) throws IOExcep int tag = input.readTag(); while (true) { switch (tag) { - case 88: { + case 32: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 42) { + if (tag != 90) { break; } } - case 42: { + case 90: { // friendUidList [packed=true] input.readPackedUInt32(friendUidList, tag); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 122) { + if (tag != 98) { break; } } - case 122: { - // blackUidList [packed=true] - input.readPackedUInt32(blackUidList, tag); + case 98: { + // dKOGBHPIFKJ [packed=true] + input.readPackedUInt32(dKOGBHPIFKJ, tag); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 0) { @@ -366,15 +366,15 @@ public GetFriendLoginInfoScRsp mergeFrom(final ProtoSource input) throws IOExcep tag = input.readTag(); break; } - case 40: { + case 88: { // friendUidList [packed=false] tag = input.readRepeatedUInt32(friendUidList, tag); bitField0_ |= 0x00000002; break; } - case 120: { - // blackUidList [packed=false] - tag = input.readRepeatedUInt32(blackUidList, tag); + case 96: { + // dKOGBHPIFKJ [packed=false] + tag = input.readRepeatedUInt32(dKOGBHPIFKJ, tag); bitField0_ |= 0x00000004; break; } @@ -392,7 +392,7 @@ public void writeTo(final JsonSink output) throws IOException { output.writeRepeatedUInt32(FieldNames.friendUidList, friendUidList); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRepeatedUInt32(FieldNames.blackUidList, blackUidList); + output.writeRepeatedUInt32(FieldNames.dKOGBHPIFKJ, dKOGBHPIFKJ); } output.endObject(); } @@ -427,11 +427,10 @@ public GetFriendLoginInfoScRsp mergeFrom(final JsonSource input) throws IOExcept } break; } - case 1562975247: - case -1854929043: { - if (input.isAtField(FieldNames.blackUidList)) { + case -778625657: { + if (input.isAtField(FieldNames.dKOGBHPIFKJ)) { if (!input.trySkipNullValue()) { - input.readRepeatedUInt32(blackUidList); + input.readRepeatedUInt32(dKOGBHPIFKJ); bitField0_ |= 0x00000004; } } else { @@ -496,7 +495,7 @@ static class FieldNames { static final FieldName friendUidList = FieldName.forField("friendUidList", "friend_uid_list"); - static final FieldName blackUidList = FieldName.forField("blackUidList", "black_uid_list"); + static final FieldName dKOGBHPIFKJ = FieldName.forField("DKOGBHPIFKJ"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/GetFriendRecommendListInfoScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetFriendRecommendListInfoScRspOuterClass.java index c5ce8f425..ef59c0b55 100644 --- a/src/generated/main/emu/lunarcore/proto/GetFriendRecommendListInfoScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetFriendRecommendListInfoScRspOuterClass.java @@ -20,12 +20,12 @@ public static final class GetFriendRecommendListInfoScRsp extends ProtoMessageoptional uint32 retcode = 3; + * optional uint32 retcode = 8; */ private int retcode; /** - * repeated .FriendRecommendInfo friend_recommend_list = 13; + * repeated .FriendRecommendInfo friend_recommend_list = 10; */ private final RepeatedMessage friendRecommendList = RepeatedMessage.newEmptyInstance(FriendRecommendInfoOuterClass.FriendRecommendInfo.getFactory()); @@ -40,7 +40,7 @@ public static GetFriendRecommendListInfoScRsp newInstance() { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 8; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -48,7 +48,7 @@ public boolean hasRetcode() { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 8; * @return this */ public GetFriendRecommendListInfoScRsp clearRetcode() { @@ -58,7 +58,7 @@ public GetFriendRecommendListInfoScRsp clearRetcode() { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 8; * @return the retcode */ public int getRetcode() { @@ -66,7 +66,7 @@ public int getRetcode() { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 8; * @param value the retcode to set * @return this */ @@ -77,7 +77,7 @@ public GetFriendRecommendListInfoScRsp setRetcode(final int value) { } /** - * repeated .FriendRecommendInfo friend_recommend_list = 13; + * repeated .FriendRecommendInfo friend_recommend_list = 10; * @return whether the friendRecommendList field is set */ public boolean hasFriendRecommendList() { @@ -85,7 +85,7 @@ public boolean hasFriendRecommendList() { } /** - * repeated .FriendRecommendInfo friend_recommend_list = 13; + * repeated .FriendRecommendInfo friend_recommend_list = 10; * @return this */ public GetFriendRecommendListInfoScRsp clearFriendRecommendList() { @@ -95,7 +95,7 @@ public GetFriendRecommendListInfoScRsp clearFriendRecommendList() { } /** - * repeated .FriendRecommendInfo friend_recommend_list = 13; + * repeated .FriendRecommendInfo friend_recommend_list = 10; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -110,7 +110,7 @@ public RepeatedMessage getFri } /** - * repeated .FriendRecommendInfo friend_recommend_list = 13; + * repeated .FriendRecommendInfo friend_recommend_list = 10; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -125,7 +125,7 @@ public RepeatedMessage getMut } /** - * repeated .FriendRecommendInfo friend_recommend_list = 13; + * repeated .FriendRecommendInfo friend_recommend_list = 10; * @param value the friendRecommendList to add * @return this */ @@ -137,7 +137,7 @@ public GetFriendRecommendListInfoScRsp addFriendRecommendList( } /** - * repeated .FriendRecommendInfo friend_recommend_list = 13; + * repeated .FriendRecommendInfo friend_recommend_list = 10; * @param values the friendRecommendList to add * @return this */ @@ -214,12 +214,12 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < friendRecommendList.length(); i++) { - output.writeRawByte((byte) 106); + output.writeRawByte((byte) 82); output.writeMessageNoTag(friendRecommendList.get(i)); } } @@ -244,16 +244,16 @@ public GetFriendRecommendListInfoScRsp mergeFrom(final ProtoSource input) throws int tag = input.readTag(); while (true) { switch (tag) { - case 24: { + case 64: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 106) { + if (tag != 82) { break; } } - case 106: { + case 82: { // friendRecommendList tag = input.readRepeatedMessage(friendRecommendList, tag); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/GetGachaCeilingCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetGachaCeilingCsReqOuterClass.java index a23ac56cb..ba29e9d22 100644 --- a/src/generated/main/emu/lunarcore/proto/GetGachaCeilingCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetGachaCeilingCsReqOuterClass.java @@ -19,7 +19,7 @@ public static final class GetGachaCeilingCsReq extends ProtoMessageoptional uint32 gacha_type = 10; + * optional uint32 gacha_type = 12; */ private int gachaType; @@ -34,7 +34,7 @@ public static GetGachaCeilingCsReq newInstance() { } /** - * optional uint32 gacha_type = 10; + * optional uint32 gacha_type = 12; * @return whether the gachaType field is set */ public boolean hasGachaType() { @@ -42,7 +42,7 @@ public boolean hasGachaType() { } /** - * optional uint32 gacha_type = 10; + * optional uint32 gacha_type = 12; * @return this */ public GetGachaCeilingCsReq clearGachaType() { @@ -52,7 +52,7 @@ public GetGachaCeilingCsReq clearGachaType() { } /** - * optional uint32 gacha_type = 10; + * optional uint32 gacha_type = 12; * @return the gachaType */ public int getGachaType() { @@ -60,7 +60,7 @@ public int getGachaType() { } /** - * optional uint32 gacha_type = 10; + * optional uint32 gacha_type = 12; * @param value the gachaType to set * @return this */ @@ -129,7 +129,7 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(gachaType); } } @@ -150,7 +150,7 @@ public GetGachaCeilingCsReq mergeFrom(final ProtoSource input) throws IOExceptio int tag = input.readTag(); while (true) { switch (tag) { - case 80: { + case 96: { // gachaType gachaType = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/GetGachaCeilingScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetGachaCeilingScRspOuterClass.java index bf918d3f3..38ffad63f 100644 --- a/src/generated/main/emu/lunarcore/proto/GetGachaCeilingScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetGachaCeilingScRspOuterClass.java @@ -19,14 +19,14 @@ public static final class GetGachaCeilingScRsp extends ProtoMessageoptional uint32 gacha_type = 3; + * optional uint32 retcode = 3; */ - private int gachaType; + private int retcode; /** - * optional uint32 retcode = 15; + * optional uint32 gacha_type = 6; */ - private int retcode; + private int gachaType; /** * optional .GachaCeiling gacha_ceiling = 1; @@ -44,76 +44,76 @@ public static GetGachaCeilingScRsp newInstance() { } /** - * optional uint32 gacha_type = 3; - * @return whether the gachaType field is set + * optional uint32 retcode = 3; + * @return whether the retcode field is set */ - public boolean hasGachaType() { + public boolean hasRetcode() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 gacha_type = 3; + * optional uint32 retcode = 3; * @return this */ - public GetGachaCeilingScRsp clearGachaType() { + public GetGachaCeilingScRsp clearRetcode() { bitField0_ &= ~0x00000001; - gachaType = 0; + retcode = 0; return this; } /** - * optional uint32 gacha_type = 3; - * @return the gachaType + * optional uint32 retcode = 3; + * @return the retcode */ - public int getGachaType() { - return gachaType; + public int getRetcode() { + return retcode; } /** - * optional uint32 gacha_type = 3; - * @param value the gachaType to set + * optional uint32 retcode = 3; + * @param value the retcode to set * @return this */ - public GetGachaCeilingScRsp setGachaType(final int value) { + public GetGachaCeilingScRsp setRetcode(final int value) { bitField0_ |= 0x00000001; - gachaType = value; + retcode = value; return this; } /** - * optional uint32 retcode = 15; - * @return whether the retcode field is set + * optional uint32 gacha_type = 6; + * @return whether the gachaType field is set */ - public boolean hasRetcode() { + public boolean hasGachaType() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 retcode = 15; + * optional uint32 gacha_type = 6; * @return this */ - public GetGachaCeilingScRsp clearRetcode() { + public GetGachaCeilingScRsp clearGachaType() { bitField0_ &= ~0x00000002; - retcode = 0; + gachaType = 0; return this; } /** - * optional uint32 retcode = 15; - * @return the retcode + * optional uint32 gacha_type = 6; + * @return the gachaType */ - public int getRetcode() { - return retcode; + public int getGachaType() { + return gachaType; } /** - * optional uint32 retcode = 15; - * @param value the retcode to set + * optional uint32 gacha_type = 6; + * @param value the gachaType to set * @return this */ - public GetGachaCeilingScRsp setRetcode(final int value) { + public GetGachaCeilingScRsp setGachaType(final int value) { bitField0_ |= 0x00000002; - retcode = value; + gachaType = value; return this; } @@ -179,8 +179,8 @@ public GetGachaCeilingScRsp copyFrom(final GetGachaCeilingScRsp other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - gachaType = other.gachaType; retcode = other.retcode; + gachaType = other.gachaType; gachaCeiling.copyFrom(other.gachaCeiling); } return this; @@ -192,12 +192,12 @@ public GetGachaCeilingScRsp mergeFrom(final GetGachaCeilingScRsp other) { return this; } cachedSize = -1; - if (other.hasGachaType()) { - setGachaType(other.gachaType); - } if (other.hasRetcode()) { setRetcode(other.retcode); } + if (other.hasGachaType()) { + setGachaType(other.gachaType); + } if (other.hasGachaCeiling()) { getMutableGachaCeiling().mergeFrom(other.gachaCeiling); } @@ -211,8 +211,8 @@ public GetGachaCeilingScRsp clear() { } cachedSize = -1; bitField0_ = 0; - gachaType = 0; retcode = 0; + gachaType = 0; gachaCeiling.clear(); return this; } @@ -238,8 +238,8 @@ public boolean equals(Object o) { } GetGachaCeilingScRsp other = (GetGachaCeilingScRsp) o; return bitField0_ == other.bitField0_ - && (!hasGachaType() || gachaType == other.gachaType) && (!hasRetcode() || retcode == other.retcode) + && (!hasGachaType() || gachaType == other.gachaType) && (!hasGachaCeiling() || gachaCeiling.equals(other.gachaCeiling)); } @@ -247,11 +247,11 @@ public boolean equals(Object o) { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { output.writeRawByte((byte) 24); - output.writeUInt32NoTag(gachaType); + output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 120); - output.writeUInt32NoTag(retcode); + output.writeRawByte((byte) 48); + output.writeUInt32NoTag(gachaType); } if ((bitField0_ & 0x00000004) != 0) { output.writeRawByte((byte) 10); @@ -263,10 +263,10 @@ public void writeTo(final ProtoSink output) throws IOException { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaType); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaType); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(gachaCeiling); @@ -282,17 +282,17 @@ public GetGachaCeilingScRsp mergeFrom(final ProtoSource input) throws IOExceptio while (true) { switch (tag) { case 24: { - // gachaType - gachaType = input.readUInt32(); + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 120) { + if (tag != 48) { break; } } - case 120: { - // retcode - retcode = input.readUInt32(); + case 48: { + // gachaType + gachaType = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 10) { @@ -326,10 +326,10 @@ public GetGachaCeilingScRsp mergeFrom(final ProtoSource input) throws IOExceptio public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.gachaType, gachaType); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.gachaType, gachaType); } if ((bitField0_ & 0x00000004) != 0) { output.writeMessage(FieldNames.gachaCeiling, gachaCeiling); @@ -344,11 +344,10 @@ public GetGachaCeilingScRsp mergeFrom(final JsonSource input) throws IOException } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 802848732: - case -871474217: { - if (input.isAtField(FieldNames.gachaType)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - gachaType = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -356,10 +355,11 @@ public GetGachaCeilingScRsp mergeFrom(final JsonSource input) throws IOException } break; } - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case 802848732: + case -871474217: { + if (input.isAtField(FieldNames.gachaType)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + gachaType = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -432,10 +432,10 @@ public GetGachaCeilingScRsp create() { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName gachaType = FieldName.forField("gachaType", "gacha_type"); - static final FieldName retcode = FieldName.forField("retcode"); + static final FieldName gachaType = FieldName.forField("gachaType", "gacha_type"); + static final FieldName gachaCeiling = FieldName.forField("gachaCeiling", "gacha_ceiling"); } } diff --git a/src/generated/main/emu/lunarcore/proto/GetGachaInfoScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetGachaInfoScRspOuterClass.java index ee4e6b008..288028d0e 100644 --- a/src/generated/main/emu/lunarcore/proto/GetGachaInfoScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetGachaInfoScRspOuterClass.java @@ -20,12 +20,12 @@ public static final class GetGachaInfoScRsp extends ProtoMessageoptional uint32 retcode = 11; + * optional uint32 retcode = 4; */ private int retcode; /** - * repeated .GachaInfo gacha_info_list = 8; + * repeated .GachaInfo gacha_info_list = 13; */ private final RepeatedMessage gachaInfoList = RepeatedMessage.newEmptyInstance(GachaInfoOuterClass.GachaInfo.getFactory()); @@ -40,7 +40,7 @@ public static GetGachaInfoScRsp newInstance() { } /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 4; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -48,7 +48,7 @@ public boolean hasRetcode() { } /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 4; * @return this */ public GetGachaInfoScRsp clearRetcode() { @@ -58,7 +58,7 @@ public GetGachaInfoScRsp clearRetcode() { } /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 4; * @return the retcode */ public int getRetcode() { @@ -66,7 +66,7 @@ public int getRetcode() { } /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 4; * @param value the retcode to set * @return this */ @@ -77,7 +77,7 @@ public GetGachaInfoScRsp setRetcode(final int value) { } /** - * repeated .GachaInfo gacha_info_list = 8; + * repeated .GachaInfo gacha_info_list = 13; * @return whether the gachaInfoList field is set */ public boolean hasGachaInfoList() { @@ -85,7 +85,7 @@ public boolean hasGachaInfoList() { } /** - * repeated .GachaInfo gacha_info_list = 8; + * repeated .GachaInfo gacha_info_list = 13; * @return this */ public GetGachaInfoScRsp clearGachaInfoList() { @@ -95,7 +95,7 @@ public GetGachaInfoScRsp clearGachaInfoList() { } /** - * repeated .GachaInfo gacha_info_list = 8; + * repeated .GachaInfo gacha_info_list = 13; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -109,7 +109,7 @@ public RepeatedMessage getGachaInfoList() { } /** - * repeated .GachaInfo gacha_info_list = 8; + * repeated .GachaInfo gacha_info_list = 13; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -123,7 +123,7 @@ public RepeatedMessage getMutableGachaInfoList() } /** - * repeated .GachaInfo gacha_info_list = 8; + * repeated .GachaInfo gacha_info_list = 13; * @param value the gachaInfoList to add * @return this */ @@ -134,7 +134,7 @@ public GetGachaInfoScRsp addGachaInfoList(final GachaInfoOuterClass.GachaInfo va } /** - * repeated .GachaInfo gacha_info_list = 8; + * repeated .GachaInfo gacha_info_list = 13; * @param values the gachaInfoList to add * @return this */ @@ -210,12 +210,12 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < gachaInfoList.length(); i++) { - output.writeRawByte((byte) 66); + output.writeRawByte((byte) 106); output.writeMessageNoTag(gachaInfoList.get(i)); } } @@ -240,16 +240,16 @@ public GetGachaInfoScRsp mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 88: { + case 32: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 66) { + if (tag != 106) { break; } } - case 66: { + case 106: { // gachaInfoList tag = input.readRepeatedMessage(gachaInfoList, tag); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/GetHeroBasicTypeInfoScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetHeroBasicTypeInfoScRspOuterClass.java index 1e28b3286..364622307 100644 --- a/src/generated/main/emu/lunarcore/proto/GetHeroBasicTypeInfoScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetHeroBasicTypeInfoScRspOuterClass.java @@ -20,22 +20,22 @@ public static final class GetHeroBasicTypeInfoScRsp extends ProtoMessageoptional uint32 retcode = 2; + * optional uint32 retcode = 11; */ private int retcode; /** - * optional .HeroBasicType cur_basic_type = 7; + * optional .Gender gender = 1; */ - private int curBasicType; + private int gender; /** - * optional .Gender gender = 13; + * optional .HeroBasicType cur_basic_type = 7; */ - private int gender; + private int curBasicType; /** - * repeated .HeroBasicTypeInfo basic_type_info_list = 5; + * repeated .HeroBasicTypeInfo basic_type_info_list = 2; */ private final RepeatedMessage basicTypeInfoList = RepeatedMessage.newEmptyInstance(HeroBasicTypeInfoOuterClass.HeroBasicTypeInfo.getFactory()); @@ -50,7 +50,7 @@ public static GetHeroBasicTypeInfoScRsp newInstance() { } /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 11; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -58,7 +58,7 @@ public boolean hasRetcode() { } /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 11; * @return this */ public GetHeroBasicTypeInfoScRsp clearRetcode() { @@ -68,7 +68,7 @@ public GetHeroBasicTypeInfoScRsp clearRetcode() { } /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 11; * @return the retcode */ public int getRetcode() { @@ -76,7 +76,7 @@ public int getRetcode() { } /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 11; * @param value the retcode to set * @return this */ @@ -87,132 +87,132 @@ public GetHeroBasicTypeInfoScRsp setRetcode(final int value) { } /** - * optional .HeroBasicType cur_basic_type = 7; - * @return whether the curBasicType field is set + * optional .Gender gender = 1; + * @return whether the gender field is set */ - public boolean hasCurBasicType() { + public boolean hasGender() { return (bitField0_ & 0x00000002) != 0; } /** - * optional .HeroBasicType cur_basic_type = 7; + * optional .Gender gender = 1; * @return this */ - public GetHeroBasicTypeInfoScRsp clearCurBasicType() { + public GetHeroBasicTypeInfoScRsp clearGender() { bitField0_ &= ~0x00000002; - curBasicType = 0; + gender = 0; return this; } /** - * optional .HeroBasicType cur_basic_type = 7; - * @return the curBasicType + * optional .Gender gender = 1; + * @return the gender */ - public HeroBasicTypeOuterClass.HeroBasicType getCurBasicType() { - return HeroBasicTypeOuterClass.HeroBasicType.forNumber(curBasicType); + public GenderOuterClass.Gender getGender() { + return GenderOuterClass.Gender.forNumber(gender); } /** * Gets the value of the internal enum store. The result is - * equivalent to {@link GetHeroBasicTypeInfoScRsp#getCurBasicType()}.getNumber(). + * equivalent to {@link GetHeroBasicTypeInfoScRsp#getGender()}.getNumber(). * * @return numeric wire representation */ - public int getCurBasicTypeValue() { - return curBasicType; + public int getGenderValue() { + return gender; } /** * Sets the value of the internal enum store. This does not * do any validity checks, so be sure to use appropriate value - * constants from {@link HeroBasicTypeOuterClass.HeroBasicType}. Setting an invalid value - * can cause {@link GetHeroBasicTypeInfoScRsp#getCurBasicType()} to return null + * constants from {@link GenderOuterClass.Gender}. Setting an invalid value + * can cause {@link GetHeroBasicTypeInfoScRsp#getGender()} to return null * * @param value the numeric wire value to set * @return this */ - public GetHeroBasicTypeInfoScRsp setCurBasicTypeValue(final int value) { + public GetHeroBasicTypeInfoScRsp setGenderValue(final int value) { bitField0_ |= 0x00000002; - curBasicType = value; + gender = value; return this; } /** - * optional .HeroBasicType cur_basic_type = 7; - * @param value the curBasicType to set + * optional .Gender gender = 1; + * @param value the gender to set * @return this */ - public GetHeroBasicTypeInfoScRsp setCurBasicType( - final HeroBasicTypeOuterClass.HeroBasicType value) { + public GetHeroBasicTypeInfoScRsp setGender(final GenderOuterClass.Gender value) { bitField0_ |= 0x00000002; - curBasicType = value.getNumber(); + gender = value.getNumber(); return this; } /** - * optional .Gender gender = 13; - * @return whether the gender field is set + * optional .HeroBasicType cur_basic_type = 7; + * @return whether the curBasicType field is set */ - public boolean hasGender() { + public boolean hasCurBasicType() { return (bitField0_ & 0x00000004) != 0; } /** - * optional .Gender gender = 13; + * optional .HeroBasicType cur_basic_type = 7; * @return this */ - public GetHeroBasicTypeInfoScRsp clearGender() { + public GetHeroBasicTypeInfoScRsp clearCurBasicType() { bitField0_ &= ~0x00000004; - gender = 0; + curBasicType = 0; return this; } /** - * optional .Gender gender = 13; - * @return the gender + * optional .HeroBasicType cur_basic_type = 7; + * @return the curBasicType */ - public GenderOuterClass.Gender getGender() { - return GenderOuterClass.Gender.forNumber(gender); + public HeroBasicTypeOuterClass.HeroBasicType getCurBasicType() { + return HeroBasicTypeOuterClass.HeroBasicType.forNumber(curBasicType); } /** * Gets the value of the internal enum store. The result is - * equivalent to {@link GetHeroBasicTypeInfoScRsp#getGender()}.getNumber(). + * equivalent to {@link GetHeroBasicTypeInfoScRsp#getCurBasicType()}.getNumber(). * * @return numeric wire representation */ - public int getGenderValue() { - return gender; + public int getCurBasicTypeValue() { + return curBasicType; } /** * Sets the value of the internal enum store. This does not * do any validity checks, so be sure to use appropriate value - * constants from {@link GenderOuterClass.Gender}. Setting an invalid value - * can cause {@link GetHeroBasicTypeInfoScRsp#getGender()} to return null + * constants from {@link HeroBasicTypeOuterClass.HeroBasicType}. Setting an invalid value + * can cause {@link GetHeroBasicTypeInfoScRsp#getCurBasicType()} to return null * * @param value the numeric wire value to set * @return this */ - public GetHeroBasicTypeInfoScRsp setGenderValue(final int value) { + public GetHeroBasicTypeInfoScRsp setCurBasicTypeValue(final int value) { bitField0_ |= 0x00000004; - gender = value; + curBasicType = value; return this; } /** - * optional .Gender gender = 13; - * @param value the gender to set + * optional .HeroBasicType cur_basic_type = 7; + * @param value the curBasicType to set * @return this */ - public GetHeroBasicTypeInfoScRsp setGender(final GenderOuterClass.Gender value) { + public GetHeroBasicTypeInfoScRsp setCurBasicType( + final HeroBasicTypeOuterClass.HeroBasicType value) { bitField0_ |= 0x00000004; - gender = value.getNumber(); + curBasicType = value.getNumber(); return this; } /** - * repeated .HeroBasicTypeInfo basic_type_info_list = 5; + * repeated .HeroBasicTypeInfo basic_type_info_list = 2; * @return whether the basicTypeInfoList field is set */ public boolean hasBasicTypeInfoList() { @@ -220,7 +220,7 @@ public boolean hasBasicTypeInfoList() { } /** - * repeated .HeroBasicTypeInfo basic_type_info_list = 5; + * repeated .HeroBasicTypeInfo basic_type_info_list = 2; * @return this */ public GetHeroBasicTypeInfoScRsp clearBasicTypeInfoList() { @@ -230,7 +230,7 @@ public GetHeroBasicTypeInfoScRsp clearBasicTypeInfoList() { } /** - * repeated .HeroBasicTypeInfo basic_type_info_list = 5; + * repeated .HeroBasicTypeInfo basic_type_info_list = 2; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -244,7 +244,7 @@ public RepeatedMessage getBasicTy } /** - * repeated .HeroBasicTypeInfo basic_type_info_list = 5; + * repeated .HeroBasicTypeInfo basic_type_info_list = 2; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -259,7 +259,7 @@ public RepeatedMessage getMutable } /** - * repeated .HeroBasicTypeInfo basic_type_info_list = 5; + * repeated .HeroBasicTypeInfo basic_type_info_list = 2; * @param value the basicTypeInfoList to add * @return this */ @@ -271,7 +271,7 @@ public GetHeroBasicTypeInfoScRsp addBasicTypeInfoList( } /** - * repeated .HeroBasicTypeInfo basic_type_info_list = 5; + * repeated .HeroBasicTypeInfo basic_type_info_list = 2; * @param values the basicTypeInfoList to add * @return this */ @@ -288,8 +288,8 @@ public GetHeroBasicTypeInfoScRsp copyFrom(final GetHeroBasicTypeInfoScRsp other) if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; retcode = other.retcode; - curBasicType = other.curBasicType; gender = other.gender; + curBasicType = other.curBasicType; basicTypeInfoList.copyFrom(other.basicTypeInfoList); } return this; @@ -304,12 +304,12 @@ public GetHeroBasicTypeInfoScRsp mergeFrom(final GetHeroBasicTypeInfoScRsp other if (other.hasRetcode()) { setRetcode(other.retcode); } - if (other.hasCurBasicType()) { - setCurBasicTypeValue(other.curBasicType); - } if (other.hasGender()) { setGenderValue(other.gender); } + if (other.hasCurBasicType()) { + setCurBasicTypeValue(other.curBasicType); + } if (other.hasBasicTypeInfoList()) { getMutableBasicTypeInfoList().addAll(other.basicTypeInfoList); } @@ -324,8 +324,8 @@ public GetHeroBasicTypeInfoScRsp clear() { cachedSize = -1; bitField0_ = 0; retcode = 0; - curBasicType = 0; gender = 0; + curBasicType = 0; basicTypeInfoList.clear(); return this; } @@ -352,28 +352,28 @@ public boolean equals(Object o) { GetHeroBasicTypeInfoScRsp other = (GetHeroBasicTypeInfoScRsp) o; return bitField0_ == other.bitField0_ && (!hasRetcode() || retcode == other.retcode) - && (!hasCurBasicType() || curBasicType == other.curBasicType) && (!hasGender() || gender == other.gender) + && (!hasCurBasicType() || curBasicType == other.curBasicType) && (!hasBasicTypeInfoList() || basicTypeInfoList.equals(other.basicTypeInfoList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 56); - output.writeEnumNoTag(curBasicType); + output.writeRawByte((byte) 8); + output.writeEnumNoTag(gender); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 104); - output.writeEnumNoTag(gender); + output.writeRawByte((byte) 56); + output.writeEnumNoTag(curBasicType); } if ((bitField0_ & 0x00000008) != 0) { for (int i = 0; i < basicTypeInfoList.length(); i++) { - output.writeRawByte((byte) 42); + output.writeRawByte((byte) 18); output.writeMessageNoTag(basicTypeInfoList.get(i)); } } @@ -386,10 +386,10 @@ protected int computeSerializedSize() { size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeEnumSizeNoTag(curBasicType); + size += 1 + ProtoSink.computeEnumSizeNoTag(gender); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeEnumSizeNoTag(gender); + size += 1 + ProtoSink.computeEnumSizeNoTag(curBasicType); } if ((bitField0_ & 0x00000008) != 0) { size += (1 * basicTypeInfoList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(basicTypeInfoList); @@ -404,40 +404,40 @@ public GetHeroBasicTypeInfoScRsp mergeFrom(final ProtoSource input) throws IOExc int tag = input.readTag(); while (true) { switch (tag) { - case 16: { + case 88: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 56) { + if (tag != 8) { break; } } - case 56: { - // curBasicType + case 8: { + // gender final int value = input.readInt32(); - if (HeroBasicTypeOuterClass.HeroBasicType.forNumber(value) != null) { - curBasicType = value; + if (GenderOuterClass.Gender.forNumber(value) != null) { + gender = value; bitField0_ |= 0x00000002; } tag = input.readTag(); - if (tag != 104) { + if (tag != 56) { break; } } - case 104: { - // gender + case 56: { + // curBasicType final int value = input.readInt32(); - if (GenderOuterClass.Gender.forNumber(value) != null) { - gender = value; + if (HeroBasicTypeOuterClass.HeroBasicType.forNumber(value) != null) { + curBasicType = value; bitField0_ |= 0x00000004; } tag = input.readTag(); - if (tag != 42) { + if (tag != 18) { break; } } - case 42: { + case 18: { // basicTypeInfoList tag = input.readRepeatedMessage(basicTypeInfoList, tag); bitField0_ |= 0x00000008; @@ -466,10 +466,10 @@ public void writeTo(final JsonSink output) throws IOException { output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeEnum(FieldNames.curBasicType, curBasicType, HeroBasicTypeOuterClass.HeroBasicType.converter()); + output.writeEnum(FieldNames.gender, gender, GenderOuterClass.Gender.converter()); } if ((bitField0_ & 0x00000004) != 0) { - output.writeEnum(FieldNames.gender, gender, GenderOuterClass.Gender.converter()); + output.writeEnum(FieldNames.curBasicType, curBasicType, HeroBasicTypeOuterClass.HeroBasicType.converter()); } if ((bitField0_ & 0x00000008) != 0) { output.writeRepeatedMessage(FieldNames.basicTypeInfoList, basicTypeInfoList); @@ -495,13 +495,12 @@ public GetHeroBasicTypeInfoScRsp mergeFrom(final JsonSource input) throws IOExce } break; } - case -518506968: - case -979186678: { - if (input.isAtField(FieldNames.curBasicType)) { + case -1249512767: { + if (input.isAtField(FieldNames.gender)) { if (!input.trySkipNullValue()) { - final HeroBasicTypeOuterClass.HeroBasicType value = input.readEnum(HeroBasicTypeOuterClass.HeroBasicType.converter()); + final GenderOuterClass.Gender value = input.readEnum(GenderOuterClass.Gender.converter()); if (value != null) { - curBasicType = value.getNumber(); + gender = value.getNumber(); bitField0_ |= 0x00000002; } else { input.skipUnknownEnumValue(); @@ -512,12 +511,13 @@ public GetHeroBasicTypeInfoScRsp mergeFrom(final JsonSource input) throws IOExce } break; } - case -1249512767: { - if (input.isAtField(FieldNames.gender)) { + case -518506968: + case -979186678: { + if (input.isAtField(FieldNames.curBasicType)) { if (!input.trySkipNullValue()) { - final GenderOuterClass.Gender value = input.readEnum(GenderOuterClass.Gender.converter()); + final HeroBasicTypeOuterClass.HeroBasicType value = input.readEnum(HeroBasicTypeOuterClass.HeroBasicType.converter()); if (value != null) { - gender = value.getNumber(); + curBasicType = value.getNumber(); bitField0_ |= 0x00000004; } else { input.skipUnknownEnumValue(); @@ -595,10 +595,10 @@ public GetHeroBasicTypeInfoScRsp create() { static class FieldNames { static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName curBasicType = FieldName.forField("curBasicType", "cur_basic_type"); - static final FieldName gender = FieldName.forField("gender"); + static final FieldName curBasicType = FieldName.forField("curBasicType", "cur_basic_type"); + static final FieldName basicTypeInfoList = FieldName.forField("basicTypeInfoList", "basic_type_info_list"); } } diff --git a/src/generated/main/emu/lunarcore/proto/GetJukeboxDataScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetJukeboxDataScRspOuterClass.java index ed6da2464..3870f39ce 100644 --- a/src/generated/main/emu/lunarcore/proto/GetJukeboxDataScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetJukeboxDataScRspOuterClass.java @@ -20,17 +20,17 @@ public static final class GetJukeboxDataScRsp extends ProtoMessageoptional uint32 playing_id = 3; + * optional uint32 retcode = 4; */ - private int playingId; + private int retcode; /** - * optional uint32 retcode = 13; + * optional uint32 playing_id = 10; */ - private int retcode; + private int playingId; /** - * repeated .UnlockedMusic music_list = 14; + * repeated .UnlockedMusic music_list = 3; */ private final RepeatedMessage musicList = RepeatedMessage.newEmptyInstance(UnlockedMusicOuterClass.UnlockedMusic.getFactory()); @@ -45,81 +45,81 @@ public static GetJukeboxDataScRsp newInstance() { } /** - * optional uint32 playing_id = 3; - * @return whether the playingId field is set + * optional uint32 retcode = 4; + * @return whether the retcode field is set */ - public boolean hasPlayingId() { + public boolean hasRetcode() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 playing_id = 3; + * optional uint32 retcode = 4; * @return this */ - public GetJukeboxDataScRsp clearPlayingId() { + public GetJukeboxDataScRsp clearRetcode() { bitField0_ &= ~0x00000001; - playingId = 0; + retcode = 0; return this; } /** - * optional uint32 playing_id = 3; - * @return the playingId + * optional uint32 retcode = 4; + * @return the retcode */ - public int getPlayingId() { - return playingId; + public int getRetcode() { + return retcode; } /** - * optional uint32 playing_id = 3; - * @param value the playingId to set + * optional uint32 retcode = 4; + * @param value the retcode to set * @return this */ - public GetJukeboxDataScRsp setPlayingId(final int value) { + public GetJukeboxDataScRsp setRetcode(final int value) { bitField0_ |= 0x00000001; - playingId = value; + retcode = value; return this; } /** - * optional uint32 retcode = 13; - * @return whether the retcode field is set + * optional uint32 playing_id = 10; + * @return whether the playingId field is set */ - public boolean hasRetcode() { + public boolean hasPlayingId() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 retcode = 13; + * optional uint32 playing_id = 10; * @return this */ - public GetJukeboxDataScRsp clearRetcode() { + public GetJukeboxDataScRsp clearPlayingId() { bitField0_ &= ~0x00000002; - retcode = 0; + playingId = 0; return this; } /** - * optional uint32 retcode = 13; - * @return the retcode + * optional uint32 playing_id = 10; + * @return the playingId */ - public int getRetcode() { - return retcode; + public int getPlayingId() { + return playingId; } /** - * optional uint32 retcode = 13; - * @param value the retcode to set + * optional uint32 playing_id = 10; + * @param value the playingId to set * @return this */ - public GetJukeboxDataScRsp setRetcode(final int value) { + public GetJukeboxDataScRsp setPlayingId(final int value) { bitField0_ |= 0x00000002; - retcode = value; + playingId = value; return this; } /** - * repeated .UnlockedMusic music_list = 14; + * repeated .UnlockedMusic music_list = 3; * @return whether the musicList field is set */ public boolean hasMusicList() { @@ -127,7 +127,7 @@ public boolean hasMusicList() { } /** - * repeated .UnlockedMusic music_list = 14; + * repeated .UnlockedMusic music_list = 3; * @return this */ public GetJukeboxDataScRsp clearMusicList() { @@ -137,7 +137,7 @@ public GetJukeboxDataScRsp clearMusicList() { } /** - * repeated .UnlockedMusic music_list = 14; + * repeated .UnlockedMusic music_list = 3; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -151,7 +151,7 @@ public RepeatedMessage getMusicList() { } /** - * repeated .UnlockedMusic music_list = 14; + * repeated .UnlockedMusic music_list = 3; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -165,7 +165,7 @@ public RepeatedMessage getMutableMusicLis } /** - * repeated .UnlockedMusic music_list = 14; + * repeated .UnlockedMusic music_list = 3; * @param value the musicList to add * @return this */ @@ -176,7 +176,7 @@ public GetJukeboxDataScRsp addMusicList(final UnlockedMusicOuterClass.UnlockedMu } /** - * repeated .UnlockedMusic music_list = 14; + * repeated .UnlockedMusic music_list = 3; * @param values the musicList to add * @return this */ @@ -192,8 +192,8 @@ public GetJukeboxDataScRsp copyFrom(final GetJukeboxDataScRsp other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - playingId = other.playingId; retcode = other.retcode; + playingId = other.playingId; musicList.copyFrom(other.musicList); } return this; @@ -205,12 +205,12 @@ public GetJukeboxDataScRsp mergeFrom(final GetJukeboxDataScRsp other) { return this; } cachedSize = -1; - if (other.hasPlayingId()) { - setPlayingId(other.playingId); - } if (other.hasRetcode()) { setRetcode(other.retcode); } + if (other.hasPlayingId()) { + setPlayingId(other.playingId); + } if (other.hasMusicList()) { getMutableMusicList().addAll(other.musicList); } @@ -224,8 +224,8 @@ public GetJukeboxDataScRsp clear() { } cachedSize = -1; bitField0_ = 0; - playingId = 0; retcode = 0; + playingId = 0; musicList.clear(); return this; } @@ -251,24 +251,24 @@ public boolean equals(Object o) { } GetJukeboxDataScRsp other = (GetJukeboxDataScRsp) o; return bitField0_ == other.bitField0_ - && (!hasPlayingId() || playingId == other.playingId) && (!hasRetcode() || retcode == other.retcode) + && (!hasPlayingId() || playingId == other.playingId) && (!hasMusicList() || musicList.equals(other.musicList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); - output.writeUInt32NoTag(playingId); + output.writeRawByte((byte) 32); + output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 104); - output.writeUInt32NoTag(retcode); + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(playingId); } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < musicList.length(); i++) { - output.writeRawByte((byte) 114); + output.writeRawByte((byte) 26); output.writeMessageNoTag(musicList.get(i)); } } @@ -278,10 +278,10 @@ public void writeTo(final ProtoSink output) throws IOException { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(playingId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(playingId); } if ((bitField0_ & 0x00000004) != 0) { size += (1 * musicList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(musicList); @@ -296,25 +296,25 @@ public GetJukeboxDataScRsp mergeFrom(final ProtoSource input) throws IOException int tag = input.readTag(); while (true) { switch (tag) { - case 24: { - // playingId - playingId = input.readUInt32(); + case 32: { + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 104) { + if (tag != 80) { break; } } - case 104: { - // retcode - retcode = input.readUInt32(); + case 80: { + // playingId + playingId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 114) { + if (tag != 26) { break; } } - case 114: { + case 26: { // musicList tag = input.readRepeatedMessage(musicList, tag); bitField0_ |= 0x00000004; @@ -340,10 +340,10 @@ public GetJukeboxDataScRsp mergeFrom(final ProtoSource input) throws IOException public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.playingId, playingId); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.playingId, playingId); } if ((bitField0_ & 0x00000004) != 0) { output.writeRepeatedMessage(FieldNames.musicList, musicList); @@ -358,11 +358,10 @@ public GetJukeboxDataScRsp mergeFrom(final JsonSource input) throws IOException } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1868462615: - case -2087744820: { - if (input.isAtField(FieldNames.playingId)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - playingId = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -370,10 +369,11 @@ public GetJukeboxDataScRsp mergeFrom(final JsonSource input) throws IOException } break; } - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case -1868462615: + case -2087744820: { + if (input.isAtField(FieldNames.playingId)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + playingId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -446,10 +446,10 @@ public GetJukeboxDataScRsp create() { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName playingId = FieldName.forField("playingId", "playing_id"); - static final FieldName retcode = FieldName.forField("retcode"); + static final FieldName playingId = FieldName.forField("playingId", "playing_id"); + static final FieldName musicList = FieldName.forField("musicList", "music_list"); } } diff --git a/src/generated/main/emu/lunarcore/proto/GetMailScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetMailScRspOuterClass.java index b3d4cc0a4..dc57150bd 100644 --- a/src/generated/main/emu/lunarcore/proto/GetMailScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetMailScRspOuterClass.java @@ -25,29 +25,29 @@ public static final class GetMailScRsp extends ProtoMessage implem private int retcode; /** - * optional uint32 total_num = 2; + * optional uint32 total_num = 8; */ private int totalNum; /** - * optional uint32 start = 4; + * optional uint32 start = 14; */ private int start; /** - * optional bool is_end = 5; + * optional bool is_end = 4; */ private boolean isEnd; /** - * repeated .ClientMail notice_mail_list = 8; + * repeated .ClientMail mail_list = 2; */ - private final RepeatedMessage noticeMailList = RepeatedMessage.newEmptyInstance(ClientMailOuterClass.ClientMail.getFactory()); + private final RepeatedMessage mailList = RepeatedMessage.newEmptyInstance(ClientMailOuterClass.ClientMail.getFactory()); /** - * repeated .ClientMail mail_list = 15; + * repeated .ClientMail notice_mail_list = 6; */ - private final RepeatedMessage mailList = RepeatedMessage.newEmptyInstance(ClientMailOuterClass.ClientMail.getFactory()); + private final RepeatedMessage noticeMailList = RepeatedMessage.newEmptyInstance(ClientMailOuterClass.ClientMail.getFactory()); private GetMailScRsp() { } @@ -97,7 +97,7 @@ public GetMailScRsp setRetcode(final int value) { } /** - * optional uint32 total_num = 2; + * optional uint32 total_num = 8; * @return whether the totalNum field is set */ public boolean hasTotalNum() { @@ -105,7 +105,7 @@ public boolean hasTotalNum() { } /** - * optional uint32 total_num = 2; + * optional uint32 total_num = 8; * @return this */ public GetMailScRsp clearTotalNum() { @@ -115,7 +115,7 @@ public GetMailScRsp clearTotalNum() { } /** - * optional uint32 total_num = 2; + * optional uint32 total_num = 8; * @return the totalNum */ public int getTotalNum() { @@ -123,7 +123,7 @@ public int getTotalNum() { } /** - * optional uint32 total_num = 2; + * optional uint32 total_num = 8; * @param value the totalNum to set * @return this */ @@ -134,7 +134,7 @@ public GetMailScRsp setTotalNum(final int value) { } /** - * optional uint32 start = 4; + * optional uint32 start = 14; * @return whether the start field is set */ public boolean hasStart() { @@ -142,7 +142,7 @@ public boolean hasStart() { } /** - * optional uint32 start = 4; + * optional uint32 start = 14; * @return this */ public GetMailScRsp clearStart() { @@ -152,7 +152,7 @@ public GetMailScRsp clearStart() { } /** - * optional uint32 start = 4; + * optional uint32 start = 14; * @return the start */ public int getStart() { @@ -160,7 +160,7 @@ public int getStart() { } /** - * optional uint32 start = 4; + * optional uint32 start = 14; * @param value the start to set * @return this */ @@ -171,7 +171,7 @@ public GetMailScRsp setStart(final int value) { } /** - * optional bool is_end = 5; + * optional bool is_end = 4; * @return whether the isEnd field is set */ public boolean hasIsEnd() { @@ -179,7 +179,7 @@ public boolean hasIsEnd() { } /** - * optional bool is_end = 5; + * optional bool is_end = 4; * @return this */ public GetMailScRsp clearIsEnd() { @@ -189,7 +189,7 @@ public GetMailScRsp clearIsEnd() { } /** - * optional bool is_end = 5; + * optional bool is_end = 4; * @return the isEnd */ public boolean getIsEnd() { @@ -197,7 +197,7 @@ public boolean getIsEnd() { } /** - * optional bool is_end = 5; + * optional bool is_end = 4; * @param value the isEnd to set * @return this */ @@ -208,39 +208,39 @@ public GetMailScRsp setIsEnd(final boolean value) { } /** - * repeated .ClientMail notice_mail_list = 8; - * @return whether the noticeMailList field is set + * repeated .ClientMail mail_list = 2; + * @return whether the mailList field is set */ - public boolean hasNoticeMailList() { + public boolean hasMailList() { return (bitField0_ & 0x00000010) != 0; } /** - * repeated .ClientMail notice_mail_list = 8; + * repeated .ClientMail mail_list = 2; * @return this */ - public GetMailScRsp clearNoticeMailList() { + public GetMailScRsp clearMailList() { bitField0_ &= ~0x00000010; - noticeMailList.clear(); + mailList.clear(); return this; } /** - * repeated .ClientMail notice_mail_list = 8; + * repeated .ClientMail mail_list = 2; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. * - * Use {@link #getMutableNoticeMailList()} if you want to modify it. + * Use {@link #getMutableMailList()} if you want to modify it. * * @return internal storage object for reading */ - public RepeatedMessage getNoticeMailList() { - return noticeMailList; + public RepeatedMessage getMailList() { + return mailList; } /** - * repeated .ClientMail notice_mail_list = 8; + * repeated .ClientMail mail_list = 2; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -248,67 +248,67 @@ public RepeatedMessage getNoticeMailList() { * * @return internal storage object for modifications */ - public RepeatedMessage getMutableNoticeMailList() { + public RepeatedMessage getMutableMailList() { bitField0_ |= 0x00000010; - return noticeMailList; + return mailList; } /** - * repeated .ClientMail notice_mail_list = 8; - * @param value the noticeMailList to add + * repeated .ClientMail mail_list = 2; + * @param value the mailList to add * @return this */ - public GetMailScRsp addNoticeMailList(final ClientMailOuterClass.ClientMail value) { + public GetMailScRsp addMailList(final ClientMailOuterClass.ClientMail value) { bitField0_ |= 0x00000010; - noticeMailList.add(value); + mailList.add(value); return this; } /** - * repeated .ClientMail notice_mail_list = 8; - * @param values the noticeMailList to add + * repeated .ClientMail mail_list = 2; + * @param values the mailList to add * @return this */ - public GetMailScRsp addAllNoticeMailList(final ClientMailOuterClass.ClientMail... values) { + public GetMailScRsp addAllMailList(final ClientMailOuterClass.ClientMail... values) { bitField0_ |= 0x00000010; - noticeMailList.addAll(values); + mailList.addAll(values); return this; } /** - * repeated .ClientMail mail_list = 15; - * @return whether the mailList field is set + * repeated .ClientMail notice_mail_list = 6; + * @return whether the noticeMailList field is set */ - public boolean hasMailList() { + public boolean hasNoticeMailList() { return (bitField0_ & 0x00000020) != 0; } /** - * repeated .ClientMail mail_list = 15; + * repeated .ClientMail notice_mail_list = 6; * @return this */ - public GetMailScRsp clearMailList() { + public GetMailScRsp clearNoticeMailList() { bitField0_ &= ~0x00000020; - mailList.clear(); + noticeMailList.clear(); return this; } /** - * repeated .ClientMail mail_list = 15; + * repeated .ClientMail notice_mail_list = 6; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. * - * Use {@link #getMutableMailList()} if you want to modify it. + * Use {@link #getMutableNoticeMailList()} if you want to modify it. * * @return internal storage object for reading */ - public RepeatedMessage getMailList() { - return mailList; + public RepeatedMessage getNoticeMailList() { + return noticeMailList; } /** - * repeated .ClientMail mail_list = 15; + * repeated .ClientMail notice_mail_list = 6; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -316,30 +316,30 @@ public RepeatedMessage getMailList() { * * @return internal storage object for modifications */ - public RepeatedMessage getMutableMailList() { + public RepeatedMessage getMutableNoticeMailList() { bitField0_ |= 0x00000020; - return mailList; + return noticeMailList; } /** - * repeated .ClientMail mail_list = 15; - * @param value the mailList to add + * repeated .ClientMail notice_mail_list = 6; + * @param value the noticeMailList to add * @return this */ - public GetMailScRsp addMailList(final ClientMailOuterClass.ClientMail value) { + public GetMailScRsp addNoticeMailList(final ClientMailOuterClass.ClientMail value) { bitField0_ |= 0x00000020; - mailList.add(value); + noticeMailList.add(value); return this; } /** - * repeated .ClientMail mail_list = 15; - * @param values the mailList to add + * repeated .ClientMail notice_mail_list = 6; + * @param values the noticeMailList to add * @return this */ - public GetMailScRsp addAllMailList(final ClientMailOuterClass.ClientMail... values) { + public GetMailScRsp addAllNoticeMailList(final ClientMailOuterClass.ClientMail... values) { bitField0_ |= 0x00000020; - mailList.addAll(values); + noticeMailList.addAll(values); return this; } @@ -352,8 +352,8 @@ public GetMailScRsp copyFrom(final GetMailScRsp other) { totalNum = other.totalNum; start = other.start; isEnd = other.isEnd; - noticeMailList.copyFrom(other.noticeMailList); mailList.copyFrom(other.mailList); + noticeMailList.copyFrom(other.noticeMailList); } return this; } @@ -376,12 +376,12 @@ public GetMailScRsp mergeFrom(final GetMailScRsp other) { if (other.hasIsEnd()) { setIsEnd(other.isEnd); } - if (other.hasNoticeMailList()) { - getMutableNoticeMailList().addAll(other.noticeMailList); - } if (other.hasMailList()) { getMutableMailList().addAll(other.mailList); } + if (other.hasNoticeMailList()) { + getMutableNoticeMailList().addAll(other.noticeMailList); + } return this; } @@ -396,8 +396,8 @@ public GetMailScRsp clear() { totalNum = 0; start = 0; isEnd = false; - noticeMailList.clear(); mailList.clear(); + noticeMailList.clear(); return this; } @@ -408,8 +408,8 @@ public GetMailScRsp clearQuick() { } cachedSize = -1; bitField0_ = 0; - noticeMailList.clearQuick(); mailList.clearQuick(); + noticeMailList.clearQuick(); return this; } @@ -427,8 +427,8 @@ public boolean equals(Object o) { && (!hasTotalNum() || totalNum == other.totalNum) && (!hasStart() || start == other.start) && (!hasIsEnd() || isEnd == other.isEnd) - && (!hasNoticeMailList() || noticeMailList.equals(other.noticeMailList)) - && (!hasMailList() || mailList.equals(other.mailList)); + && (!hasMailList() || mailList.equals(other.mailList)) + && (!hasNoticeMailList() || noticeMailList.equals(other.noticeMailList)); } @Override @@ -438,27 +438,27 @@ public void writeTo(final ProtoSink output) throws IOException { output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(totalNum); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(start); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 32); output.writeBoolNoTag(isEnd); } if ((bitField0_ & 0x00000010) != 0) { - for (int i = 0; i < noticeMailList.length(); i++) { - output.writeRawByte((byte) 66); - output.writeMessageNoTag(noticeMailList.get(i)); + for (int i = 0; i < mailList.length(); i++) { + output.writeRawByte((byte) 18); + output.writeMessageNoTag(mailList.get(i)); } } if ((bitField0_ & 0x00000020) != 0) { - for (int i = 0; i < mailList.length(); i++) { - output.writeRawByte((byte) 122); - output.writeMessageNoTag(mailList.get(i)); + for (int i = 0; i < noticeMailList.length(); i++) { + output.writeRawByte((byte) 50); + output.writeMessageNoTag(noticeMailList.get(i)); } } } @@ -479,10 +479,10 @@ protected int computeSerializedSize() { size += 2; } if ((bitField0_ & 0x00000010) != 0) { - size += (1 * noticeMailList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(noticeMailList); + size += (1 * mailList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(mailList); } if ((bitField0_ & 0x00000020) != 0) { - size += (1 * mailList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(mailList); + size += (1 * noticeMailList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(noticeMailList); } return size; } @@ -499,48 +499,48 @@ public GetMailScRsp mergeFrom(final ProtoSource input) throws IOException { retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 16) { + if (tag != 64) { break; } } - case 16: { + case 64: { // totalNum totalNum = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 32) { + if (tag != 112) { break; } } - case 32: { + case 112: { // start start = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 40) { + if (tag != 32) { break; } } - case 40: { + case 32: { // isEnd isEnd = input.readBool(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 66) { + if (tag != 18) { break; } } - case 66: { - // noticeMailList - tag = input.readRepeatedMessage(noticeMailList, tag); + case 18: { + // mailList + tag = input.readRepeatedMessage(mailList, tag); bitField0_ |= 0x00000010; - if (tag != 122) { + if (tag != 50) { break; } } - case 122: { - // mailList - tag = input.readRepeatedMessage(mailList, tag); + case 50: { + // noticeMailList + tag = input.readRepeatedMessage(noticeMailList, tag); bitField0_ |= 0x00000020; if (tag != 0) { break; @@ -576,10 +576,10 @@ public void writeTo(final JsonSink output) throws IOException { output.writeBool(FieldNames.isEnd, isEnd); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRepeatedMessage(FieldNames.noticeMailList, noticeMailList); + output.writeRepeatedMessage(FieldNames.mailList, mailList); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRepeatedMessage(FieldNames.mailList, mailList); + output.writeRepeatedMessage(FieldNames.noticeMailList, noticeMailList); } output.endObject(); } @@ -637,11 +637,11 @@ public GetMailScRsp mergeFrom(final JsonSource input) throws IOException { } break; } - case 17373677: - case 1540899199: { - if (input.isAtField(FieldNames.noticeMailList)) { + case -10520843: + case -308519386: { + if (input.isAtField(FieldNames.mailList)) { if (!input.trySkipNullValue()) { - input.readRepeatedMessage(noticeMailList); + input.readRepeatedMessage(mailList); bitField0_ |= 0x00000010; } } else { @@ -649,11 +649,11 @@ public GetMailScRsp mergeFrom(final JsonSource input) throws IOException { } break; } - case -10520843: - case -308519386: { - if (input.isAtField(FieldNames.mailList)) { + case 17373677: + case 1540899199: { + if (input.isAtField(FieldNames.noticeMailList)) { if (!input.trySkipNullValue()) { - input.readRepeatedMessage(mailList); + input.readRepeatedMessage(noticeMailList); bitField0_ |= 0x00000020; } } else { @@ -721,9 +721,9 @@ static class FieldNames { static final FieldName isEnd = FieldName.forField("isEnd", "is_end"); - static final FieldName noticeMailList = FieldName.forField("noticeMailList", "notice_mail_list"); - static final FieldName mailList = FieldName.forField("mailList", "mail_list"); + + static final FieldName noticeMailList = FieldName.forField("noticeMailList", "notice_mail_list"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/GetMissionStatusCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetMissionStatusCsReqOuterClass.java index b4b24d2c2..86c0d76ca 100644 --- a/src/generated/main/emu/lunarcore/proto/GetMissionStatusCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetMissionStatusCsReqOuterClass.java @@ -20,12 +20,12 @@ public static final class GetMissionStatusCsReq extends ProtoMessagerepeated uint32 mission_event_id_list = 9; + * repeated uint32 mission_event_id_list = 7; */ private final RepeatedInt missionEventIdList = RepeatedInt.newEmptyInstance(); /** - * repeated uint32 sub_mission_id_list = 13; + * repeated uint32 sub_mission_id_list = 8; */ private final RepeatedInt subMissionIdList = RepeatedInt.newEmptyInstance(); @@ -45,7 +45,7 @@ public static GetMissionStatusCsReq newInstance() { } /** - * repeated uint32 mission_event_id_list = 9; + * repeated uint32 mission_event_id_list = 7; * @return whether the missionEventIdList field is set */ public boolean hasMissionEventIdList() { @@ -53,7 +53,7 @@ public boolean hasMissionEventIdList() { } /** - * repeated uint32 mission_event_id_list = 9; + * repeated uint32 mission_event_id_list = 7; * @return this */ public GetMissionStatusCsReq clearMissionEventIdList() { @@ -63,7 +63,7 @@ public GetMissionStatusCsReq clearMissionEventIdList() { } /** - * repeated uint32 mission_event_id_list = 9; + * repeated uint32 mission_event_id_list = 7; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -77,7 +77,7 @@ public RepeatedInt getMissionEventIdList() { } /** - * repeated uint32 mission_event_id_list = 9; + * repeated uint32 mission_event_id_list = 7; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -91,7 +91,7 @@ public RepeatedInt getMutableMissionEventIdList() { } /** - * repeated uint32 mission_event_id_list = 9; + * repeated uint32 mission_event_id_list = 7; * @param value the missionEventIdList to add * @return this */ @@ -102,7 +102,7 @@ public GetMissionStatusCsReq addMissionEventIdList(final int value) { } /** - * repeated uint32 mission_event_id_list = 9; + * repeated uint32 mission_event_id_list = 7; * @param values the missionEventIdList to add * @return this */ @@ -113,7 +113,7 @@ public GetMissionStatusCsReq addAllMissionEventIdList(final int... values) { } /** - * repeated uint32 sub_mission_id_list = 13; + * repeated uint32 sub_mission_id_list = 8; * @return whether the subMissionIdList field is set */ public boolean hasSubMissionIdList() { @@ -121,7 +121,7 @@ public boolean hasSubMissionIdList() { } /** - * repeated uint32 sub_mission_id_list = 13; + * repeated uint32 sub_mission_id_list = 8; * @return this */ public GetMissionStatusCsReq clearSubMissionIdList() { @@ -131,7 +131,7 @@ public GetMissionStatusCsReq clearSubMissionIdList() { } /** - * repeated uint32 sub_mission_id_list = 13; + * repeated uint32 sub_mission_id_list = 8; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -145,7 +145,7 @@ public RepeatedInt getSubMissionIdList() { } /** - * repeated uint32 sub_mission_id_list = 13; + * repeated uint32 sub_mission_id_list = 8; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -159,7 +159,7 @@ public RepeatedInt getMutableSubMissionIdList() { } /** - * repeated uint32 sub_mission_id_list = 13; + * repeated uint32 sub_mission_id_list = 8; * @param value the subMissionIdList to add * @return this */ @@ -170,7 +170,7 @@ public GetMissionStatusCsReq addSubMissionIdList(final int value) { } /** - * repeated uint32 sub_mission_id_list = 13; + * repeated uint32 sub_mission_id_list = 8; * @param values the subMissionIdList to add * @return this */ @@ -323,13 +323,13 @@ public boolean equals(Object o) { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { for (int i = 0; i < missionEventIdList.length(); i++) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(missionEventIdList.array()[i]); } } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < subMissionIdList.length(); i++) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(subMissionIdList.array()[i]); } } @@ -363,16 +363,16 @@ public GetMissionStatusCsReq mergeFrom(final ProtoSource input) throws IOExcepti int tag = input.readTag(); while (true) { switch (tag) { - case 74: { + case 58: { // missionEventIdList [packed=true] input.readPackedUInt32(missionEventIdList, tag); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 106) { + if (tag != 66) { break; } } - case 106: { + case 66: { // subMissionIdList [packed=true] input.readPackedUInt32(subMissionIdList, tag); bitField0_ |= 0x00000002; @@ -400,13 +400,13 @@ public GetMissionStatusCsReq mergeFrom(final ProtoSource input) throws IOExcepti tag = input.readTag(); break; } - case 72: { + case 56: { // missionEventIdList [packed=false] tag = input.readRepeatedUInt32(missionEventIdList, tag); bitField0_ |= 0x00000001; break; } - case 104: { + case 64: { // subMissionIdList [packed=false] tag = input.readRepeatedUInt32(subMissionIdList, tag); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/GetMissionStatusScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetMissionStatusScRspOuterClass.java index 6d8dde4ca..aba888179 100644 --- a/src/generated/main/emu/lunarcore/proto/GetMissionStatusScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetMissionStatusScRspOuterClass.java @@ -21,34 +21,34 @@ public static final class GetMissionStatusScRsp extends ProtoMessageoptional uint32 retcode = 15; + * optional uint32 retcode = 4; */ private int retcode; /** - * repeated uint32 unfinished_main_mission_id_list = 2; + * repeated uint32 unfinished_main_mission_id_list = 10; */ private final RepeatedInt unfinishedMainMissionIdList = RepeatedInt.newEmptyInstance(); /** - * repeated uint32 disabled_main_mission_id_list = 9; + * repeated uint32 disabled_main_mission_id_list = 11; */ private final RepeatedInt disabledMainMissionIdList = RepeatedInt.newEmptyInstance(); /** - * repeated uint32 finished_main_mission_id_list = 11; + * repeated uint32 finished_main_mission_id_list = 13; */ private final RepeatedInt finishedMainMissionIdList = RepeatedInt.newEmptyInstance(); /** - * repeated .Mission sub_mission_status_list = 6; + * repeated .Mission mission_event_status_list = 9; */ - private final RepeatedMessage subMissionStatusList = RepeatedMessage.newEmptyInstance(MissionOuterClass.Mission.getFactory()); + private final RepeatedMessage missionEventStatusList = RepeatedMessage.newEmptyInstance(MissionOuterClass.Mission.getFactory()); /** - * repeated .Mission mission_event_status_list = 12; + * repeated .Mission sub_mission_status_list = 14; */ - private final RepeatedMessage missionEventStatusList = RepeatedMessage.newEmptyInstance(MissionOuterClass.Mission.getFactory()); + private final RepeatedMessage subMissionStatusList = RepeatedMessage.newEmptyInstance(MissionOuterClass.Mission.getFactory()); private GetMissionStatusScRsp() { } @@ -61,7 +61,7 @@ public static GetMissionStatusScRsp newInstance() { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 4; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -69,7 +69,7 @@ public boolean hasRetcode() { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 4; * @return this */ public GetMissionStatusScRsp clearRetcode() { @@ -79,7 +79,7 @@ public GetMissionStatusScRsp clearRetcode() { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 4; * @return the retcode */ public int getRetcode() { @@ -87,7 +87,7 @@ public int getRetcode() { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 4; * @param value the retcode to set * @return this */ @@ -98,7 +98,7 @@ public GetMissionStatusScRsp setRetcode(final int value) { } /** - * repeated uint32 unfinished_main_mission_id_list = 2; + * repeated uint32 unfinished_main_mission_id_list = 10; * @return whether the unfinishedMainMissionIdList field is set */ public boolean hasUnfinishedMainMissionIdList() { @@ -106,7 +106,7 @@ public boolean hasUnfinishedMainMissionIdList() { } /** - * repeated uint32 unfinished_main_mission_id_list = 2; + * repeated uint32 unfinished_main_mission_id_list = 10; * @return this */ public GetMissionStatusScRsp clearUnfinishedMainMissionIdList() { @@ -116,7 +116,7 @@ public GetMissionStatusScRsp clearUnfinishedMainMissionIdList() { } /** - * repeated uint32 unfinished_main_mission_id_list = 2; + * repeated uint32 unfinished_main_mission_id_list = 10; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -130,7 +130,7 @@ public RepeatedInt getUnfinishedMainMissionIdList() { } /** - * repeated uint32 unfinished_main_mission_id_list = 2; + * repeated uint32 unfinished_main_mission_id_list = 10; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -144,7 +144,7 @@ public RepeatedInt getMutableUnfinishedMainMissionIdList() { } /** - * repeated uint32 unfinished_main_mission_id_list = 2; + * repeated uint32 unfinished_main_mission_id_list = 10; * @param value the unfinishedMainMissionIdList to add * @return this */ @@ -155,7 +155,7 @@ public GetMissionStatusScRsp addUnfinishedMainMissionIdList(final int value) { } /** - * repeated uint32 unfinished_main_mission_id_list = 2; + * repeated uint32 unfinished_main_mission_id_list = 10; * @param values the unfinishedMainMissionIdList to add * @return this */ @@ -166,7 +166,7 @@ public GetMissionStatusScRsp addAllUnfinishedMainMissionIdList(final int... valu } /** - * repeated uint32 disabled_main_mission_id_list = 9; + * repeated uint32 disabled_main_mission_id_list = 11; * @return whether the disabledMainMissionIdList field is set */ public boolean hasDisabledMainMissionIdList() { @@ -174,7 +174,7 @@ public boolean hasDisabledMainMissionIdList() { } /** - * repeated uint32 disabled_main_mission_id_list = 9; + * repeated uint32 disabled_main_mission_id_list = 11; * @return this */ public GetMissionStatusScRsp clearDisabledMainMissionIdList() { @@ -184,7 +184,7 @@ public GetMissionStatusScRsp clearDisabledMainMissionIdList() { } /** - * repeated uint32 disabled_main_mission_id_list = 9; + * repeated uint32 disabled_main_mission_id_list = 11; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -198,7 +198,7 @@ public RepeatedInt getDisabledMainMissionIdList() { } /** - * repeated uint32 disabled_main_mission_id_list = 9; + * repeated uint32 disabled_main_mission_id_list = 11; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -212,7 +212,7 @@ public RepeatedInt getMutableDisabledMainMissionIdList() { } /** - * repeated uint32 disabled_main_mission_id_list = 9; + * repeated uint32 disabled_main_mission_id_list = 11; * @param value the disabledMainMissionIdList to add * @return this */ @@ -223,7 +223,7 @@ public GetMissionStatusScRsp addDisabledMainMissionIdList(final int value) { } /** - * repeated uint32 disabled_main_mission_id_list = 9; + * repeated uint32 disabled_main_mission_id_list = 11; * @param values the disabledMainMissionIdList to add * @return this */ @@ -234,7 +234,7 @@ public GetMissionStatusScRsp addAllDisabledMainMissionIdList(final int... values } /** - * repeated uint32 finished_main_mission_id_list = 11; + * repeated uint32 finished_main_mission_id_list = 13; * @return whether the finishedMainMissionIdList field is set */ public boolean hasFinishedMainMissionIdList() { @@ -242,7 +242,7 @@ public boolean hasFinishedMainMissionIdList() { } /** - * repeated uint32 finished_main_mission_id_list = 11; + * repeated uint32 finished_main_mission_id_list = 13; * @return this */ public GetMissionStatusScRsp clearFinishedMainMissionIdList() { @@ -252,7 +252,7 @@ public GetMissionStatusScRsp clearFinishedMainMissionIdList() { } /** - * repeated uint32 finished_main_mission_id_list = 11; + * repeated uint32 finished_main_mission_id_list = 13; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -266,7 +266,7 @@ public RepeatedInt getFinishedMainMissionIdList() { } /** - * repeated uint32 finished_main_mission_id_list = 11; + * repeated uint32 finished_main_mission_id_list = 13; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -280,7 +280,7 @@ public RepeatedInt getMutableFinishedMainMissionIdList() { } /** - * repeated uint32 finished_main_mission_id_list = 11; + * repeated uint32 finished_main_mission_id_list = 13; * @param value the finishedMainMissionIdList to add * @return this */ @@ -291,7 +291,7 @@ public GetMissionStatusScRsp addFinishedMainMissionIdList(final int value) { } /** - * repeated uint32 finished_main_mission_id_list = 11; + * repeated uint32 finished_main_mission_id_list = 13; * @param values the finishedMainMissionIdList to add * @return this */ @@ -302,39 +302,39 @@ public GetMissionStatusScRsp addAllFinishedMainMissionIdList(final int... values } /** - * repeated .Mission sub_mission_status_list = 6; - * @return whether the subMissionStatusList field is set + * repeated .Mission mission_event_status_list = 9; + * @return whether the missionEventStatusList field is set */ - public boolean hasSubMissionStatusList() { + public boolean hasMissionEventStatusList() { return (bitField0_ & 0x00000010) != 0; } /** - * repeated .Mission sub_mission_status_list = 6; + * repeated .Mission mission_event_status_list = 9; * @return this */ - public GetMissionStatusScRsp clearSubMissionStatusList() { + public GetMissionStatusScRsp clearMissionEventStatusList() { bitField0_ &= ~0x00000010; - subMissionStatusList.clear(); + missionEventStatusList.clear(); return this; } /** - * repeated .Mission sub_mission_status_list = 6; + * repeated .Mission mission_event_status_list = 9; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. * - * Use {@link #getMutableSubMissionStatusList()} if you want to modify it. + * Use {@link #getMutableMissionEventStatusList()} if you want to modify it. * * @return internal storage object for reading */ - public RepeatedMessage getSubMissionStatusList() { - return subMissionStatusList; + public RepeatedMessage getMissionEventStatusList() { + return missionEventStatusList; } /** - * repeated .Mission sub_mission_status_list = 6; + * repeated .Mission mission_event_status_list = 9; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -342,68 +342,68 @@ public RepeatedMessage getSubMissionStatusList() { * * @return internal storage object for modifications */ - public RepeatedMessage getMutableSubMissionStatusList() { + public RepeatedMessage getMutableMissionEventStatusList() { bitField0_ |= 0x00000010; - return subMissionStatusList; + return missionEventStatusList; } /** - * repeated .Mission sub_mission_status_list = 6; - * @param value the subMissionStatusList to add + * repeated .Mission mission_event_status_list = 9; + * @param value the missionEventStatusList to add * @return this */ - public GetMissionStatusScRsp addSubMissionStatusList(final MissionOuterClass.Mission value) { + public GetMissionStatusScRsp addMissionEventStatusList(final MissionOuterClass.Mission value) { bitField0_ |= 0x00000010; - subMissionStatusList.add(value); + missionEventStatusList.add(value); return this; } /** - * repeated .Mission sub_mission_status_list = 6; - * @param values the subMissionStatusList to add + * repeated .Mission mission_event_status_list = 9; + * @param values the missionEventStatusList to add * @return this */ - public GetMissionStatusScRsp addAllSubMissionStatusList( + public GetMissionStatusScRsp addAllMissionEventStatusList( final MissionOuterClass.Mission... values) { bitField0_ |= 0x00000010; - subMissionStatusList.addAll(values); + missionEventStatusList.addAll(values); return this; } /** - * repeated .Mission mission_event_status_list = 12; - * @return whether the missionEventStatusList field is set + * repeated .Mission sub_mission_status_list = 14; + * @return whether the subMissionStatusList field is set */ - public boolean hasMissionEventStatusList() { + public boolean hasSubMissionStatusList() { return (bitField0_ & 0x00000020) != 0; } /** - * repeated .Mission mission_event_status_list = 12; + * repeated .Mission sub_mission_status_list = 14; * @return this */ - public GetMissionStatusScRsp clearMissionEventStatusList() { + public GetMissionStatusScRsp clearSubMissionStatusList() { bitField0_ &= ~0x00000020; - missionEventStatusList.clear(); + subMissionStatusList.clear(); return this; } /** - * repeated .Mission mission_event_status_list = 12; + * repeated .Mission sub_mission_status_list = 14; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. * - * Use {@link #getMutableMissionEventStatusList()} if you want to modify it. + * Use {@link #getMutableSubMissionStatusList()} if you want to modify it. * * @return internal storage object for reading */ - public RepeatedMessage getMissionEventStatusList() { - return missionEventStatusList; + public RepeatedMessage getSubMissionStatusList() { + return subMissionStatusList; } /** - * repeated .Mission mission_event_status_list = 12; + * repeated .Mission sub_mission_status_list = 14; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -411,31 +411,31 @@ public RepeatedMessage getMissionEventStatusList() { * * @return internal storage object for modifications */ - public RepeatedMessage getMutableMissionEventStatusList() { + public RepeatedMessage getMutableSubMissionStatusList() { bitField0_ |= 0x00000020; - return missionEventStatusList; + return subMissionStatusList; } /** - * repeated .Mission mission_event_status_list = 12; - * @param value the missionEventStatusList to add + * repeated .Mission sub_mission_status_list = 14; + * @param value the subMissionStatusList to add * @return this */ - public GetMissionStatusScRsp addMissionEventStatusList(final MissionOuterClass.Mission value) { + public GetMissionStatusScRsp addSubMissionStatusList(final MissionOuterClass.Mission value) { bitField0_ |= 0x00000020; - missionEventStatusList.add(value); + subMissionStatusList.add(value); return this; } /** - * repeated .Mission mission_event_status_list = 12; - * @param values the missionEventStatusList to add + * repeated .Mission sub_mission_status_list = 14; + * @param values the subMissionStatusList to add * @return this */ - public GetMissionStatusScRsp addAllMissionEventStatusList( + public GetMissionStatusScRsp addAllSubMissionStatusList( final MissionOuterClass.Mission... values) { bitField0_ |= 0x00000020; - missionEventStatusList.addAll(values); + subMissionStatusList.addAll(values); return this; } @@ -448,8 +448,8 @@ public GetMissionStatusScRsp copyFrom(final GetMissionStatusScRsp other) { unfinishedMainMissionIdList.copyFrom(other.unfinishedMainMissionIdList); disabledMainMissionIdList.copyFrom(other.disabledMainMissionIdList); finishedMainMissionIdList.copyFrom(other.finishedMainMissionIdList); - subMissionStatusList.copyFrom(other.subMissionStatusList); missionEventStatusList.copyFrom(other.missionEventStatusList); + subMissionStatusList.copyFrom(other.subMissionStatusList); } return this; } @@ -472,12 +472,12 @@ public GetMissionStatusScRsp mergeFrom(final GetMissionStatusScRsp other) { if (other.hasFinishedMainMissionIdList()) { getMutableFinishedMainMissionIdList().addAll(other.finishedMainMissionIdList); } - if (other.hasSubMissionStatusList()) { - getMutableSubMissionStatusList().addAll(other.subMissionStatusList); - } if (other.hasMissionEventStatusList()) { getMutableMissionEventStatusList().addAll(other.missionEventStatusList); } + if (other.hasSubMissionStatusList()) { + getMutableSubMissionStatusList().addAll(other.subMissionStatusList); + } return this; } @@ -492,8 +492,8 @@ public GetMissionStatusScRsp clear() { unfinishedMainMissionIdList.clear(); disabledMainMissionIdList.clear(); finishedMainMissionIdList.clear(); - subMissionStatusList.clear(); missionEventStatusList.clear(); + subMissionStatusList.clear(); return this; } @@ -507,8 +507,8 @@ public GetMissionStatusScRsp clearQuick() { unfinishedMainMissionIdList.clear(); disabledMainMissionIdList.clear(); finishedMainMissionIdList.clear(); - subMissionStatusList.clearQuick(); missionEventStatusList.clearQuick(); + subMissionStatusList.clearQuick(); return this; } @@ -526,44 +526,44 @@ public boolean equals(Object o) { && (!hasUnfinishedMainMissionIdList() || unfinishedMainMissionIdList.equals(other.unfinishedMainMissionIdList)) && (!hasDisabledMainMissionIdList() || disabledMainMissionIdList.equals(other.disabledMainMissionIdList)) && (!hasFinishedMainMissionIdList() || finishedMainMissionIdList.equals(other.finishedMainMissionIdList)) - && (!hasSubMissionStatusList() || subMissionStatusList.equals(other.subMissionStatusList)) - && (!hasMissionEventStatusList() || missionEventStatusList.equals(other.missionEventStatusList)); + && (!hasMissionEventStatusList() || missionEventStatusList.equals(other.missionEventStatusList)) + && (!hasSubMissionStatusList() || subMissionStatusList.equals(other.subMissionStatusList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < unfinishedMainMissionIdList.length(); i++) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(unfinishedMainMissionIdList.array()[i]); } } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < disabledMainMissionIdList.length(); i++) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(disabledMainMissionIdList.array()[i]); } } if ((bitField0_ & 0x00000008) != 0) { for (int i = 0; i < finishedMainMissionIdList.length(); i++) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(finishedMainMissionIdList.array()[i]); } } if ((bitField0_ & 0x00000010) != 0) { - for (int i = 0; i < subMissionStatusList.length(); i++) { - output.writeRawByte((byte) 50); - output.writeMessageNoTag(subMissionStatusList.get(i)); + for (int i = 0; i < missionEventStatusList.length(); i++) { + output.writeRawByte((byte) 74); + output.writeMessageNoTag(missionEventStatusList.get(i)); } } if ((bitField0_ & 0x00000020) != 0) { - for (int i = 0; i < missionEventStatusList.length(); i++) { - output.writeRawByte((byte) 98); - output.writeMessageNoTag(missionEventStatusList.get(i)); + for (int i = 0; i < subMissionStatusList.length(); i++) { + output.writeRawByte((byte) 114); + output.writeMessageNoTag(subMissionStatusList.get(i)); } } } @@ -584,10 +584,10 @@ protected int computeSerializedSize() { size += (1 * finishedMainMissionIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(finishedMainMissionIdList); } if ((bitField0_ & 0x00000010) != 0) { - size += (1 * subMissionStatusList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(subMissionStatusList); + size += (1 * missionEventStatusList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(missionEventStatusList); } if ((bitField0_ & 0x00000020) != 0) { - size += (1 * missionEventStatusList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(missionEventStatusList); + size += (1 * subMissionStatusList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(subMissionStatusList); } return size; } @@ -599,53 +599,53 @@ public GetMissionStatusScRsp mergeFrom(final ProtoSource input) throws IOExcepti int tag = input.readTag(); while (true) { switch (tag) { - case 120: { + case 32: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 18) { + if (tag != 82) { break; } } - case 18: { + case 82: { // unfinishedMainMissionIdList [packed=true] input.readPackedUInt32(unfinishedMainMissionIdList, tag); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 74) { + if (tag != 90) { break; } } - case 74: { + case 90: { // disabledMainMissionIdList [packed=true] input.readPackedUInt32(disabledMainMissionIdList, tag); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 90) { + if (tag != 106) { break; } } - case 90: { + case 106: { // finishedMainMissionIdList [packed=true] input.readPackedUInt32(finishedMainMissionIdList, tag); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 50) { + if (tag != 74) { break; } } - case 50: { - // subMissionStatusList - tag = input.readRepeatedMessage(subMissionStatusList, tag); + case 74: { + // missionEventStatusList + tag = input.readRepeatedMessage(missionEventStatusList, tag); bitField0_ |= 0x00000010; - if (tag != 98) { + if (tag != 114) { break; } } - case 98: { - // missionEventStatusList - tag = input.readRepeatedMessage(missionEventStatusList, tag); + case 114: { + // subMissionStatusList + tag = input.readRepeatedMessage(subMissionStatusList, tag); bitField0_ |= 0x00000020; if (tag != 0) { break; @@ -661,19 +661,19 @@ public GetMissionStatusScRsp mergeFrom(final ProtoSource input) throws IOExcepti tag = input.readTag(); break; } - case 16: { + case 80: { // unfinishedMainMissionIdList [packed=false] tag = input.readRepeatedUInt32(unfinishedMainMissionIdList, tag); bitField0_ |= 0x00000002; break; } - case 72: { + case 88: { // disabledMainMissionIdList [packed=false] tag = input.readRepeatedUInt32(disabledMainMissionIdList, tag); bitField0_ |= 0x00000004; break; } - case 88: { + case 104: { // finishedMainMissionIdList [packed=false] tag = input.readRepeatedUInt32(finishedMainMissionIdList, tag); bitField0_ |= 0x00000008; @@ -699,10 +699,10 @@ public void writeTo(final JsonSink output) throws IOException { output.writeRepeatedUInt32(FieldNames.finishedMainMissionIdList, finishedMainMissionIdList); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRepeatedMessage(FieldNames.subMissionStatusList, subMissionStatusList); + output.writeRepeatedMessage(FieldNames.missionEventStatusList, missionEventStatusList); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRepeatedMessage(FieldNames.missionEventStatusList, missionEventStatusList); + output.writeRepeatedMessage(FieldNames.subMissionStatusList, subMissionStatusList); } output.endObject(); } @@ -761,11 +761,11 @@ public GetMissionStatusScRsp mergeFrom(final JsonSource input) throws IOExceptio } break; } - case -1842850820: - case 1165580825: { - if (input.isAtField(FieldNames.subMissionStatusList)) { + case 582053566: + case 1494751923: { + if (input.isAtField(FieldNames.missionEventStatusList)) { if (!input.trySkipNullValue()) { - input.readRepeatedMessage(subMissionStatusList); + input.readRepeatedMessage(missionEventStatusList); bitField0_ |= 0x00000010; } } else { @@ -773,11 +773,11 @@ public GetMissionStatusScRsp mergeFrom(final JsonSource input) throws IOExceptio } break; } - case 582053566: - case 1494751923: { - if (input.isAtField(FieldNames.missionEventStatusList)) { + case -1842850820: + case 1165580825: { + if (input.isAtField(FieldNames.subMissionStatusList)) { if (!input.trySkipNullValue()) { - input.readRepeatedMessage(missionEventStatusList); + input.readRepeatedMessage(subMissionStatusList); bitField0_ |= 0x00000020; } } else { @@ -846,9 +846,9 @@ static class FieldNames { static final FieldName finishedMainMissionIdList = FieldName.forField("finishedMainMissionIdList", "finished_main_mission_id_list"); - static final FieldName subMissionStatusList = FieldName.forField("subMissionStatusList", "sub_mission_status_list"); - static final FieldName missionEventStatusList = FieldName.forField("missionEventStatusList", "mission_event_status_list"); + + static final FieldName subMissionStatusList = FieldName.forField("subMissionStatusList", "sub_mission_status_list"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/GetNpcTakenRewardCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetNpcTakenRewardCsReqOuterClass.java index bae5c8899..5a73302dd 100644 --- a/src/generated/main/emu/lunarcore/proto/GetNpcTakenRewardCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetNpcTakenRewardCsReqOuterClass.java @@ -19,7 +19,7 @@ public static final class GetNpcTakenRewardCsReq extends ProtoMessageoptional uint32 npc_id = 6; + * optional uint32 npc_id = 4; */ private int npcId; @@ -34,7 +34,7 @@ public static GetNpcTakenRewardCsReq newInstance() { } /** - * optional uint32 npc_id = 6; + * optional uint32 npc_id = 4; * @return whether the npcId field is set */ public boolean hasNpcId() { @@ -42,7 +42,7 @@ public boolean hasNpcId() { } /** - * optional uint32 npc_id = 6; + * optional uint32 npc_id = 4; * @return this */ public GetNpcTakenRewardCsReq clearNpcId() { @@ -52,7 +52,7 @@ public GetNpcTakenRewardCsReq clearNpcId() { } /** - * optional uint32 npc_id = 6; + * optional uint32 npc_id = 4; * @return the npcId */ public int getNpcId() { @@ -60,7 +60,7 @@ public int getNpcId() { } /** - * optional uint32 npc_id = 6; + * optional uint32 npc_id = 4; * @param value the npcId to set * @return this */ @@ -129,7 +129,7 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(npcId); } } @@ -150,7 +150,7 @@ public GetNpcTakenRewardCsReq mergeFrom(final ProtoSource input) throws IOExcept int tag = input.readTag(); while (true) { switch (tag) { - case 48: { + case 32: { // npcId npcId = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/GetNpcTakenRewardScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetNpcTakenRewardScRspOuterClass.java index 5a14cab77..8f9f01406 100644 --- a/src/generated/main/emu/lunarcore/proto/GetNpcTakenRewardScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetNpcTakenRewardScRspOuterClass.java @@ -19,14 +19,14 @@ public static final class GetNpcTakenRewardScRsp extends ProtoMessageoptional uint32 npc_id = 1; + * optional uint32 retcode = 3; */ - private int npcId; + private int retcode; /** - * optional uint32 retcode = 12; + * optional uint32 npc_id = 13; */ - private int retcode; + private int npcId; private GetNpcTakenRewardScRsp() { } @@ -39,76 +39,76 @@ public static GetNpcTakenRewardScRsp newInstance() { } /** - * optional uint32 npc_id = 1; - * @return whether the npcId field is set + * optional uint32 retcode = 3; + * @return whether the retcode field is set */ - public boolean hasNpcId() { + public boolean hasRetcode() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 npc_id = 1; + * optional uint32 retcode = 3; * @return this */ - public GetNpcTakenRewardScRsp clearNpcId() { + public GetNpcTakenRewardScRsp clearRetcode() { bitField0_ &= ~0x00000001; - npcId = 0; + retcode = 0; return this; } /** - * optional uint32 npc_id = 1; - * @return the npcId + * optional uint32 retcode = 3; + * @return the retcode */ - public int getNpcId() { - return npcId; + public int getRetcode() { + return retcode; } /** - * optional uint32 npc_id = 1; - * @param value the npcId to set + * optional uint32 retcode = 3; + * @param value the retcode to set * @return this */ - public GetNpcTakenRewardScRsp setNpcId(final int value) { + public GetNpcTakenRewardScRsp setRetcode(final int value) { bitField0_ |= 0x00000001; - npcId = value; + retcode = value; return this; } /** - * optional uint32 retcode = 12; - * @return whether the retcode field is set + * optional uint32 npc_id = 13; + * @return whether the npcId field is set */ - public boolean hasRetcode() { + public boolean hasNpcId() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 retcode = 12; + * optional uint32 npc_id = 13; * @return this */ - public GetNpcTakenRewardScRsp clearRetcode() { + public GetNpcTakenRewardScRsp clearNpcId() { bitField0_ &= ~0x00000002; - retcode = 0; + npcId = 0; return this; } /** - * optional uint32 retcode = 12; - * @return the retcode + * optional uint32 npc_id = 13; + * @return the npcId */ - public int getRetcode() { - return retcode; + public int getNpcId() { + return npcId; } /** - * optional uint32 retcode = 12; - * @param value the retcode to set + * optional uint32 npc_id = 13; + * @param value the npcId to set * @return this */ - public GetNpcTakenRewardScRsp setRetcode(final int value) { + public GetNpcTakenRewardScRsp setNpcId(final int value) { bitField0_ |= 0x00000002; - retcode = value; + npcId = value; return this; } @@ -117,8 +117,8 @@ public GetNpcTakenRewardScRsp copyFrom(final GetNpcTakenRewardScRsp other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - npcId = other.npcId; retcode = other.retcode; + npcId = other.npcId; } return this; } @@ -129,12 +129,12 @@ public GetNpcTakenRewardScRsp mergeFrom(final GetNpcTakenRewardScRsp other) { return this; } cachedSize = -1; - if (other.hasNpcId()) { - setNpcId(other.npcId); - } if (other.hasRetcode()) { setRetcode(other.retcode); } + if (other.hasNpcId()) { + setNpcId(other.npcId); + } return this; } @@ -145,8 +145,8 @@ public GetNpcTakenRewardScRsp clear() { } cachedSize = -1; bitField0_ = 0; - npcId = 0; retcode = 0; + npcId = 0; return this; } @@ -170,19 +170,19 @@ public boolean equals(Object o) { } GetNpcTakenRewardScRsp other = (GetNpcTakenRewardScRsp) o; return bitField0_ == other.bitField0_ - && (!hasNpcId() || npcId == other.npcId) - && (!hasRetcode() || retcode == other.retcode); + && (!hasRetcode() || retcode == other.retcode) + && (!hasNpcId() || npcId == other.npcId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); - output.writeUInt32NoTag(npcId); + output.writeRawByte((byte) 24); + output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 96); - output.writeUInt32NoTag(retcode); + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(npcId); } } @@ -190,10 +190,10 @@ public void writeTo(final ProtoSink output) throws IOException { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(npcId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(npcId); } return size; } @@ -205,18 +205,18 @@ public GetNpcTakenRewardScRsp mergeFrom(final ProtoSource input) throws IOExcept int tag = input.readTag(); while (true) { switch (tag) { - case 8: { - // npcId - npcId = input.readUInt32(); + case 24: { + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 96) { + if (tag != 104) { break; } } - case 96: { - // retcode - retcode = input.readUInt32(); + case 104: { + // npcId + npcId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -241,10 +241,10 @@ public GetNpcTakenRewardScRsp mergeFrom(final ProtoSource input) throws IOExcept public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.npcId, npcId); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.npcId, npcId); } output.endObject(); } @@ -256,11 +256,10 @@ public GetNpcTakenRewardScRsp mergeFrom(final JsonSource input) throws IOExcepti } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 105021404: - case -1039282375: { - if (input.isAtField(FieldNames.npcId)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - npcId = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -268,10 +267,11 @@ public GetNpcTakenRewardScRsp mergeFrom(final JsonSource input) throws IOExcepti } break; } - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case 105021404: + case -1039282375: { + if (input.isAtField(FieldNames.npcId)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + npcId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -332,9 +332,9 @@ public GetNpcTakenRewardScRsp create() { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName npcId = FieldName.forField("npcId", "npc_id"); - static final FieldName retcode = FieldName.forField("retcode"); + + static final FieldName npcId = FieldName.forField("npcId", "npc_id"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/GetPhoneDataScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetPhoneDataScRspOuterClass.java index 6d0ed166c..6c30f5c8d 100644 --- a/src/generated/main/emu/lunarcore/proto/GetPhoneDataScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetPhoneDataScRspOuterClass.java @@ -20,30 +20,30 @@ public static final class GetPhoneDataScRsp extends ProtoMessageoptional uint32 cur_chat_bubble = 6; + * optional uint32 cur_phone_theme = 10; + */ + private int curPhoneTheme; + + /** + * optional uint32 cur_chat_bubble = 13; */ private int curChatBubble; /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 14; */ private int retcode; /** - * optional uint32 cur_phone_theme = 10; + * repeated uint32 owned_chat_bubbles = 9; */ - private int curPhoneTheme; + private final RepeatedInt ownedChatBubbles = RepeatedInt.newEmptyInstance(); /** * repeated uint32 owned_phone_themes = 11; */ private final RepeatedInt ownedPhoneThemes = RepeatedInt.newEmptyInstance(); - /** - * repeated uint32 owned_chat_bubbles = 15; - */ - private final RepeatedInt ownedChatBubbles = RepeatedInt.newEmptyInstance(); - private GetPhoneDataScRsp() { } @@ -55,150 +55,150 @@ public static GetPhoneDataScRsp newInstance() { } /** - * optional uint32 cur_chat_bubble = 6; - * @return whether the curChatBubble field is set + * optional uint32 cur_phone_theme = 10; + * @return whether the curPhoneTheme field is set */ - public boolean hasCurChatBubble() { + public boolean hasCurPhoneTheme() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 cur_chat_bubble = 6; + * optional uint32 cur_phone_theme = 10; * @return this */ - public GetPhoneDataScRsp clearCurChatBubble() { + public GetPhoneDataScRsp clearCurPhoneTheme() { bitField0_ &= ~0x00000001; - curChatBubble = 0; + curPhoneTheme = 0; return this; } /** - * optional uint32 cur_chat_bubble = 6; - * @return the curChatBubble + * optional uint32 cur_phone_theme = 10; + * @return the curPhoneTheme */ - public int getCurChatBubble() { - return curChatBubble; + public int getCurPhoneTheme() { + return curPhoneTheme; } /** - * optional uint32 cur_chat_bubble = 6; - * @param value the curChatBubble to set + * optional uint32 cur_phone_theme = 10; + * @param value the curPhoneTheme to set * @return this */ - public GetPhoneDataScRsp setCurChatBubble(final int value) { + public GetPhoneDataScRsp setCurPhoneTheme(final int value) { bitField0_ |= 0x00000001; - curChatBubble = value; + curPhoneTheme = value; return this; } /** - * optional uint32 retcode = 8; - * @return whether the retcode field is set + * optional uint32 cur_chat_bubble = 13; + * @return whether the curChatBubble field is set */ - public boolean hasRetcode() { + public boolean hasCurChatBubble() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 retcode = 8; + * optional uint32 cur_chat_bubble = 13; * @return this */ - public GetPhoneDataScRsp clearRetcode() { + public GetPhoneDataScRsp clearCurChatBubble() { bitField0_ &= ~0x00000002; - retcode = 0; + curChatBubble = 0; return this; } /** - * optional uint32 retcode = 8; - * @return the retcode + * optional uint32 cur_chat_bubble = 13; + * @return the curChatBubble */ - public int getRetcode() { - return retcode; + public int getCurChatBubble() { + return curChatBubble; } /** - * optional uint32 retcode = 8; - * @param value the retcode to set + * optional uint32 cur_chat_bubble = 13; + * @param value the curChatBubble to set * @return this */ - public GetPhoneDataScRsp setRetcode(final int value) { + public GetPhoneDataScRsp setCurChatBubble(final int value) { bitField0_ |= 0x00000002; - retcode = value; + curChatBubble = value; return this; } /** - * optional uint32 cur_phone_theme = 10; - * @return whether the curPhoneTheme field is set + * optional uint32 retcode = 14; + * @return whether the retcode field is set */ - public boolean hasCurPhoneTheme() { + public boolean hasRetcode() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 cur_phone_theme = 10; + * optional uint32 retcode = 14; * @return this */ - public GetPhoneDataScRsp clearCurPhoneTheme() { + public GetPhoneDataScRsp clearRetcode() { bitField0_ &= ~0x00000004; - curPhoneTheme = 0; + retcode = 0; return this; } /** - * optional uint32 cur_phone_theme = 10; - * @return the curPhoneTheme + * optional uint32 retcode = 14; + * @return the retcode */ - public int getCurPhoneTheme() { - return curPhoneTheme; + public int getRetcode() { + return retcode; } /** - * optional uint32 cur_phone_theme = 10; - * @param value the curPhoneTheme to set + * optional uint32 retcode = 14; + * @param value the retcode to set * @return this */ - public GetPhoneDataScRsp setCurPhoneTheme(final int value) { + public GetPhoneDataScRsp setRetcode(final int value) { bitField0_ |= 0x00000004; - curPhoneTheme = value; + retcode = value; return this; } /** - * repeated uint32 owned_phone_themes = 11; - * @return whether the ownedPhoneThemes field is set + * repeated uint32 owned_chat_bubbles = 9; + * @return whether the ownedChatBubbles field is set */ - public boolean hasOwnedPhoneThemes() { + public boolean hasOwnedChatBubbles() { return (bitField0_ & 0x00000008) != 0; } /** - * repeated uint32 owned_phone_themes = 11; + * repeated uint32 owned_chat_bubbles = 9; * @return this */ - public GetPhoneDataScRsp clearOwnedPhoneThemes() { + public GetPhoneDataScRsp clearOwnedChatBubbles() { bitField0_ &= ~0x00000008; - ownedPhoneThemes.clear(); + ownedChatBubbles.clear(); return this; } /** - * repeated uint32 owned_phone_themes = 11; + * repeated uint32 owned_chat_bubbles = 9; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. * - * Use {@link #getMutableOwnedPhoneThemes()} if you want to modify it. + * Use {@link #getMutableOwnedChatBubbles()} if you want to modify it. * * @return internal storage object for reading */ - public RepeatedInt getOwnedPhoneThemes() { - return ownedPhoneThemes; + public RepeatedInt getOwnedChatBubbles() { + return ownedChatBubbles; } /** - * repeated uint32 owned_phone_themes = 11; + * repeated uint32 owned_chat_bubbles = 9; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -206,67 +206,67 @@ public RepeatedInt getOwnedPhoneThemes() { * * @return internal storage object for modifications */ - public RepeatedInt getMutableOwnedPhoneThemes() { + public RepeatedInt getMutableOwnedChatBubbles() { bitField0_ |= 0x00000008; - return ownedPhoneThemes; + return ownedChatBubbles; } /** - * repeated uint32 owned_phone_themes = 11; - * @param value the ownedPhoneThemes to add + * repeated uint32 owned_chat_bubbles = 9; + * @param value the ownedChatBubbles to add * @return this */ - public GetPhoneDataScRsp addOwnedPhoneThemes(final int value) { + public GetPhoneDataScRsp addOwnedChatBubbles(final int value) { bitField0_ |= 0x00000008; - ownedPhoneThemes.add(value); + ownedChatBubbles.add(value); return this; } /** - * repeated uint32 owned_phone_themes = 11; - * @param values the ownedPhoneThemes to add + * repeated uint32 owned_chat_bubbles = 9; + * @param values the ownedChatBubbles to add * @return this */ - public GetPhoneDataScRsp addAllOwnedPhoneThemes(final int... values) { + public GetPhoneDataScRsp addAllOwnedChatBubbles(final int... values) { bitField0_ |= 0x00000008; - ownedPhoneThemes.addAll(values); + ownedChatBubbles.addAll(values); return this; } /** - * repeated uint32 owned_chat_bubbles = 15; - * @return whether the ownedChatBubbles field is set + * repeated uint32 owned_phone_themes = 11; + * @return whether the ownedPhoneThemes field is set */ - public boolean hasOwnedChatBubbles() { + public boolean hasOwnedPhoneThemes() { return (bitField0_ & 0x00000010) != 0; } /** - * repeated uint32 owned_chat_bubbles = 15; + * repeated uint32 owned_phone_themes = 11; * @return this */ - public GetPhoneDataScRsp clearOwnedChatBubbles() { + public GetPhoneDataScRsp clearOwnedPhoneThemes() { bitField0_ &= ~0x00000010; - ownedChatBubbles.clear(); + ownedPhoneThemes.clear(); return this; } /** - * repeated uint32 owned_chat_bubbles = 15; + * repeated uint32 owned_phone_themes = 11; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. * - * Use {@link #getMutableOwnedChatBubbles()} if you want to modify it. + * Use {@link #getMutableOwnedPhoneThemes()} if you want to modify it. * * @return internal storage object for reading */ - public RepeatedInt getOwnedChatBubbles() { - return ownedChatBubbles; + public RepeatedInt getOwnedPhoneThemes() { + return ownedPhoneThemes; } /** - * repeated uint32 owned_chat_bubbles = 15; + * repeated uint32 owned_phone_themes = 11; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -274,30 +274,30 @@ public RepeatedInt getOwnedChatBubbles() { * * @return internal storage object for modifications */ - public RepeatedInt getMutableOwnedChatBubbles() { + public RepeatedInt getMutableOwnedPhoneThemes() { bitField0_ |= 0x00000010; - return ownedChatBubbles; + return ownedPhoneThemes; } /** - * repeated uint32 owned_chat_bubbles = 15; - * @param value the ownedChatBubbles to add + * repeated uint32 owned_phone_themes = 11; + * @param value the ownedPhoneThemes to add * @return this */ - public GetPhoneDataScRsp addOwnedChatBubbles(final int value) { + public GetPhoneDataScRsp addOwnedPhoneThemes(final int value) { bitField0_ |= 0x00000010; - ownedChatBubbles.add(value); + ownedPhoneThemes.add(value); return this; } /** - * repeated uint32 owned_chat_bubbles = 15; - * @param values the ownedChatBubbles to add + * repeated uint32 owned_phone_themes = 11; + * @param values the ownedPhoneThemes to add * @return this */ - public GetPhoneDataScRsp addAllOwnedChatBubbles(final int... values) { + public GetPhoneDataScRsp addAllOwnedPhoneThemes(final int... values) { bitField0_ |= 0x00000010; - ownedChatBubbles.addAll(values); + ownedPhoneThemes.addAll(values); return this; } @@ -306,11 +306,11 @@ public GetPhoneDataScRsp copyFrom(final GetPhoneDataScRsp other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; + curPhoneTheme = other.curPhoneTheme; curChatBubble = other.curChatBubble; retcode = other.retcode; - curPhoneTheme = other.curPhoneTheme; - ownedPhoneThemes.copyFrom(other.ownedPhoneThemes); ownedChatBubbles.copyFrom(other.ownedChatBubbles); + ownedPhoneThemes.copyFrom(other.ownedPhoneThemes); } return this; } @@ -321,21 +321,21 @@ public GetPhoneDataScRsp mergeFrom(final GetPhoneDataScRsp other) { return this; } cachedSize = -1; + if (other.hasCurPhoneTheme()) { + setCurPhoneTheme(other.curPhoneTheme); + } if (other.hasCurChatBubble()) { setCurChatBubble(other.curChatBubble); } if (other.hasRetcode()) { setRetcode(other.retcode); } - if (other.hasCurPhoneTheme()) { - setCurPhoneTheme(other.curPhoneTheme); + if (other.hasOwnedChatBubbles()) { + getMutableOwnedChatBubbles().addAll(other.ownedChatBubbles); } if (other.hasOwnedPhoneThemes()) { getMutableOwnedPhoneThemes().addAll(other.ownedPhoneThemes); } - if (other.hasOwnedChatBubbles()) { - getMutableOwnedChatBubbles().addAll(other.ownedChatBubbles); - } return this; } @@ -346,11 +346,11 @@ public GetPhoneDataScRsp clear() { } cachedSize = -1; bitField0_ = 0; + curPhoneTheme = 0; curChatBubble = 0; retcode = 0; - curPhoneTheme = 0; - ownedPhoneThemes.clear(); ownedChatBubbles.clear(); + ownedPhoneThemes.clear(); return this; } @@ -361,8 +361,8 @@ public GetPhoneDataScRsp clearQuick() { } cachedSize = -1; bitField0_ = 0; - ownedPhoneThemes.clear(); ownedChatBubbles.clear(); + ownedPhoneThemes.clear(); return this; } @@ -376,37 +376,37 @@ public boolean equals(Object o) { } GetPhoneDataScRsp other = (GetPhoneDataScRsp) o; return bitField0_ == other.bitField0_ + && (!hasCurPhoneTheme() || curPhoneTheme == other.curPhoneTheme) && (!hasCurChatBubble() || curChatBubble == other.curChatBubble) && (!hasRetcode() || retcode == other.retcode) - && (!hasCurPhoneTheme() || curPhoneTheme == other.curPhoneTheme) - && (!hasOwnedPhoneThemes() || ownedPhoneThemes.equals(other.ownedPhoneThemes)) - && (!hasOwnedChatBubbles() || ownedChatBubbles.equals(other.ownedChatBubbles)); + && (!hasOwnedChatBubbles() || ownedChatBubbles.equals(other.ownedChatBubbles)) + && (!hasOwnedPhoneThemes() || ownedPhoneThemes.equals(other.ownedPhoneThemes)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 48); - output.writeUInt32NoTag(curChatBubble); + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(curPhoneTheme); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 64); - output.writeUInt32NoTag(retcode); + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(curChatBubble); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 80); - output.writeUInt32NoTag(curPhoneTheme); + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000008) != 0) { - for (int i = 0; i < ownedPhoneThemes.length(); i++) { - output.writeRawByte((byte) 88); - output.writeUInt32NoTag(ownedPhoneThemes.array()[i]); + for (int i = 0; i < ownedChatBubbles.length(); i++) { + output.writeRawByte((byte) 72); + output.writeUInt32NoTag(ownedChatBubbles.array()[i]); } } if ((bitField0_ & 0x00000010) != 0) { - for (int i = 0; i < ownedChatBubbles.length(); i++) { - output.writeRawByte((byte) 120); - output.writeUInt32NoTag(ownedChatBubbles.array()[i]); + for (int i = 0; i < ownedPhoneThemes.length(); i++) { + output.writeRawByte((byte) 88); + output.writeUInt32NoTag(ownedPhoneThemes.array()[i]); } } } @@ -415,19 +415,19 @@ public void writeTo(final ProtoSink output) throws IOException { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(curChatBubble); + size += 1 + ProtoSink.computeUInt32SizeNoTag(curPhoneTheme); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(curChatBubble); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(curPhoneTheme); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000008) != 0) { - size += (1 * ownedPhoneThemes.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(ownedPhoneThemes); + size += (1 * ownedChatBubbles.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(ownedChatBubbles); } if ((bitField0_ & 0x00000010) != 0) { - size += (1 * ownedChatBubbles.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(ownedChatBubbles); + size += (1 * ownedPhoneThemes.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(ownedPhoneThemes); } return size; } @@ -439,45 +439,45 @@ public GetPhoneDataScRsp mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 48: { - // curChatBubble - curChatBubble = input.readUInt32(); + case 80: { + // curPhoneTheme + curPhoneTheme = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 64) { + if (tag != 104) { break; } } - case 64: { - // retcode - retcode = input.readUInt32(); + case 104: { + // curChatBubble + curChatBubble = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 80) { + if (tag != 112) { break; } } - case 80: { - // curPhoneTheme - curPhoneTheme = input.readUInt32(); + case 112: { + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 90) { + if (tag != 74) { break; } } - case 90: { - // ownedPhoneThemes [packed=true] - input.readPackedUInt32(ownedPhoneThemes, tag); + case 74: { + // ownedChatBubbles [packed=true] + input.readPackedUInt32(ownedChatBubbles, tag); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 122) { + if (tag != 90) { break; } } - case 122: { - // ownedChatBubbles [packed=true] - input.readPackedUInt32(ownedChatBubbles, tag); + case 90: { + // ownedPhoneThemes [packed=true] + input.readPackedUInt32(ownedPhoneThemes, tag); bitField0_ |= 0x00000010; tag = input.readTag(); if (tag != 0) { @@ -494,15 +494,15 @@ public GetPhoneDataScRsp mergeFrom(final ProtoSource input) throws IOException { tag = input.readTag(); break; } - case 88: { - // ownedPhoneThemes [packed=false] - tag = input.readRepeatedUInt32(ownedPhoneThemes, tag); + case 72: { + // ownedChatBubbles [packed=false] + tag = input.readRepeatedUInt32(ownedChatBubbles, tag); bitField0_ |= 0x00000008; break; } - case 120: { - // ownedChatBubbles [packed=false] - tag = input.readRepeatedUInt32(ownedChatBubbles, tag); + case 88: { + // ownedPhoneThemes [packed=false] + tag = input.readRepeatedUInt32(ownedPhoneThemes, tag); bitField0_ |= 0x00000010; break; } @@ -514,19 +514,19 @@ public GetPhoneDataScRsp mergeFrom(final ProtoSource input) throws IOException { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.curChatBubble, curChatBubble); + output.writeUInt32(FieldNames.curPhoneTheme, curPhoneTheme); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.curChatBubble, curChatBubble); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.curPhoneTheme, curPhoneTheme); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRepeatedUInt32(FieldNames.ownedPhoneThemes, ownedPhoneThemes); + output.writeRepeatedUInt32(FieldNames.ownedChatBubbles, ownedChatBubbles); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRepeatedUInt32(FieldNames.ownedChatBubbles, ownedChatBubbles); + output.writeRepeatedUInt32(FieldNames.ownedPhoneThemes, ownedPhoneThemes); } output.endObject(); } @@ -538,11 +538,11 @@ public GetPhoneDataScRsp mergeFrom(final JsonSource input) throws IOException { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 94167140: - case 1828957140: { - if (input.isAtField(FieldNames.curChatBubble)) { + case 405670747: + case -514634695: { + if (input.isAtField(FieldNames.curPhoneTheme)) { if (!input.trySkipNullValue()) { - curChatBubble = input.readUInt32(); + curPhoneTheme = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -550,10 +550,11 @@ public GetPhoneDataScRsp mergeFrom(final JsonSource input) throws IOException { } break; } - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case 94167140: + case 1828957140: { + if (input.isAtField(FieldNames.curChatBubble)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + curChatBubble = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -561,11 +562,10 @@ public GetPhoneDataScRsp mergeFrom(final JsonSource input) throws IOException { } break; } - case 405670747: - case -514634695: { - if (input.isAtField(FieldNames.curPhoneTheme)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - curPhoneTheme = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -573,11 +573,11 @@ public GetPhoneDataScRsp mergeFrom(final JsonSource input) throws IOException { } break; } - case -512676109: - case -1128638699: { - if (input.isAtField(FieldNames.ownedPhoneThemes)) { + case -1579353334: + case -1491735846: { + if (input.isAtField(FieldNames.ownedChatBubbles)) { if (!input.trySkipNullValue()) { - input.readRepeatedUInt32(ownedPhoneThemes); + input.readRepeatedUInt32(ownedChatBubbles); bitField0_ |= 0x00000008; } } else { @@ -585,11 +585,11 @@ public GetPhoneDataScRsp mergeFrom(final JsonSource input) throws IOException { } break; } - case -1579353334: - case -1491735846: { - if (input.isAtField(FieldNames.ownedChatBubbles)) { + case -512676109: + case -1128638699: { + if (input.isAtField(FieldNames.ownedPhoneThemes)) { if (!input.trySkipNullValue()) { - input.readRepeatedUInt32(ownedChatBubbles); + input.readRepeatedUInt32(ownedPhoneThemes); bitField0_ |= 0x00000010; } } else { @@ -650,15 +650,15 @@ public GetPhoneDataScRsp create() { * Contains name constants used for serializing JSON */ static class FieldNames { + static final FieldName curPhoneTheme = FieldName.forField("curPhoneTheme", "cur_phone_theme"); + static final FieldName curChatBubble = FieldName.forField("curChatBubble", "cur_chat_bubble"); static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName curPhoneTheme = FieldName.forField("curPhoneTheme", "cur_phone_theme"); + static final FieldName ownedChatBubbles = FieldName.forField("ownedChatBubbles", "owned_chat_bubbles"); static final FieldName ownedPhoneThemes = FieldName.forField("ownedPhoneThemes", "owned_phone_themes"); - - static final FieldName ownedChatBubbles = FieldName.forField("ownedChatBubbles", "owned_chat_bubbles"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/GetPlayerBoardDataScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetPlayerBoardDataScRspOuterClass.java index e6490598f..033ab7173 100644 --- a/src/generated/main/emu/lunarcore/proto/GetPlayerBoardDataScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetPlayerBoardDataScRspOuterClass.java @@ -21,27 +21,27 @@ public static final class GetPlayerBoardDataScRsp extends ProtoMessageoptional uint32 current_head_icon_id = 6; + * optional uint32 current_head_icon_id = 2; */ private int currentHeadIconId; /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 9; */ private int retcode; /** - * optional .DisplayAvatarVec display_avatar_vec = 15; + * optional .DisplayAvatarVec display_avatar_vec = 13; */ private final DisplayAvatarVecOuterClass.DisplayAvatarVec displayAvatarVec = DisplayAvatarVecOuterClass.DisplayAvatarVec.newInstance(); /** - * optional string signature = 5; + * optional string signature = 15; */ private final Utf8String signature = Utf8String.newEmptyInstance(); /** - * repeated .HeadIcon unlocked_head_icon_list = 12; + * repeated .HeadIcon unlocked_head_icon_list = 3; */ private final RepeatedMessage unlockedHeadIconList = RepeatedMessage.newEmptyInstance(HeadIconOuterClass.HeadIcon.getFactory()); @@ -56,7 +56,7 @@ public static GetPlayerBoardDataScRsp newInstance() { } /** - * optional uint32 current_head_icon_id = 6; + * optional uint32 current_head_icon_id = 2; * @return whether the currentHeadIconId field is set */ public boolean hasCurrentHeadIconId() { @@ -64,7 +64,7 @@ public boolean hasCurrentHeadIconId() { } /** - * optional uint32 current_head_icon_id = 6; + * optional uint32 current_head_icon_id = 2; * @return this */ public GetPlayerBoardDataScRsp clearCurrentHeadIconId() { @@ -74,7 +74,7 @@ public GetPlayerBoardDataScRsp clearCurrentHeadIconId() { } /** - * optional uint32 current_head_icon_id = 6; + * optional uint32 current_head_icon_id = 2; * @return the currentHeadIconId */ public int getCurrentHeadIconId() { @@ -82,7 +82,7 @@ public int getCurrentHeadIconId() { } /** - * optional uint32 current_head_icon_id = 6; + * optional uint32 current_head_icon_id = 2; * @param value the currentHeadIconId to set * @return this */ @@ -93,7 +93,7 @@ public GetPlayerBoardDataScRsp setCurrentHeadIconId(final int value) { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 9; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -101,7 +101,7 @@ public boolean hasRetcode() { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 9; * @return this */ public GetPlayerBoardDataScRsp clearRetcode() { @@ -111,7 +111,7 @@ public GetPlayerBoardDataScRsp clearRetcode() { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 9; * @return the retcode */ public int getRetcode() { @@ -119,7 +119,7 @@ public int getRetcode() { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 9; * @param value the retcode to set * @return this */ @@ -130,7 +130,7 @@ public GetPlayerBoardDataScRsp setRetcode(final int value) { } /** - * optional .DisplayAvatarVec display_avatar_vec = 15; + * optional .DisplayAvatarVec display_avatar_vec = 13; * @return whether the displayAvatarVec field is set */ public boolean hasDisplayAvatarVec() { @@ -138,7 +138,7 @@ public boolean hasDisplayAvatarVec() { } /** - * optional .DisplayAvatarVec display_avatar_vec = 15; + * optional .DisplayAvatarVec display_avatar_vec = 13; * @return this */ public GetPlayerBoardDataScRsp clearDisplayAvatarVec() { @@ -148,7 +148,7 @@ public GetPlayerBoardDataScRsp clearDisplayAvatarVec() { } /** - * optional .DisplayAvatarVec display_avatar_vec = 15; + * optional .DisplayAvatarVec display_avatar_vec = 13; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -162,7 +162,7 @@ public DisplayAvatarVecOuterClass.DisplayAvatarVec getDisplayAvatarVec() { } /** - * optional .DisplayAvatarVec display_avatar_vec = 15; + * optional .DisplayAvatarVec display_avatar_vec = 13; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -176,7 +176,7 @@ public DisplayAvatarVecOuterClass.DisplayAvatarVec getMutableDisplayAvatarVec() } /** - * optional .DisplayAvatarVec display_avatar_vec = 15; + * optional .DisplayAvatarVec display_avatar_vec = 13; * @param value the displayAvatarVec to set * @return this */ @@ -188,7 +188,7 @@ public GetPlayerBoardDataScRsp setDisplayAvatarVec( } /** - * optional string signature = 5; + * optional string signature = 15; * @return whether the signature field is set */ public boolean hasSignature() { @@ -196,7 +196,7 @@ public boolean hasSignature() { } /** - * optional string signature = 5; + * optional string signature = 15; * @return this */ public GetPlayerBoardDataScRsp clearSignature() { @@ -206,7 +206,7 @@ public GetPlayerBoardDataScRsp clearSignature() { } /** - * optional string signature = 5; + * optional string signature = 15; * @return the signature */ public String getSignature() { @@ -214,7 +214,7 @@ public String getSignature() { } /** - * optional string signature = 5; + * optional string signature = 15; * @return internal {@code Utf8String} representation of signature for reading */ public Utf8String getSignatureBytes() { @@ -222,7 +222,7 @@ public Utf8String getSignatureBytes() { } /** - * optional string signature = 5; + * optional string signature = 15; * @return internal {@code Utf8String} representation of signature for modifications */ public Utf8String getMutableSignatureBytes() { @@ -231,7 +231,7 @@ public Utf8String getMutableSignatureBytes() { } /** - * optional string signature = 5; + * optional string signature = 15; * @param value the signature to set * @return this */ @@ -242,7 +242,7 @@ public GetPlayerBoardDataScRsp setSignature(final CharSequence value) { } /** - * optional string signature = 5; + * optional string signature = 15; * @param value the signature to set * @return this */ @@ -253,7 +253,7 @@ public GetPlayerBoardDataScRsp setSignature(final Utf8String value) { } /** - * repeated .HeadIcon unlocked_head_icon_list = 12; + * repeated .HeadIcon unlocked_head_icon_list = 3; * @return whether the unlockedHeadIconList field is set */ public boolean hasUnlockedHeadIconList() { @@ -261,7 +261,7 @@ public boolean hasUnlockedHeadIconList() { } /** - * repeated .HeadIcon unlocked_head_icon_list = 12; + * repeated .HeadIcon unlocked_head_icon_list = 3; * @return this */ public GetPlayerBoardDataScRsp clearUnlockedHeadIconList() { @@ -271,7 +271,7 @@ public GetPlayerBoardDataScRsp clearUnlockedHeadIconList() { } /** - * repeated .HeadIcon unlocked_head_icon_list = 12; + * repeated .HeadIcon unlocked_head_icon_list = 3; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -285,7 +285,7 @@ public RepeatedMessage getUnlockedHeadIconList() { } /** - * repeated .HeadIcon unlocked_head_icon_list = 12; + * repeated .HeadIcon unlocked_head_icon_list = 3; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -299,7 +299,7 @@ public RepeatedMessage getMutableUnlockedHeadIconLi } /** - * repeated .HeadIcon unlocked_head_icon_list = 12; + * repeated .HeadIcon unlocked_head_icon_list = 3; * @param value the unlockedHeadIconList to add * @return this */ @@ -311,7 +311,7 @@ public GetPlayerBoardDataScRsp addUnlockedHeadIconList( } /** - * repeated .HeadIcon unlocked_head_icon_list = 12; + * repeated .HeadIcon unlocked_head_icon_list = 3; * @param values the unlockedHeadIconList to add * @return this */ @@ -408,24 +408,24 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(currentHeadIconId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 122); + output.writeRawByte((byte) 106); output.writeMessageNoTag(displayAvatarVec); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 42); + output.writeRawByte((byte) 122); output.writeStringNoTag(signature); } if ((bitField0_ & 0x00000010) != 0) { for (int i = 0; i < unlockedHeadIconList.length(); i++) { - output.writeRawByte((byte) 98); + output.writeRawByte((byte) 26); output.writeMessageNoTag(unlockedHeadIconList.get(i)); } } @@ -459,43 +459,43 @@ public GetPlayerBoardDataScRsp mergeFrom(final ProtoSource input) throws IOExcep int tag = input.readTag(); while (true) { switch (tag) { - case 48: { + case 16: { // currentHeadIconId currentHeadIconId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 56) { + if (tag != 72) { break; } } - case 56: { + case 72: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 122) { + if (tag != 106) { break; } } - case 122: { + case 106: { // displayAvatarVec input.readMessage(displayAvatarVec); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 42) { + if (tag != 122) { break; } } - case 42: { + case 122: { // signature input.readString(signature); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 98) { + if (tag != 26) { break; } } - case 98: { + case 26: { // unlockedHeadIconList tag = input.readRepeatedMessage(unlockedHeadIconList, tag); bitField0_ |= 0x00000010; diff --git a/src/generated/main/emu/lunarcore/proto/GetPlayerDetailInfoCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetPlayerDetailInfoCsReqOuterClass.java index 804e5420c..a29daa254 100644 --- a/src/generated/main/emu/lunarcore/proto/GetPlayerDetailInfoCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetPlayerDetailInfoCsReqOuterClass.java @@ -19,7 +19,7 @@ public static final class GetPlayerDetailInfoCsReq extends ProtoMessageoptional uint32 uid = 5; + * optional uint32 uid = 12; */ private int uid; @@ -34,7 +34,7 @@ public static GetPlayerDetailInfoCsReq newInstance() { } /** - * optional uint32 uid = 5; + * optional uint32 uid = 12; * @return whether the uid field is set */ public boolean hasUid() { @@ -42,7 +42,7 @@ public boolean hasUid() { } /** - * optional uint32 uid = 5; + * optional uint32 uid = 12; * @return this */ public GetPlayerDetailInfoCsReq clearUid() { @@ -52,7 +52,7 @@ public GetPlayerDetailInfoCsReq clearUid() { } /** - * optional uint32 uid = 5; + * optional uint32 uid = 12; * @return the uid */ public int getUid() { @@ -60,7 +60,7 @@ public int getUid() { } /** - * optional uint32 uid = 5; + * optional uint32 uid = 12; * @param value the uid to set * @return this */ @@ -129,7 +129,7 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(uid); } } @@ -150,7 +150,7 @@ public GetPlayerDetailInfoCsReq mergeFrom(final ProtoSource input) throws IOExce int tag = input.readTag(); while (true) { switch (tag) { - case 40: { + case 96: { // uid uid = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/GetPlayerDetailInfoScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetPlayerDetailInfoScRspOuterClass.java index 3c517ff01..775fc3f03 100644 --- a/src/generated/main/emu/lunarcore/proto/GetPlayerDetailInfoScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetPlayerDetailInfoScRspOuterClass.java @@ -19,12 +19,12 @@ public static final class GetPlayerDetailInfoScRsp extends ProtoMessageoptional uint32 retcode = 14; + * optional uint32 retcode = 8; */ private int retcode; /** - * optional .PlayerDetailInfo player_detail_info = 3; + * optional .PlayerDetailInfo player_detail_info = 4; */ private final PlayerDetailInfoOuterClass.PlayerDetailInfo playerDetailInfo = PlayerDetailInfoOuterClass.PlayerDetailInfo.newInstance(); @@ -39,7 +39,7 @@ public static GetPlayerDetailInfoScRsp newInstance() { } /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 8; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public boolean hasRetcode() { } /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 8; * @return this */ public GetPlayerDetailInfoScRsp clearRetcode() { @@ -57,7 +57,7 @@ public GetPlayerDetailInfoScRsp clearRetcode() { } /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 8; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public int getRetcode() { } /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 8; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public GetPlayerDetailInfoScRsp setRetcode(final int value) { } /** - * optional .PlayerDetailInfo player_detail_info = 3; + * optional .PlayerDetailInfo player_detail_info = 4; * @return whether the playerDetailInfo field is set */ public boolean hasPlayerDetailInfo() { @@ -84,7 +84,7 @@ public boolean hasPlayerDetailInfo() { } /** - * optional .PlayerDetailInfo player_detail_info = 3; + * optional .PlayerDetailInfo player_detail_info = 4; * @return this */ public GetPlayerDetailInfoScRsp clearPlayerDetailInfo() { @@ -94,7 +94,7 @@ public GetPlayerDetailInfoScRsp clearPlayerDetailInfo() { } /** - * optional .PlayerDetailInfo player_detail_info = 3; + * optional .PlayerDetailInfo player_detail_info = 4; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -108,7 +108,7 @@ public PlayerDetailInfoOuterClass.PlayerDetailInfo getPlayerDetailInfo() { } /** - * optional .PlayerDetailInfo player_detail_info = 3; + * optional .PlayerDetailInfo player_detail_info = 4; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -122,7 +122,7 @@ public PlayerDetailInfoOuterClass.PlayerDetailInfo getMutablePlayerDetailInfo() } /** - * optional .PlayerDetailInfo player_detail_info = 3; + * optional .PlayerDetailInfo player_detail_info = 4; * @param value the playerDetailInfo to set * @return this */ @@ -199,11 +199,11 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 26); + output.writeRawByte((byte) 34); output.writeMessageNoTag(playerDetailInfo); } } @@ -227,16 +227,16 @@ public GetPlayerDetailInfoScRsp mergeFrom(final ProtoSource input) throws IOExce int tag = input.readTag(); while (true) { switch (tag) { - case 112: { + case 64: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 26) { + if (tag != 34) { break; } } - case 26: { + case 34: { // playerDetailInfo input.readMessage(playerDetailInfo); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/GetPrivateChatHistoryCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetPrivateChatHistoryCsReqOuterClass.java index 8680acf27..5b74231bf 100644 --- a/src/generated/main/emu/lunarcore/proto/GetPrivateChatHistoryCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetPrivateChatHistoryCsReqOuterClass.java @@ -19,14 +19,14 @@ public static final class GetPrivateChatHistoryCsReq extends ProtoMessageoptional uint32 to_uid = 2; + * optional uint32 sender_uid = 8; */ - private int toUid; + private int senderUid; /** - * optional uint32 sender_uid = 5; + * optional uint32 to_uid = 13; */ - private int senderUid; + private int toUid; private GetPrivateChatHistoryCsReq() { } @@ -39,76 +39,76 @@ public static GetPrivateChatHistoryCsReq newInstance() { } /** - * optional uint32 to_uid = 2; - * @return whether the toUid field is set + * optional uint32 sender_uid = 8; + * @return whether the senderUid field is set */ - public boolean hasToUid() { + public boolean hasSenderUid() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 to_uid = 2; + * optional uint32 sender_uid = 8; * @return this */ - public GetPrivateChatHistoryCsReq clearToUid() { + public GetPrivateChatHistoryCsReq clearSenderUid() { bitField0_ &= ~0x00000001; - toUid = 0; + senderUid = 0; return this; } /** - * optional uint32 to_uid = 2; - * @return the toUid + * optional uint32 sender_uid = 8; + * @return the senderUid */ - public int getToUid() { - return toUid; + public int getSenderUid() { + return senderUid; } /** - * optional uint32 to_uid = 2; - * @param value the toUid to set + * optional uint32 sender_uid = 8; + * @param value the senderUid to set * @return this */ - public GetPrivateChatHistoryCsReq setToUid(final int value) { + public GetPrivateChatHistoryCsReq setSenderUid(final int value) { bitField0_ |= 0x00000001; - toUid = value; + senderUid = value; return this; } /** - * optional uint32 sender_uid = 5; - * @return whether the senderUid field is set + * optional uint32 to_uid = 13; + * @return whether the toUid field is set */ - public boolean hasSenderUid() { + public boolean hasToUid() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 sender_uid = 5; + * optional uint32 to_uid = 13; * @return this */ - public GetPrivateChatHistoryCsReq clearSenderUid() { + public GetPrivateChatHistoryCsReq clearToUid() { bitField0_ &= ~0x00000002; - senderUid = 0; + toUid = 0; return this; } /** - * optional uint32 sender_uid = 5; - * @return the senderUid + * optional uint32 to_uid = 13; + * @return the toUid */ - public int getSenderUid() { - return senderUid; + public int getToUid() { + return toUid; } /** - * optional uint32 sender_uid = 5; - * @param value the senderUid to set + * optional uint32 to_uid = 13; + * @param value the toUid to set * @return this */ - public GetPrivateChatHistoryCsReq setSenderUid(final int value) { + public GetPrivateChatHistoryCsReq setToUid(final int value) { bitField0_ |= 0x00000002; - senderUid = value; + toUid = value; return this; } @@ -117,8 +117,8 @@ public GetPrivateChatHistoryCsReq copyFrom(final GetPrivateChatHistoryCsReq othe cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - toUid = other.toUid; senderUid = other.senderUid; + toUid = other.toUid; } return this; } @@ -129,12 +129,12 @@ public GetPrivateChatHistoryCsReq mergeFrom(final GetPrivateChatHistoryCsReq oth return this; } cachedSize = -1; - if (other.hasToUid()) { - setToUid(other.toUid); - } if (other.hasSenderUid()) { setSenderUid(other.senderUid); } + if (other.hasToUid()) { + setToUid(other.toUid); + } return this; } @@ -145,8 +145,8 @@ public GetPrivateChatHistoryCsReq clear() { } cachedSize = -1; bitField0_ = 0; - toUid = 0; senderUid = 0; + toUid = 0; return this; } @@ -170,19 +170,19 @@ public boolean equals(Object o) { } GetPrivateChatHistoryCsReq other = (GetPrivateChatHistoryCsReq) o; return bitField0_ == other.bitField0_ - && (!hasToUid() || toUid == other.toUid) - && (!hasSenderUid() || senderUid == other.senderUid); + && (!hasSenderUid() || senderUid == other.senderUid) + && (!hasToUid() || toUid == other.toUid); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); - output.writeUInt32NoTag(toUid); + output.writeRawByte((byte) 64); + output.writeUInt32NoTag(senderUid); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 40); - output.writeUInt32NoTag(senderUid); + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(toUid); } } @@ -190,10 +190,10 @@ public void writeTo(final ProtoSink output) throws IOException { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(toUid); + size += 1 + ProtoSink.computeUInt32SizeNoTag(senderUid); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(senderUid); + size += 1 + ProtoSink.computeUInt32SizeNoTag(toUid); } return size; } @@ -205,18 +205,18 @@ public GetPrivateChatHistoryCsReq mergeFrom(final ProtoSource input) throws IOEx int tag = input.readTag(); while (true) { switch (tag) { - case 16: { - // toUid - toUid = input.readUInt32(); + case 64: { + // senderUid + senderUid = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 40) { + if (tag != 104) { break; } } - case 40: { - // senderUid - senderUid = input.readUInt32(); + case 104: { + // toUid + toUid = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -241,10 +241,10 @@ public GetPrivateChatHistoryCsReq mergeFrom(final ProtoSource input) throws IOEx public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.toUid, toUid); + output.writeUInt32(FieldNames.senderUid, senderUid); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.senderUid, senderUid); + output.writeUInt32(FieldNames.toUid, toUid); } output.endObject(); } @@ -256,11 +256,11 @@ public GetPrivateChatHistoryCsReq mergeFrom(final JsonSource input) throws IOExc } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 110520277: - case -868529012: { - if (input.isAtField(FieldNames.toUid)) { + case 32180699: + case 997911366: { + if (input.isAtField(FieldNames.senderUid)) { if (!input.trySkipNullValue()) { - toUid = input.readUInt32(); + senderUid = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -268,11 +268,11 @@ public GetPrivateChatHistoryCsReq mergeFrom(final JsonSource input) throws IOExc } break; } - case 32180699: - case 997911366: { - if (input.isAtField(FieldNames.senderUid)) { + case 110520277: + case -868529012: { + if (input.isAtField(FieldNames.toUid)) { if (!input.trySkipNullValue()) { - senderUid = input.readUInt32(); + toUid = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -333,9 +333,9 @@ public GetPrivateChatHistoryCsReq create() { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName toUid = FieldName.forField("toUid", "to_uid"); - static final FieldName senderUid = FieldName.forField("senderUid", "sender_uid"); + + static final FieldName toUid = FieldName.forField("toUid", "to_uid"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/GetPrivateChatHistoryScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetPrivateChatHistoryScRspOuterClass.java index 18f466052..d643f5693 100644 --- a/src/generated/main/emu/lunarcore/proto/GetPrivateChatHistoryScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetPrivateChatHistoryScRspOuterClass.java @@ -20,22 +20,22 @@ public static final class GetPrivateChatHistoryScRsp extends ProtoMessageoptional uint32 sender_uid = 4; + * optional uint32 to_uid = 8; */ - private int senderUid; + private int toUid; /** - * optional uint32 to_uid = 9; + * optional uint32 retcode = 10; */ - private int toUid; + private int retcode; /** - * optional uint32 retcode = 13; + * optional uint32 sender_uid = 13; */ - private int retcode; + private int senderUid; /** - * repeated .Chat chat_list = 3; + * repeated .Chat chat_list = 5; */ private final RepeatedMessage chatList = RepeatedMessage.newEmptyInstance(ChatOuterClass.Chat.getFactory()); @@ -50,118 +50,118 @@ public static GetPrivateChatHistoryScRsp newInstance() { } /** - * optional uint32 sender_uid = 4; - * @return whether the senderUid field is set + * optional uint32 to_uid = 8; + * @return whether the toUid field is set */ - public boolean hasSenderUid() { + public boolean hasToUid() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 sender_uid = 4; + * optional uint32 to_uid = 8; * @return this */ - public GetPrivateChatHistoryScRsp clearSenderUid() { + public GetPrivateChatHistoryScRsp clearToUid() { bitField0_ &= ~0x00000001; - senderUid = 0; + toUid = 0; return this; } /** - * optional uint32 sender_uid = 4; - * @return the senderUid + * optional uint32 to_uid = 8; + * @return the toUid */ - public int getSenderUid() { - return senderUid; + public int getToUid() { + return toUid; } /** - * optional uint32 sender_uid = 4; - * @param value the senderUid to set + * optional uint32 to_uid = 8; + * @param value the toUid to set * @return this */ - public GetPrivateChatHistoryScRsp setSenderUid(final int value) { + public GetPrivateChatHistoryScRsp setToUid(final int value) { bitField0_ |= 0x00000001; - senderUid = value; + toUid = value; return this; } /** - * optional uint32 to_uid = 9; - * @return whether the toUid field is set + * optional uint32 retcode = 10; + * @return whether the retcode field is set */ - public boolean hasToUid() { + public boolean hasRetcode() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 to_uid = 9; + * optional uint32 retcode = 10; * @return this */ - public GetPrivateChatHistoryScRsp clearToUid() { + public GetPrivateChatHistoryScRsp clearRetcode() { bitField0_ &= ~0x00000002; - toUid = 0; + retcode = 0; return this; } /** - * optional uint32 to_uid = 9; - * @return the toUid + * optional uint32 retcode = 10; + * @return the retcode */ - public int getToUid() { - return toUid; + public int getRetcode() { + return retcode; } /** - * optional uint32 to_uid = 9; - * @param value the toUid to set + * optional uint32 retcode = 10; + * @param value the retcode to set * @return this */ - public GetPrivateChatHistoryScRsp setToUid(final int value) { + public GetPrivateChatHistoryScRsp setRetcode(final int value) { bitField0_ |= 0x00000002; - toUid = value; + retcode = value; return this; } /** - * optional uint32 retcode = 13; - * @return whether the retcode field is set + * optional uint32 sender_uid = 13; + * @return whether the senderUid field is set */ - public boolean hasRetcode() { + public boolean hasSenderUid() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 retcode = 13; + * optional uint32 sender_uid = 13; * @return this */ - public GetPrivateChatHistoryScRsp clearRetcode() { + public GetPrivateChatHistoryScRsp clearSenderUid() { bitField0_ &= ~0x00000004; - retcode = 0; + senderUid = 0; return this; } /** - * optional uint32 retcode = 13; - * @return the retcode + * optional uint32 sender_uid = 13; + * @return the senderUid */ - public int getRetcode() { - return retcode; + public int getSenderUid() { + return senderUid; } /** - * optional uint32 retcode = 13; - * @param value the retcode to set + * optional uint32 sender_uid = 13; + * @param value the senderUid to set * @return this */ - public GetPrivateChatHistoryScRsp setRetcode(final int value) { + public GetPrivateChatHistoryScRsp setSenderUid(final int value) { bitField0_ |= 0x00000004; - retcode = value; + senderUid = value; return this; } /** - * repeated .Chat chat_list = 3; + * repeated .Chat chat_list = 5; * @return whether the chatList field is set */ public boolean hasChatList() { @@ -169,7 +169,7 @@ public boolean hasChatList() { } /** - * repeated .Chat chat_list = 3; + * repeated .Chat chat_list = 5; * @return this */ public GetPrivateChatHistoryScRsp clearChatList() { @@ -179,7 +179,7 @@ public GetPrivateChatHistoryScRsp clearChatList() { } /** - * repeated .Chat chat_list = 3; + * repeated .Chat chat_list = 5; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -193,7 +193,7 @@ public RepeatedMessage getChatList() { } /** - * repeated .Chat chat_list = 3; + * repeated .Chat chat_list = 5; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -207,7 +207,7 @@ public RepeatedMessage getMutableChatList() { } /** - * repeated .Chat chat_list = 3; + * repeated .Chat chat_list = 5; * @param value the chatList to add * @return this */ @@ -218,7 +218,7 @@ public GetPrivateChatHistoryScRsp addChatList(final ChatOuterClass.Chat value) { } /** - * repeated .Chat chat_list = 3; + * repeated .Chat chat_list = 5; * @param values the chatList to add * @return this */ @@ -233,9 +233,9 @@ public GetPrivateChatHistoryScRsp copyFrom(final GetPrivateChatHistoryScRsp othe cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - senderUid = other.senderUid; toUid = other.toUid; retcode = other.retcode; + senderUid = other.senderUid; chatList.copyFrom(other.chatList); } return this; @@ -247,15 +247,15 @@ public GetPrivateChatHistoryScRsp mergeFrom(final GetPrivateChatHistoryScRsp oth return this; } cachedSize = -1; - if (other.hasSenderUid()) { - setSenderUid(other.senderUid); - } if (other.hasToUid()) { setToUid(other.toUid); } if (other.hasRetcode()) { setRetcode(other.retcode); } + if (other.hasSenderUid()) { + setSenderUid(other.senderUid); + } if (other.hasChatList()) { getMutableChatList().addAll(other.chatList); } @@ -269,9 +269,9 @@ public GetPrivateChatHistoryScRsp clear() { } cachedSize = -1; bitField0_ = 0; - senderUid = 0; toUid = 0; retcode = 0; + senderUid = 0; chatList.clear(); return this; } @@ -297,29 +297,29 @@ public boolean equals(Object o) { } GetPrivateChatHistoryScRsp other = (GetPrivateChatHistoryScRsp) o; return bitField0_ == other.bitField0_ - && (!hasSenderUid() || senderUid == other.senderUid) && (!hasToUid() || toUid == other.toUid) && (!hasRetcode() || retcode == other.retcode) + && (!hasSenderUid() || senderUid == other.senderUid) && (!hasChatList() || chatList.equals(other.chatList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); - output.writeUInt32NoTag(senderUid); + output.writeRawByte((byte) 64); + output.writeUInt32NoTag(toUid); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 72); - output.writeUInt32NoTag(toUid); + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { output.writeRawByte((byte) 104); - output.writeUInt32NoTag(retcode); + output.writeUInt32NoTag(senderUid); } if ((bitField0_ & 0x00000008) != 0) { for (int i = 0; i < chatList.length(); i++) { - output.writeRawByte((byte) 26); + output.writeRawByte((byte) 42); output.writeMessageNoTag(chatList.get(i)); } } @@ -329,13 +329,13 @@ public void writeTo(final ProtoSink output) throws IOException { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(senderUid); + size += 1 + ProtoSink.computeUInt32SizeNoTag(toUid); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(toUid); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(senderUid); } if ((bitField0_ & 0x00000008) != 0) { size += (1 * chatList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(chatList); @@ -350,18 +350,18 @@ public GetPrivateChatHistoryScRsp mergeFrom(final ProtoSource input) throws IOEx int tag = input.readTag(); while (true) { switch (tag) { - case 32: { - // senderUid - senderUid = input.readUInt32(); + case 64: { + // toUid + toUid = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 72) { + if (tag != 80) { break; } } - case 72: { - // toUid - toUid = input.readUInt32(); + case 80: { + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 104) { @@ -369,15 +369,15 @@ public GetPrivateChatHistoryScRsp mergeFrom(final ProtoSource input) throws IOEx } } case 104: { - // retcode - retcode = input.readUInt32(); + // senderUid + senderUid = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 26) { + if (tag != 42) { break; } } - case 26: { + case 42: { // chatList tag = input.readRepeatedMessage(chatList, tag); bitField0_ |= 0x00000008; @@ -403,13 +403,13 @@ public GetPrivateChatHistoryScRsp mergeFrom(final ProtoSource input) throws IOEx public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.senderUid, senderUid); + output.writeUInt32(FieldNames.toUid, toUid); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.toUid, toUid); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.senderUid, senderUid); } if ((bitField0_ & 0x00000008) != 0) { output.writeRepeatedMessage(FieldNames.chatList, chatList); @@ -424,11 +424,11 @@ public GetPrivateChatHistoryScRsp mergeFrom(final JsonSource input) throws IOExc } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 32180699: - case 997911366: { - if (input.isAtField(FieldNames.senderUid)) { + case 110520277: + case -868529012: { + if (input.isAtField(FieldNames.toUid)) { if (!input.trySkipNullValue()) { - senderUid = input.readUInt32(); + toUid = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -436,11 +436,10 @@ public GetPrivateChatHistoryScRsp mergeFrom(final JsonSource input) throws IOExc } break; } - case 110520277: - case -868529012: { - if (input.isAtField(FieldNames.toUid)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - toUid = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -448,10 +447,11 @@ public GetPrivateChatHistoryScRsp mergeFrom(final JsonSource input) throws IOExc } break; } - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case 32180699: + case 997911366: { + if (input.isAtField(FieldNames.senderUid)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + senderUid = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -524,12 +524,12 @@ public GetPrivateChatHistoryScRsp create() { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName senderUid = FieldName.forField("senderUid", "sender_uid"); - static final FieldName toUid = FieldName.forField("toUid", "to_uid"); static final FieldName retcode = FieldName.forField("retcode"); + static final FieldName senderUid = FieldName.forField("senderUid", "sender_uid"); + static final FieldName chatList = FieldName.forField("chatList", "chat_list"); } } diff --git a/src/generated/main/emu/lunarcore/proto/GetQuestDataScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetQuestDataScRspOuterClass.java index 45e4b6825..6af7e8c9a 100644 --- a/src/generated/main/emu/lunarcore/proto/GetQuestDataScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetQuestDataScRspOuterClass.java @@ -20,17 +20,17 @@ public static final class GetQuestDataScRsp extends ProtoMessageoptional uint32 total_achievement_exp = 1; + * optional uint32 total_achievement_exp = 3; */ private int totalAchievementExp; /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 13; */ private int retcode; /** - * repeated .Quest quest_list = 10; + * repeated .Quest quest_list = 12; */ private final RepeatedMessage questList = RepeatedMessage.newEmptyInstance(QuestOuterClass.Quest.getFactory()); @@ -45,7 +45,7 @@ public static GetQuestDataScRsp newInstance() { } /** - * optional uint32 total_achievement_exp = 1; + * optional uint32 total_achievement_exp = 3; * @return whether the totalAchievementExp field is set */ public boolean hasTotalAchievementExp() { @@ -53,7 +53,7 @@ public boolean hasTotalAchievementExp() { } /** - * optional uint32 total_achievement_exp = 1; + * optional uint32 total_achievement_exp = 3; * @return this */ public GetQuestDataScRsp clearTotalAchievementExp() { @@ -63,7 +63,7 @@ public GetQuestDataScRsp clearTotalAchievementExp() { } /** - * optional uint32 total_achievement_exp = 1; + * optional uint32 total_achievement_exp = 3; * @return the totalAchievementExp */ public int getTotalAchievementExp() { @@ -71,7 +71,7 @@ public int getTotalAchievementExp() { } /** - * optional uint32 total_achievement_exp = 1; + * optional uint32 total_achievement_exp = 3; * @param value the totalAchievementExp to set * @return this */ @@ -82,7 +82,7 @@ public GetQuestDataScRsp setTotalAchievementExp(final int value) { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 13; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -90,7 +90,7 @@ public boolean hasRetcode() { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 13; * @return this */ public GetQuestDataScRsp clearRetcode() { @@ -100,7 +100,7 @@ public GetQuestDataScRsp clearRetcode() { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 13; * @return the retcode */ public int getRetcode() { @@ -108,7 +108,7 @@ public int getRetcode() { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 13; * @param value the retcode to set * @return this */ @@ -119,7 +119,7 @@ public GetQuestDataScRsp setRetcode(final int value) { } /** - * repeated .Quest quest_list = 10; + * repeated .Quest quest_list = 12; * @return whether the questList field is set */ public boolean hasQuestList() { @@ -127,7 +127,7 @@ public boolean hasQuestList() { } /** - * repeated .Quest quest_list = 10; + * repeated .Quest quest_list = 12; * @return this */ public GetQuestDataScRsp clearQuestList() { @@ -137,7 +137,7 @@ public GetQuestDataScRsp clearQuestList() { } /** - * repeated .Quest quest_list = 10; + * repeated .Quest quest_list = 12; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -151,7 +151,7 @@ public RepeatedMessage getQuestList() { } /** - * repeated .Quest quest_list = 10; + * repeated .Quest quest_list = 12; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -165,7 +165,7 @@ public RepeatedMessage getMutableQuestList() { } /** - * repeated .Quest quest_list = 10; + * repeated .Quest quest_list = 12; * @param value the questList to add * @return this */ @@ -176,7 +176,7 @@ public GetQuestDataScRsp addQuestList(final QuestOuterClass.Quest value) { } /** - * repeated .Quest quest_list = 10; + * repeated .Quest quest_list = 12; * @param values the questList to add * @return this */ @@ -258,16 +258,16 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(totalAchievementExp); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < questList.length(); i++) { - output.writeRawByte((byte) 82); + output.writeRawByte((byte) 98); output.writeMessageNoTag(questList.get(i)); } } @@ -295,25 +295,25 @@ public GetQuestDataScRsp mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { + case 24: { // totalAchievementExp totalAchievementExp = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 64) { + if (tag != 104) { break; } } - case 64: { + case 104: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 82) { + if (tag != 98) { break; } } - case 82: { + case 98: { // questList tag = input.readRepeatedMessage(questList, tag); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/GetRollShopInfoCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetRollShopInfoCsReqOuterClass.java new file mode 100644 index 000000000..75e806d32 --- /dev/null +++ b/src/generated/main/emu/lunarcore/proto/GetRollShopInfoCsReqOuterClass.java @@ -0,0 +1,260 @@ +// Code generated by protocol buffer compiler. Do not edit! +package emu.lunarcore.proto; + +import java.io.IOException; +import us.hebi.quickbuf.FieldName; +import us.hebi.quickbuf.InvalidProtocolBufferException; +import us.hebi.quickbuf.JsonSink; +import us.hebi.quickbuf.JsonSource; +import us.hebi.quickbuf.MessageFactory; +import us.hebi.quickbuf.ProtoMessage; +import us.hebi.quickbuf.ProtoSink; +import us.hebi.quickbuf.ProtoSource; + +public final class GetRollShopInfoCsReqOuterClass { + /** + * Protobuf type {@code GetRollShopInfoCsReq} + */ + public static final class GetRollShopInfoCsReq extends ProtoMessage implements Cloneable { + private static final long serialVersionUID = 0L; + + /** + * optional uint32 roll_shop_id = 8; + */ + private int rollShopId; + + private GetRollShopInfoCsReq() { + } + + /** + * @return a new empty instance of {@code GetRollShopInfoCsReq} + */ + public static GetRollShopInfoCsReq newInstance() { + return new GetRollShopInfoCsReq(); + } + + /** + * optional uint32 roll_shop_id = 8; + * @return whether the rollShopId field is set + */ + public boolean hasRollShopId() { + return (bitField0_ & 0x00000001) != 0; + } + + /** + * optional uint32 roll_shop_id = 8; + * @return this + */ + public GetRollShopInfoCsReq clearRollShopId() { + bitField0_ &= ~0x00000001; + rollShopId = 0; + return this; + } + + /** + * optional uint32 roll_shop_id = 8; + * @return the rollShopId + */ + public int getRollShopId() { + return rollShopId; + } + + /** + * optional uint32 roll_shop_id = 8; + * @param value the rollShopId to set + * @return this + */ + public GetRollShopInfoCsReq setRollShopId(final int value) { + bitField0_ |= 0x00000001; + rollShopId = value; + return this; + } + + @Override + public GetRollShopInfoCsReq copyFrom(final GetRollShopInfoCsReq other) { + cachedSize = other.cachedSize; + if ((bitField0_ | other.bitField0_) != 0) { + bitField0_ = other.bitField0_; + rollShopId = other.rollShopId; + } + return this; + } + + @Override + public GetRollShopInfoCsReq mergeFrom(final GetRollShopInfoCsReq other) { + if (other.isEmpty()) { + return this; + } + cachedSize = -1; + if (other.hasRollShopId()) { + setRollShopId(other.rollShopId); + } + return this; + } + + @Override + public GetRollShopInfoCsReq clear() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + rollShopId = 0; + return this; + } + + @Override + public GetRollShopInfoCsReq clearQuick() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + return this; + } + + @Override + public boolean equals(Object o) { + if (o == this) { + return true; + } + if (!(o instanceof GetRollShopInfoCsReq)) { + return false; + } + GetRollShopInfoCsReq other = (GetRollShopInfoCsReq) o; + return bitField0_ == other.bitField0_ + && (!hasRollShopId() || rollShopId == other.rollShopId); + } + + @Override + public void writeTo(final ProtoSink output) throws IOException { + if ((bitField0_ & 0x00000001) != 0) { + output.writeRawByte((byte) 64); + output.writeUInt32NoTag(rollShopId); + } + } + + @Override + protected int computeSerializedSize() { + int size = 0; + if ((bitField0_ & 0x00000001) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(rollShopId); + } + return size; + } + + @Override + @SuppressWarnings("fallthrough") + public GetRollShopInfoCsReq mergeFrom(final ProtoSource input) throws IOException { + // Enabled Fall-Through Optimization (QuickBuffers) + int tag = input.readTag(); + while (true) { + switch (tag) { + case 64: { + // rollShopId + rollShopId = input.readUInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 0) { + break; + } + } + case 0: { + return this; + } + default: { + if (!input.skipField(tag)) { + return this; + } + tag = input.readTag(); + break; + } + } + } + } + + @Override + public void writeTo(final JsonSink output) throws IOException { + output.beginObject(); + if ((bitField0_ & 0x00000001) != 0) { + output.writeUInt32(FieldNames.rollShopId, rollShopId); + } + output.endObject(); + } + + @Override + public GetRollShopInfoCsReq mergeFrom(final JsonSource input) throws IOException { + if (!input.beginObject()) { + return this; + } + while (!input.isAtEnd()) { + switch (input.readFieldHash()) { + case -904898162: + case -1612413630: { + if (input.isAtField(FieldNames.rollShopId)) { + if (!input.trySkipNullValue()) { + rollShopId = input.readUInt32(); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } + default: { + input.skipUnknownField(); + break; + } + } + } + input.endObject(); + return this; + } + + @Override + public GetRollShopInfoCsReq clone() { + return new GetRollShopInfoCsReq().copyFrom(this); + } + + @Override + public boolean isEmpty() { + return ((bitField0_) == 0); + } + + public static GetRollShopInfoCsReq parseFrom(final byte[] data) throws + InvalidProtocolBufferException { + return ProtoMessage.mergeFrom(new GetRollShopInfoCsReq(), data).checkInitialized(); + } + + public static GetRollShopInfoCsReq parseFrom(final ProtoSource input) throws IOException { + return ProtoMessage.mergeFrom(new GetRollShopInfoCsReq(), input).checkInitialized(); + } + + public static GetRollShopInfoCsReq parseFrom(final JsonSource input) throws IOException { + return ProtoMessage.mergeFrom(new GetRollShopInfoCsReq(), input).checkInitialized(); + } + + /** + * @return factory for creating GetRollShopInfoCsReq messages + */ + public static MessageFactory getFactory() { + return GetRollShopInfoCsReqFactory.INSTANCE; + } + + private enum GetRollShopInfoCsReqFactory implements MessageFactory { + INSTANCE; + + @Override + public GetRollShopInfoCsReq create() { + return GetRollShopInfoCsReq.newInstance(); + } + } + + /** + * Contains name constants used for serializing JSON + */ + static class FieldNames { + static final FieldName rollShopId = FieldName.forField("rollShopId", "roll_shop_id"); + } + } +} diff --git a/src/generated/main/emu/lunarcore/proto/GetRollShopInfoScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetRollShopInfoScRspOuterClass.java new file mode 100644 index 000000000..4aa453cd6 --- /dev/null +++ b/src/generated/main/emu/lunarcore/proto/GetRollShopInfoScRspOuterClass.java @@ -0,0 +1,541 @@ +// Code generated by protocol buffer compiler. Do not edit! +package emu.lunarcore.proto; + +import java.io.IOException; +import us.hebi.quickbuf.FieldName; +import us.hebi.quickbuf.InvalidProtocolBufferException; +import us.hebi.quickbuf.JsonSink; +import us.hebi.quickbuf.JsonSource; +import us.hebi.quickbuf.MessageFactory; +import us.hebi.quickbuf.ProtoMessage; +import us.hebi.quickbuf.ProtoSink; +import us.hebi.quickbuf.ProtoSource; +import us.hebi.quickbuf.RepeatedInt; + +public final class GetRollShopInfoScRspOuterClass { + /** + * Protobuf type {@code GetRollShopInfoScRsp} + */ + public static final class GetRollShopInfoScRsp extends ProtoMessage implements Cloneable { + private static final long serialVersionUID = 0L; + + /** + * optional uint32 BBJIJINJAFK = 4; + */ + private int bBJIJINJAFK; + + /** + * optional uint32 retcode = 5; + */ + private int retcode; + + /** + * optional uint32 roll_shop_id = 15; + */ + private int rollShopId; + + /** + * repeated uint32 DLPBJMPECFC = 8; + */ + private final RepeatedInt dLPBJMPECFC = RepeatedInt.newEmptyInstance(); + + private GetRollShopInfoScRsp() { + } + + /** + * @return a new empty instance of {@code GetRollShopInfoScRsp} + */ + public static GetRollShopInfoScRsp newInstance() { + return new GetRollShopInfoScRsp(); + } + + /** + * optional uint32 BBJIJINJAFK = 4; + * @return whether the bBJIJINJAFK field is set + */ + public boolean hasBBJIJINJAFK() { + return (bitField0_ & 0x00000001) != 0; + } + + /** + * optional uint32 BBJIJINJAFK = 4; + * @return this + */ + public GetRollShopInfoScRsp clearBBJIJINJAFK() { + bitField0_ &= ~0x00000001; + bBJIJINJAFK = 0; + return this; + } + + /** + * optional uint32 BBJIJINJAFK = 4; + * @return the bBJIJINJAFK + */ + public int getBBJIJINJAFK() { + return bBJIJINJAFK; + } + + /** + * optional uint32 BBJIJINJAFK = 4; + * @param value the bBJIJINJAFK to set + * @return this + */ + public GetRollShopInfoScRsp setBBJIJINJAFK(final int value) { + bitField0_ |= 0x00000001; + bBJIJINJAFK = value; + return this; + } + + /** + * optional uint32 retcode = 5; + * @return whether the retcode field is set + */ + public boolean hasRetcode() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 retcode = 5; + * @return this + */ + public GetRollShopInfoScRsp clearRetcode() { + bitField0_ &= ~0x00000002; + retcode = 0; + return this; + } + + /** + * optional uint32 retcode = 5; + * @return the retcode + */ + public int getRetcode() { + return retcode; + } + + /** + * optional uint32 retcode = 5; + * @param value the retcode to set + * @return this + */ + public GetRollShopInfoScRsp setRetcode(final int value) { + bitField0_ |= 0x00000002; + retcode = value; + return this; + } + + /** + * optional uint32 roll_shop_id = 15; + * @return whether the rollShopId field is set + */ + public boolean hasRollShopId() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 roll_shop_id = 15; + * @return this + */ + public GetRollShopInfoScRsp clearRollShopId() { + bitField0_ &= ~0x00000004; + rollShopId = 0; + return this; + } + + /** + * optional uint32 roll_shop_id = 15; + * @return the rollShopId + */ + public int getRollShopId() { + return rollShopId; + } + + /** + * optional uint32 roll_shop_id = 15; + * @param value the rollShopId to set + * @return this + */ + public GetRollShopInfoScRsp setRollShopId(final int value) { + bitField0_ |= 0x00000004; + rollShopId = value; + return this; + } + + /** + * repeated uint32 DLPBJMPECFC = 8; + * @return whether the dLPBJMPECFC field is set + */ + public boolean hasDLPBJMPECFC() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * repeated uint32 DLPBJMPECFC = 8; + * @return this + */ + public GetRollShopInfoScRsp clearDLPBJMPECFC() { + bitField0_ &= ~0x00000008; + dLPBJMPECFC.clear(); + return this; + } + + /** + * repeated uint32 DLPBJMPECFC = 8; + * + * This method returns the internal storage object without modifying any has state. + * The returned object should not be modified and be treated as read-only. + * + * Use {@link #getMutableDLPBJMPECFC()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedInt getDLPBJMPECFC() { + return dLPBJMPECFC; + } + + /** + * repeated uint32 DLPBJMPECFC = 8; + * + * This method returns the internal storage object and sets the corresponding + * has state. The returned object will become part of this message and its + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public RepeatedInt getMutableDLPBJMPECFC() { + bitField0_ |= 0x00000008; + return dLPBJMPECFC; + } + + /** + * repeated uint32 DLPBJMPECFC = 8; + * @param value the dLPBJMPECFC to add + * @return this + */ + public GetRollShopInfoScRsp addDLPBJMPECFC(final int value) { + bitField0_ |= 0x00000008; + dLPBJMPECFC.add(value); + return this; + } + + /** + * repeated uint32 DLPBJMPECFC = 8; + * @param values the dLPBJMPECFC to add + * @return this + */ + public GetRollShopInfoScRsp addAllDLPBJMPECFC(final int... values) { + bitField0_ |= 0x00000008; + dLPBJMPECFC.addAll(values); + return this; + } + + @Override + public GetRollShopInfoScRsp copyFrom(final GetRollShopInfoScRsp other) { + cachedSize = other.cachedSize; + if ((bitField0_ | other.bitField0_) != 0) { + bitField0_ = other.bitField0_; + bBJIJINJAFK = other.bBJIJINJAFK; + retcode = other.retcode; + rollShopId = other.rollShopId; + dLPBJMPECFC.copyFrom(other.dLPBJMPECFC); + } + return this; + } + + @Override + public GetRollShopInfoScRsp mergeFrom(final GetRollShopInfoScRsp other) { + if (other.isEmpty()) { + return this; + } + cachedSize = -1; + if (other.hasBBJIJINJAFK()) { + setBBJIJINJAFK(other.bBJIJINJAFK); + } + if (other.hasRetcode()) { + setRetcode(other.retcode); + } + if (other.hasRollShopId()) { + setRollShopId(other.rollShopId); + } + if (other.hasDLPBJMPECFC()) { + getMutableDLPBJMPECFC().addAll(other.dLPBJMPECFC); + } + return this; + } + + @Override + public GetRollShopInfoScRsp clear() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + bBJIJINJAFK = 0; + retcode = 0; + rollShopId = 0; + dLPBJMPECFC.clear(); + return this; + } + + @Override + public GetRollShopInfoScRsp clearQuick() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + dLPBJMPECFC.clear(); + return this; + } + + @Override + public boolean equals(Object o) { + if (o == this) { + return true; + } + if (!(o instanceof GetRollShopInfoScRsp)) { + return false; + } + GetRollShopInfoScRsp other = (GetRollShopInfoScRsp) o; + return bitField0_ == other.bitField0_ + && (!hasBBJIJINJAFK() || bBJIJINJAFK == other.bBJIJINJAFK) + && (!hasRetcode() || retcode == other.retcode) + && (!hasRollShopId() || rollShopId == other.rollShopId) + && (!hasDLPBJMPECFC() || dLPBJMPECFC.equals(other.dLPBJMPECFC)); + } + + @Override + public void writeTo(final ProtoSink output) throws IOException { + if ((bitField0_ & 0x00000001) != 0) { + output.writeRawByte((byte) 32); + output.writeUInt32NoTag(bBJIJINJAFK); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 40); + output.writeUInt32NoTag(retcode); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 120); + output.writeUInt32NoTag(rollShopId); + } + if ((bitField0_ & 0x00000008) != 0) { + for (int i = 0; i < dLPBJMPECFC.length(); i++) { + output.writeRawByte((byte) 64); + output.writeUInt32NoTag(dLPBJMPECFC.array()[i]); + } + } + } + + @Override + protected int computeSerializedSize() { + int size = 0; + if ((bitField0_ & 0x00000001) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(bBJIJINJAFK); + } + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + } + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(rollShopId); + } + if ((bitField0_ & 0x00000008) != 0) { + size += (1 * dLPBJMPECFC.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(dLPBJMPECFC); + } + return size; + } + + @Override + @SuppressWarnings("fallthrough") + public GetRollShopInfoScRsp mergeFrom(final ProtoSource input) throws IOException { + // Enabled Fall-Through Optimization (QuickBuffers) + int tag = input.readTag(); + while (true) { + switch (tag) { + case 32: { + // bBJIJINJAFK + bBJIJINJAFK = input.readUInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 40) { + break; + } + } + case 40: { + // retcode + retcode = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 120) { + break; + } + } + case 120: { + // rollShopId + rollShopId = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 66) { + break; + } + } + case 66: { + // dLPBJMPECFC [packed=true] + input.readPackedUInt32(dLPBJMPECFC, tag); + bitField0_ |= 0x00000008; + tag = input.readTag(); + if (tag != 0) { + break; + } + } + case 0: { + return this; + } + default: { + if (!input.skipField(tag)) { + return this; + } + tag = input.readTag(); + break; + } + case 64: { + // dLPBJMPECFC [packed=false] + tag = input.readRepeatedUInt32(dLPBJMPECFC, tag); + bitField0_ |= 0x00000008; + break; + } + } + } + } + + @Override + public void writeTo(final JsonSink output) throws IOException { + output.beginObject(); + if ((bitField0_ & 0x00000001) != 0) { + output.writeUInt32(FieldNames.bBJIJINJAFK, bBJIJINJAFK); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeUInt32(FieldNames.retcode, retcode); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeUInt32(FieldNames.rollShopId, rollShopId); + } + if ((bitField0_ & 0x00000008) != 0) { + output.writeRepeatedUInt32(FieldNames.dLPBJMPECFC, dLPBJMPECFC); + } + output.endObject(); + } + + @Override + public GetRollShopInfoScRsp mergeFrom(final JsonSource input) throws IOException { + if (!input.beginObject()) { + return this; + } + while (!input.isAtEnd()) { + switch (input.readFieldHash()) { + case -1536175796: { + if (input.isAtField(FieldNames.bBJIJINJAFK)) { + if (!input.trySkipNullValue()) { + bBJIJINJAFK = input.readUInt32(); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { + if (!input.trySkipNullValue()) { + retcode = input.readUInt32(); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + case -904898162: + case -1612413630: { + if (input.isAtField(FieldNames.rollShopId)) { + if (!input.trySkipNullValue()) { + rollShopId = input.readUInt32(); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } + case 41374990: { + if (input.isAtField(FieldNames.dLPBJMPECFC)) { + if (!input.trySkipNullValue()) { + input.readRepeatedUInt32(dLPBJMPECFC); + bitField0_ |= 0x00000008; + } + } else { + input.skipUnknownField(); + } + break; + } + default: { + input.skipUnknownField(); + break; + } + } + } + input.endObject(); + return this; + } + + @Override + public GetRollShopInfoScRsp clone() { + return new GetRollShopInfoScRsp().copyFrom(this); + } + + @Override + public boolean isEmpty() { + return ((bitField0_) == 0); + } + + public static GetRollShopInfoScRsp parseFrom(final byte[] data) throws + InvalidProtocolBufferException { + return ProtoMessage.mergeFrom(new GetRollShopInfoScRsp(), data).checkInitialized(); + } + + public static GetRollShopInfoScRsp parseFrom(final ProtoSource input) throws IOException { + return ProtoMessage.mergeFrom(new GetRollShopInfoScRsp(), input).checkInitialized(); + } + + public static GetRollShopInfoScRsp parseFrom(final JsonSource input) throws IOException { + return ProtoMessage.mergeFrom(new GetRollShopInfoScRsp(), input).checkInitialized(); + } + + /** + * @return factory for creating GetRollShopInfoScRsp messages + */ + public static MessageFactory getFactory() { + return GetRollShopInfoScRspFactory.INSTANCE; + } + + private enum GetRollShopInfoScRspFactory implements MessageFactory { + INSTANCE; + + @Override + public GetRollShopInfoScRsp create() { + return GetRollShopInfoScRsp.newInstance(); + } + } + + /** + * Contains name constants used for serializing JSON + */ + static class FieldNames { + static final FieldName bBJIJINJAFK = FieldName.forField("BBJIJINJAFK"); + + static final FieldName retcode = FieldName.forField("retcode"); + + static final FieldName rollShopId = FieldName.forField("rollShopId", "roll_shop_id"); + + static final FieldName dLPBJMPECFC = FieldName.forField("DLPBJMPECFC"); + } + } +} diff --git a/src/generated/main/emu/lunarcore/proto/GetSceneMapInfoCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetSceneMapInfoCsReqOuterClass.java index 3ee0f98e7..891e6e04a 100644 --- a/src/generated/main/emu/lunarcore/proto/GetSceneMapInfoCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetSceneMapInfoCsReqOuterClass.java @@ -20,12 +20,12 @@ public static final class GetSceneMapInfoCsReq extends ProtoMessageoptional uint32 entry_id = 11; + * optional uint32 entry_id = 15; */ private int entryId; /** - * repeated uint32 entry_id_list = 3; + * repeated uint32 entry_id_list = 8; */ private final RepeatedInt entryIdList = RepeatedInt.newEmptyInstance(); @@ -40,7 +40,7 @@ public static GetSceneMapInfoCsReq newInstance() { } /** - * optional uint32 entry_id = 11; + * optional uint32 entry_id = 15; * @return whether the entryId field is set */ public boolean hasEntryId() { @@ -48,7 +48,7 @@ public boolean hasEntryId() { } /** - * optional uint32 entry_id = 11; + * optional uint32 entry_id = 15; * @return this */ public GetSceneMapInfoCsReq clearEntryId() { @@ -58,7 +58,7 @@ public GetSceneMapInfoCsReq clearEntryId() { } /** - * optional uint32 entry_id = 11; + * optional uint32 entry_id = 15; * @return the entryId */ public int getEntryId() { @@ -66,7 +66,7 @@ public int getEntryId() { } /** - * optional uint32 entry_id = 11; + * optional uint32 entry_id = 15; * @param value the entryId to set * @return this */ @@ -77,7 +77,7 @@ public GetSceneMapInfoCsReq setEntryId(final int value) { } /** - * repeated uint32 entry_id_list = 3; + * repeated uint32 entry_id_list = 8; * @return whether the entryIdList field is set */ public boolean hasEntryIdList() { @@ -85,7 +85,7 @@ public boolean hasEntryIdList() { } /** - * repeated uint32 entry_id_list = 3; + * repeated uint32 entry_id_list = 8; * @return this */ public GetSceneMapInfoCsReq clearEntryIdList() { @@ -95,7 +95,7 @@ public GetSceneMapInfoCsReq clearEntryIdList() { } /** - * repeated uint32 entry_id_list = 3; + * repeated uint32 entry_id_list = 8; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -109,7 +109,7 @@ public RepeatedInt getEntryIdList() { } /** - * repeated uint32 entry_id_list = 3; + * repeated uint32 entry_id_list = 8; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -123,7 +123,7 @@ public RepeatedInt getMutableEntryIdList() { } /** - * repeated uint32 entry_id_list = 3; + * repeated uint32 entry_id_list = 8; * @param value the entryIdList to add * @return this */ @@ -134,7 +134,7 @@ public GetSceneMapInfoCsReq addEntryIdList(final int value) { } /** - * repeated uint32 entry_id_list = 3; + * repeated uint32 entry_id_list = 8; * @param values the entryIdList to add * @return this */ @@ -210,12 +210,12 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(entryId); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < entryIdList.length(); i++) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(entryIdList.array()[i]); } } @@ -240,16 +240,16 @@ public GetSceneMapInfoCsReq mergeFrom(final ProtoSource input) throws IOExceptio int tag = input.readTag(); while (true) { switch (tag) { - case 88: { + case 120: { // entryId entryId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 26) { + if (tag != 66) { break; } } - case 26: { + case 66: { // entryIdList [packed=true] input.readPackedUInt32(entryIdList, tag); bitField0_ |= 0x00000002; @@ -268,7 +268,7 @@ public GetSceneMapInfoCsReq mergeFrom(final ProtoSource input) throws IOExceptio tag = input.readTag(); break; } - case 24: { + case 64: { // entryIdList [packed=false] tag = input.readRepeatedUInt32(entryIdList, tag); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/GetSceneMapInfoScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetSceneMapInfoScRspOuterClass.java index 3217a765c..883787d65 100644 --- a/src/generated/main/emu/lunarcore/proto/GetSceneMapInfoScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetSceneMapInfoScRspOuterClass.java @@ -21,49 +21,49 @@ public static final class GetSceneMapInfoScRsp extends ProtoMessageoptional uint32 cur_map_entry_id = 3; + * optional uint32 retcode = 8; */ - private int curMapEntryId; + private int retcode; /** - * optional uint32 retcode = 8; + * optional uint32 cur_map_entry_id = 9; */ - private int retcode; + private int curMapEntryId; /** - * optional uint32 entry_id = 11; + * optional uint32 entry_id = 10; */ private int entryId; /** - * repeated uint32 lighten_section_list = 7; + * repeated uint32 lighten_section_list = 4; */ private final RepeatedInt lightenSectionList = RepeatedInt.newEmptyInstance(); /** - * repeated uint32 unlocked_teleport_list = 15; + * repeated uint32 unlocked_teleport_list = 13; */ private final RepeatedInt unlockedTeleportList = RepeatedInt.newEmptyInstance(); /** - * repeated .MazeChest unlocked_chest_list = 1; + * repeated .MazeProp maze_prop_list = 7; */ - private final RepeatedMessage unlockedChestList = RepeatedMessage.newEmptyInstance(MazeChestOuterClass.MazeChest.getFactory()); + private final RepeatedMessage mazePropList = RepeatedMessage.newEmptyInstance(MazePropOuterClass.MazeProp.getFactory()); /** - * repeated .MazeGroup maze_group_list = 4; + * repeated .MazeChest unlocked_chest_list = 12; */ - private final RepeatedMessage mazeGroupList = RepeatedMessage.newEmptyInstance(MazeGroupOuterClass.MazeGroup.getFactory()); + private final RepeatedMessage unlockedChestList = RepeatedMessage.newEmptyInstance(MazeChestOuterClass.MazeChest.getFactory()); /** - * repeated .MazeProp maze_prop_list = 6; + * repeated .MazeMapData map_list = 14; */ - private final RepeatedMessage mazePropList = RepeatedMessage.newEmptyInstance(MazePropOuterClass.MazeProp.getFactory()); + private final RepeatedMessage mapList = RepeatedMessage.newEmptyInstance(MazeMapDataOuterClass.MazeMapData.getFactory()); /** - * repeated .MazeMapData map_list = 10; + * repeated .MazeGroup maze_group_list = 15; */ - private final RepeatedMessage mapList = RepeatedMessage.newEmptyInstance(MazeMapDataOuterClass.MazeMapData.getFactory()); + private final RepeatedMessage mazeGroupList = RepeatedMessage.newEmptyInstance(MazeGroupOuterClass.MazeGroup.getFactory()); private GetSceneMapInfoScRsp() { } @@ -76,81 +76,81 @@ public static GetSceneMapInfoScRsp newInstance() { } /** - * optional uint32 cur_map_entry_id = 3; - * @return whether the curMapEntryId field is set + * optional uint32 retcode = 8; + * @return whether the retcode field is set */ - public boolean hasCurMapEntryId() { + public boolean hasRetcode() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 cur_map_entry_id = 3; + * optional uint32 retcode = 8; * @return this */ - public GetSceneMapInfoScRsp clearCurMapEntryId() { + public GetSceneMapInfoScRsp clearRetcode() { bitField0_ &= ~0x00000001; - curMapEntryId = 0; + retcode = 0; return this; } /** - * optional uint32 cur_map_entry_id = 3; - * @return the curMapEntryId + * optional uint32 retcode = 8; + * @return the retcode */ - public int getCurMapEntryId() { - return curMapEntryId; + public int getRetcode() { + return retcode; } /** - * optional uint32 cur_map_entry_id = 3; - * @param value the curMapEntryId to set + * optional uint32 retcode = 8; + * @param value the retcode to set * @return this */ - public GetSceneMapInfoScRsp setCurMapEntryId(final int value) { + public GetSceneMapInfoScRsp setRetcode(final int value) { bitField0_ |= 0x00000001; - curMapEntryId = value; + retcode = value; return this; } /** - * optional uint32 retcode = 8; - * @return whether the retcode field is set + * optional uint32 cur_map_entry_id = 9; + * @return whether the curMapEntryId field is set */ - public boolean hasRetcode() { + public boolean hasCurMapEntryId() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 retcode = 8; + * optional uint32 cur_map_entry_id = 9; * @return this */ - public GetSceneMapInfoScRsp clearRetcode() { + public GetSceneMapInfoScRsp clearCurMapEntryId() { bitField0_ &= ~0x00000002; - retcode = 0; + curMapEntryId = 0; return this; } /** - * optional uint32 retcode = 8; - * @return the retcode + * optional uint32 cur_map_entry_id = 9; + * @return the curMapEntryId */ - public int getRetcode() { - return retcode; + public int getCurMapEntryId() { + return curMapEntryId; } /** - * optional uint32 retcode = 8; - * @param value the retcode to set + * optional uint32 cur_map_entry_id = 9; + * @param value the curMapEntryId to set * @return this */ - public GetSceneMapInfoScRsp setRetcode(final int value) { + public GetSceneMapInfoScRsp setCurMapEntryId(final int value) { bitField0_ |= 0x00000002; - retcode = value; + curMapEntryId = value; return this; } /** - * optional uint32 entry_id = 11; + * optional uint32 entry_id = 10; * @return whether the entryId field is set */ public boolean hasEntryId() { @@ -158,7 +158,7 @@ public boolean hasEntryId() { } /** - * optional uint32 entry_id = 11; + * optional uint32 entry_id = 10; * @return this */ public GetSceneMapInfoScRsp clearEntryId() { @@ -168,7 +168,7 @@ public GetSceneMapInfoScRsp clearEntryId() { } /** - * optional uint32 entry_id = 11; + * optional uint32 entry_id = 10; * @return the entryId */ public int getEntryId() { @@ -176,7 +176,7 @@ public int getEntryId() { } /** - * optional uint32 entry_id = 11; + * optional uint32 entry_id = 10; * @param value the entryId to set * @return this */ @@ -187,7 +187,7 @@ public GetSceneMapInfoScRsp setEntryId(final int value) { } /** - * repeated uint32 lighten_section_list = 7; + * repeated uint32 lighten_section_list = 4; * @return whether the lightenSectionList field is set */ public boolean hasLightenSectionList() { @@ -195,7 +195,7 @@ public boolean hasLightenSectionList() { } /** - * repeated uint32 lighten_section_list = 7; + * repeated uint32 lighten_section_list = 4; * @return this */ public GetSceneMapInfoScRsp clearLightenSectionList() { @@ -205,7 +205,7 @@ public GetSceneMapInfoScRsp clearLightenSectionList() { } /** - * repeated uint32 lighten_section_list = 7; + * repeated uint32 lighten_section_list = 4; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -219,7 +219,7 @@ public RepeatedInt getLightenSectionList() { } /** - * repeated uint32 lighten_section_list = 7; + * repeated uint32 lighten_section_list = 4; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -233,7 +233,7 @@ public RepeatedInt getMutableLightenSectionList() { } /** - * repeated uint32 lighten_section_list = 7; + * repeated uint32 lighten_section_list = 4; * @param value the lightenSectionList to add * @return this */ @@ -244,7 +244,7 @@ public GetSceneMapInfoScRsp addLightenSectionList(final int value) { } /** - * repeated uint32 lighten_section_list = 7; + * repeated uint32 lighten_section_list = 4; * @param values the lightenSectionList to add * @return this */ @@ -255,7 +255,7 @@ public GetSceneMapInfoScRsp addAllLightenSectionList(final int... values) { } /** - * repeated uint32 unlocked_teleport_list = 15; + * repeated uint32 unlocked_teleport_list = 13; * @return whether the unlockedTeleportList field is set */ public boolean hasUnlockedTeleportList() { @@ -263,7 +263,7 @@ public boolean hasUnlockedTeleportList() { } /** - * repeated uint32 unlocked_teleport_list = 15; + * repeated uint32 unlocked_teleport_list = 13; * @return this */ public GetSceneMapInfoScRsp clearUnlockedTeleportList() { @@ -273,7 +273,7 @@ public GetSceneMapInfoScRsp clearUnlockedTeleportList() { } /** - * repeated uint32 unlocked_teleport_list = 15; + * repeated uint32 unlocked_teleport_list = 13; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -287,7 +287,7 @@ public RepeatedInt getUnlockedTeleportList() { } /** - * repeated uint32 unlocked_teleport_list = 15; + * repeated uint32 unlocked_teleport_list = 13; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -301,7 +301,7 @@ public RepeatedInt getMutableUnlockedTeleportList() { } /** - * repeated uint32 unlocked_teleport_list = 15; + * repeated uint32 unlocked_teleport_list = 13; * @param value the unlockedTeleportList to add * @return this */ @@ -312,7 +312,7 @@ public GetSceneMapInfoScRsp addUnlockedTeleportList(final int value) { } /** - * repeated uint32 unlocked_teleport_list = 15; + * repeated uint32 unlocked_teleport_list = 13; * @param values the unlockedTeleportList to add * @return this */ @@ -323,39 +323,39 @@ public GetSceneMapInfoScRsp addAllUnlockedTeleportList(final int... values) { } /** - * repeated .MazeChest unlocked_chest_list = 1; - * @return whether the unlockedChestList field is set + * repeated .MazeProp maze_prop_list = 7; + * @return whether the mazePropList field is set */ - public boolean hasUnlockedChestList() { + public boolean hasMazePropList() { return (bitField0_ & 0x00000020) != 0; } /** - * repeated .MazeChest unlocked_chest_list = 1; + * repeated .MazeProp maze_prop_list = 7; * @return this */ - public GetSceneMapInfoScRsp clearUnlockedChestList() { + public GetSceneMapInfoScRsp clearMazePropList() { bitField0_ &= ~0x00000020; - unlockedChestList.clear(); + mazePropList.clear(); return this; } /** - * repeated .MazeChest unlocked_chest_list = 1; + * repeated .MazeProp maze_prop_list = 7; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. * - * Use {@link #getMutableUnlockedChestList()} if you want to modify it. + * Use {@link #getMutableMazePropList()} if you want to modify it. * * @return internal storage object for reading */ - public RepeatedMessage getUnlockedChestList() { - return unlockedChestList; + public RepeatedMessage getMazePropList() { + return mazePropList; } /** - * repeated .MazeChest unlocked_chest_list = 1; + * repeated .MazeProp maze_prop_list = 7; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -363,68 +363,67 @@ public RepeatedMessage getUnlockedChestList() { * * @return internal storage object for modifications */ - public RepeatedMessage getMutableUnlockedChestList() { + public RepeatedMessage getMutableMazePropList() { bitField0_ |= 0x00000020; - return unlockedChestList; + return mazePropList; } /** - * repeated .MazeChest unlocked_chest_list = 1; - * @param value the unlockedChestList to add + * repeated .MazeProp maze_prop_list = 7; + * @param value the mazePropList to add * @return this */ - public GetSceneMapInfoScRsp addUnlockedChestList(final MazeChestOuterClass.MazeChest value) { + public GetSceneMapInfoScRsp addMazePropList(final MazePropOuterClass.MazeProp value) { bitField0_ |= 0x00000020; - unlockedChestList.add(value); + mazePropList.add(value); return this; } /** - * repeated .MazeChest unlocked_chest_list = 1; - * @param values the unlockedChestList to add + * repeated .MazeProp maze_prop_list = 7; + * @param values the mazePropList to add * @return this */ - public GetSceneMapInfoScRsp addAllUnlockedChestList( - final MazeChestOuterClass.MazeChest... values) { + public GetSceneMapInfoScRsp addAllMazePropList(final MazePropOuterClass.MazeProp... values) { bitField0_ |= 0x00000020; - unlockedChestList.addAll(values); + mazePropList.addAll(values); return this; } /** - * repeated .MazeGroup maze_group_list = 4; - * @return whether the mazeGroupList field is set + * repeated .MazeChest unlocked_chest_list = 12; + * @return whether the unlockedChestList field is set */ - public boolean hasMazeGroupList() { + public boolean hasUnlockedChestList() { return (bitField0_ & 0x00000040) != 0; } /** - * repeated .MazeGroup maze_group_list = 4; + * repeated .MazeChest unlocked_chest_list = 12; * @return this */ - public GetSceneMapInfoScRsp clearMazeGroupList() { + public GetSceneMapInfoScRsp clearUnlockedChestList() { bitField0_ &= ~0x00000040; - mazeGroupList.clear(); + unlockedChestList.clear(); return this; } /** - * repeated .MazeGroup maze_group_list = 4; + * repeated .MazeChest unlocked_chest_list = 12; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. * - * Use {@link #getMutableMazeGroupList()} if you want to modify it. + * Use {@link #getMutableUnlockedChestList()} if you want to modify it. * * @return internal storage object for reading */ - public RepeatedMessage getMazeGroupList() { - return mazeGroupList; + public RepeatedMessage getUnlockedChestList() { + return unlockedChestList; } /** - * repeated .MazeGroup maze_group_list = 4; + * repeated .MazeChest unlocked_chest_list = 12; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -432,67 +431,68 @@ public RepeatedMessage getMazeGroupList() { * * @return internal storage object for modifications */ - public RepeatedMessage getMutableMazeGroupList() { + public RepeatedMessage getMutableUnlockedChestList() { bitField0_ |= 0x00000040; - return mazeGroupList; + return unlockedChestList; } /** - * repeated .MazeGroup maze_group_list = 4; - * @param value the mazeGroupList to add + * repeated .MazeChest unlocked_chest_list = 12; + * @param value the unlockedChestList to add * @return this */ - public GetSceneMapInfoScRsp addMazeGroupList(final MazeGroupOuterClass.MazeGroup value) { + public GetSceneMapInfoScRsp addUnlockedChestList(final MazeChestOuterClass.MazeChest value) { bitField0_ |= 0x00000040; - mazeGroupList.add(value); + unlockedChestList.add(value); return this; } /** - * repeated .MazeGroup maze_group_list = 4; - * @param values the mazeGroupList to add + * repeated .MazeChest unlocked_chest_list = 12; + * @param values the unlockedChestList to add * @return this */ - public GetSceneMapInfoScRsp addAllMazeGroupList(final MazeGroupOuterClass.MazeGroup... values) { + public GetSceneMapInfoScRsp addAllUnlockedChestList( + final MazeChestOuterClass.MazeChest... values) { bitField0_ |= 0x00000040; - mazeGroupList.addAll(values); + unlockedChestList.addAll(values); return this; } /** - * repeated .MazeProp maze_prop_list = 6; - * @return whether the mazePropList field is set + * repeated .MazeMapData map_list = 14; + * @return whether the mapList field is set */ - public boolean hasMazePropList() { + public boolean hasMapList() { return (bitField0_ & 0x00000080) != 0; } /** - * repeated .MazeProp maze_prop_list = 6; + * repeated .MazeMapData map_list = 14; * @return this */ - public GetSceneMapInfoScRsp clearMazePropList() { + public GetSceneMapInfoScRsp clearMapList() { bitField0_ &= ~0x00000080; - mazePropList.clear(); + mapList.clear(); return this; } /** - * repeated .MazeProp maze_prop_list = 6; + * repeated .MazeMapData map_list = 14; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. * - * Use {@link #getMutableMazePropList()} if you want to modify it. + * Use {@link #getMutableMapList()} if you want to modify it. * * @return internal storage object for reading */ - public RepeatedMessage getMazePropList() { - return mazePropList; + public RepeatedMessage getMapList() { + return mapList; } /** - * repeated .MazeProp maze_prop_list = 6; + * repeated .MazeMapData map_list = 14; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -500,67 +500,67 @@ public RepeatedMessage getMazePropList() { * * @return internal storage object for modifications */ - public RepeatedMessage getMutableMazePropList() { + public RepeatedMessage getMutableMapList() { bitField0_ |= 0x00000080; - return mazePropList; + return mapList; } /** - * repeated .MazeProp maze_prop_list = 6; - * @param value the mazePropList to add + * repeated .MazeMapData map_list = 14; + * @param value the mapList to add * @return this */ - public GetSceneMapInfoScRsp addMazePropList(final MazePropOuterClass.MazeProp value) { + public GetSceneMapInfoScRsp addMapList(final MazeMapDataOuterClass.MazeMapData value) { bitField0_ |= 0x00000080; - mazePropList.add(value); + mapList.add(value); return this; } /** - * repeated .MazeProp maze_prop_list = 6; - * @param values the mazePropList to add + * repeated .MazeMapData map_list = 14; + * @param values the mapList to add * @return this */ - public GetSceneMapInfoScRsp addAllMazePropList(final MazePropOuterClass.MazeProp... values) { + public GetSceneMapInfoScRsp addAllMapList(final MazeMapDataOuterClass.MazeMapData... values) { bitField0_ |= 0x00000080; - mazePropList.addAll(values); + mapList.addAll(values); return this; } /** - * repeated .MazeMapData map_list = 10; - * @return whether the mapList field is set + * repeated .MazeGroup maze_group_list = 15; + * @return whether the mazeGroupList field is set */ - public boolean hasMapList() { + public boolean hasMazeGroupList() { return (bitField0_ & 0x00000100) != 0; } /** - * repeated .MazeMapData map_list = 10; + * repeated .MazeGroup maze_group_list = 15; * @return this */ - public GetSceneMapInfoScRsp clearMapList() { + public GetSceneMapInfoScRsp clearMazeGroupList() { bitField0_ &= ~0x00000100; - mapList.clear(); + mazeGroupList.clear(); return this; } /** - * repeated .MazeMapData map_list = 10; + * repeated .MazeGroup maze_group_list = 15; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. * - * Use {@link #getMutableMapList()} if you want to modify it. + * Use {@link #getMutableMazeGroupList()} if you want to modify it. * * @return internal storage object for reading */ - public RepeatedMessage getMapList() { - return mapList; + public RepeatedMessage getMazeGroupList() { + return mazeGroupList; } /** - * repeated .MazeMapData map_list = 10; + * repeated .MazeGroup maze_group_list = 15; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -568,30 +568,30 @@ public RepeatedMessage getMapList() { * * @return internal storage object for modifications */ - public RepeatedMessage getMutableMapList() { + public RepeatedMessage getMutableMazeGroupList() { bitField0_ |= 0x00000100; - return mapList; + return mazeGroupList; } /** - * repeated .MazeMapData map_list = 10; - * @param value the mapList to add + * repeated .MazeGroup maze_group_list = 15; + * @param value the mazeGroupList to add * @return this */ - public GetSceneMapInfoScRsp addMapList(final MazeMapDataOuterClass.MazeMapData value) { + public GetSceneMapInfoScRsp addMazeGroupList(final MazeGroupOuterClass.MazeGroup value) { bitField0_ |= 0x00000100; - mapList.add(value); + mazeGroupList.add(value); return this; } /** - * repeated .MazeMapData map_list = 10; - * @param values the mapList to add + * repeated .MazeGroup maze_group_list = 15; + * @param values the mazeGroupList to add * @return this */ - public GetSceneMapInfoScRsp addAllMapList(final MazeMapDataOuterClass.MazeMapData... values) { + public GetSceneMapInfoScRsp addAllMazeGroupList(final MazeGroupOuterClass.MazeGroup... values) { bitField0_ |= 0x00000100; - mapList.addAll(values); + mazeGroupList.addAll(values); return this; } @@ -600,15 +600,15 @@ public GetSceneMapInfoScRsp copyFrom(final GetSceneMapInfoScRsp other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - curMapEntryId = other.curMapEntryId; retcode = other.retcode; + curMapEntryId = other.curMapEntryId; entryId = other.entryId; lightenSectionList.copyFrom(other.lightenSectionList); unlockedTeleportList.copyFrom(other.unlockedTeleportList); - unlockedChestList.copyFrom(other.unlockedChestList); - mazeGroupList.copyFrom(other.mazeGroupList); mazePropList.copyFrom(other.mazePropList); + unlockedChestList.copyFrom(other.unlockedChestList); mapList.copyFrom(other.mapList); + mazeGroupList.copyFrom(other.mazeGroupList); } return this; } @@ -619,12 +619,12 @@ public GetSceneMapInfoScRsp mergeFrom(final GetSceneMapInfoScRsp other) { return this; } cachedSize = -1; - if (other.hasCurMapEntryId()) { - setCurMapEntryId(other.curMapEntryId); - } if (other.hasRetcode()) { setRetcode(other.retcode); } + if (other.hasCurMapEntryId()) { + setCurMapEntryId(other.curMapEntryId); + } if (other.hasEntryId()) { setEntryId(other.entryId); } @@ -634,18 +634,18 @@ public GetSceneMapInfoScRsp mergeFrom(final GetSceneMapInfoScRsp other) { if (other.hasUnlockedTeleportList()) { getMutableUnlockedTeleportList().addAll(other.unlockedTeleportList); } - if (other.hasUnlockedChestList()) { - getMutableUnlockedChestList().addAll(other.unlockedChestList); - } - if (other.hasMazeGroupList()) { - getMutableMazeGroupList().addAll(other.mazeGroupList); - } if (other.hasMazePropList()) { getMutableMazePropList().addAll(other.mazePropList); } + if (other.hasUnlockedChestList()) { + getMutableUnlockedChestList().addAll(other.unlockedChestList); + } if (other.hasMapList()) { getMutableMapList().addAll(other.mapList); } + if (other.hasMazeGroupList()) { + getMutableMazeGroupList().addAll(other.mazeGroupList); + } return this; } @@ -656,15 +656,15 @@ public GetSceneMapInfoScRsp clear() { } cachedSize = -1; bitField0_ = 0; - curMapEntryId = 0; retcode = 0; + curMapEntryId = 0; entryId = 0; lightenSectionList.clear(); unlockedTeleportList.clear(); - unlockedChestList.clear(); - mazeGroupList.clear(); mazePropList.clear(); + unlockedChestList.clear(); mapList.clear(); + mazeGroupList.clear(); return this; } @@ -677,10 +677,10 @@ public GetSceneMapInfoScRsp clearQuick() { bitField0_ = 0; lightenSectionList.clear(); unlockedTeleportList.clear(); - unlockedChestList.clearQuick(); - mazeGroupList.clearQuick(); mazePropList.clearQuick(); + unlockedChestList.clearQuick(); mapList.clearQuick(); + mazeGroupList.clearQuick(); return this; } @@ -694,65 +694,65 @@ public boolean equals(Object o) { } GetSceneMapInfoScRsp other = (GetSceneMapInfoScRsp) o; return bitField0_ == other.bitField0_ - && (!hasCurMapEntryId() || curMapEntryId == other.curMapEntryId) && (!hasRetcode() || retcode == other.retcode) + && (!hasCurMapEntryId() || curMapEntryId == other.curMapEntryId) && (!hasEntryId() || entryId == other.entryId) && (!hasLightenSectionList() || lightenSectionList.equals(other.lightenSectionList)) && (!hasUnlockedTeleportList() || unlockedTeleportList.equals(other.unlockedTeleportList)) - && (!hasUnlockedChestList() || unlockedChestList.equals(other.unlockedChestList)) - && (!hasMazeGroupList() || mazeGroupList.equals(other.mazeGroupList)) && (!hasMazePropList() || mazePropList.equals(other.mazePropList)) - && (!hasMapList() || mapList.equals(other.mapList)); + && (!hasUnlockedChestList() || unlockedChestList.equals(other.unlockedChestList)) + && (!hasMapList() || mapList.equals(other.mapList)) + && (!hasMazeGroupList() || mazeGroupList.equals(other.mazeGroupList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); - output.writeUInt32NoTag(curMapEntryId); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 64); output.writeUInt32NoTag(retcode); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 72); + output.writeUInt32NoTag(curMapEntryId); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(entryId); } if ((bitField0_ & 0x00000008) != 0) { for (int i = 0; i < lightenSectionList.length(); i++) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(lightenSectionList.array()[i]); } } if ((bitField0_ & 0x00000010) != 0) { for (int i = 0; i < unlockedTeleportList.length(); i++) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(unlockedTeleportList.array()[i]); } } if ((bitField0_ & 0x00000020) != 0) { - for (int i = 0; i < unlockedChestList.length(); i++) { - output.writeRawByte((byte) 10); - output.writeMessageNoTag(unlockedChestList.get(i)); + for (int i = 0; i < mazePropList.length(); i++) { + output.writeRawByte((byte) 58); + output.writeMessageNoTag(mazePropList.get(i)); } } if ((bitField0_ & 0x00000040) != 0) { - for (int i = 0; i < mazeGroupList.length(); i++) { - output.writeRawByte((byte) 34); - output.writeMessageNoTag(mazeGroupList.get(i)); + for (int i = 0; i < unlockedChestList.length(); i++) { + output.writeRawByte((byte) 98); + output.writeMessageNoTag(unlockedChestList.get(i)); } } if ((bitField0_ & 0x00000080) != 0) { - for (int i = 0; i < mazePropList.length(); i++) { - output.writeRawByte((byte) 50); - output.writeMessageNoTag(mazePropList.get(i)); + for (int i = 0; i < mapList.length(); i++) { + output.writeRawByte((byte) 114); + output.writeMessageNoTag(mapList.get(i)); } } if ((bitField0_ & 0x00000100) != 0) { - for (int i = 0; i < mapList.length(); i++) { - output.writeRawByte((byte) 82); - output.writeMessageNoTag(mapList.get(i)); + for (int i = 0; i < mazeGroupList.length(); i++) { + output.writeRawByte((byte) 122); + output.writeMessageNoTag(mazeGroupList.get(i)); } } } @@ -761,10 +761,10 @@ public void writeTo(final ProtoSink output) throws IOException { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(curMapEntryId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(curMapEntryId); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(entryId); @@ -776,16 +776,16 @@ protected int computeSerializedSize() { size += (1 * unlockedTeleportList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(unlockedTeleportList); } if ((bitField0_ & 0x00000020) != 0) { - size += (1 * unlockedChestList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(unlockedChestList); + size += (1 * mazePropList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(mazePropList); } if ((bitField0_ & 0x00000040) != 0) { - size += (1 * mazeGroupList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(mazeGroupList); + size += (1 * unlockedChestList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(unlockedChestList); } if ((bitField0_ & 0x00000080) != 0) { - size += (1 * mazePropList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(mazePropList); + size += (1 * mapList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(mapList); } if ((bitField0_ & 0x00000100) != 0) { - size += (1 * mapList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(mapList); + size += (1 * mazeGroupList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(mazeGroupList); } return size; } @@ -797,78 +797,78 @@ public GetSceneMapInfoScRsp mergeFrom(final ProtoSource input) throws IOExceptio int tag = input.readTag(); while (true) { switch (tag) { - case 24: { - // curMapEntryId - curMapEntryId = input.readUInt32(); + case 64: { + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 64) { + if (tag != 72) { break; } } - case 64: { - // retcode - retcode = input.readUInt32(); + case 72: { + // curMapEntryId + curMapEntryId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 88) { + if (tag != 80) { break; } } - case 88: { + case 80: { // entryId entryId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 58) { + if (tag != 34) { break; } } - case 58: { + case 34: { // lightenSectionList [packed=true] input.readPackedUInt32(lightenSectionList, tag); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 122) { + if (tag != 106) { break; } } - case 122: { + case 106: { // unlockedTeleportList [packed=true] input.readPackedUInt32(unlockedTeleportList, tag); bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 10) { + if (tag != 58) { break; } } - case 10: { - // unlockedChestList - tag = input.readRepeatedMessage(unlockedChestList, tag); + case 58: { + // mazePropList + tag = input.readRepeatedMessage(mazePropList, tag); bitField0_ |= 0x00000020; - if (tag != 34) { + if (tag != 98) { break; } } - case 34: { - // mazeGroupList - tag = input.readRepeatedMessage(mazeGroupList, tag); + case 98: { + // unlockedChestList + tag = input.readRepeatedMessage(unlockedChestList, tag); bitField0_ |= 0x00000040; - if (tag != 50) { + if (tag != 114) { break; } } - case 50: { - // mazePropList - tag = input.readRepeatedMessage(mazePropList, tag); + case 114: { + // mapList + tag = input.readRepeatedMessage(mapList, tag); bitField0_ |= 0x00000080; - if (tag != 82) { + if (tag != 122) { break; } } - case 82: { - // mapList - tag = input.readRepeatedMessage(mapList, tag); + case 122: { + // mazeGroupList + tag = input.readRepeatedMessage(mazeGroupList, tag); bitField0_ |= 0x00000100; if (tag != 0) { break; @@ -884,13 +884,13 @@ public GetSceneMapInfoScRsp mergeFrom(final ProtoSource input) throws IOExceptio tag = input.readTag(); break; } - case 56: { + case 32: { // lightenSectionList [packed=false] tag = input.readRepeatedUInt32(lightenSectionList, tag); bitField0_ |= 0x00000008; break; } - case 120: { + case 104: { // unlockedTeleportList [packed=false] tag = input.readRepeatedUInt32(unlockedTeleportList, tag); bitField0_ |= 0x00000010; @@ -904,10 +904,10 @@ public GetSceneMapInfoScRsp mergeFrom(final ProtoSource input) throws IOExceptio public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.curMapEntryId, curMapEntryId); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.curMapEntryId, curMapEntryId); } if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.entryId, entryId); @@ -919,16 +919,16 @@ public void writeTo(final JsonSink output) throws IOException { output.writeRepeatedUInt32(FieldNames.unlockedTeleportList, unlockedTeleportList); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRepeatedMessage(FieldNames.unlockedChestList, unlockedChestList); + output.writeRepeatedMessage(FieldNames.mazePropList, mazePropList); } if ((bitField0_ & 0x00000040) != 0) { - output.writeRepeatedMessage(FieldNames.mazeGroupList, mazeGroupList); + output.writeRepeatedMessage(FieldNames.unlockedChestList, unlockedChestList); } if ((bitField0_ & 0x00000080) != 0) { - output.writeRepeatedMessage(FieldNames.mazePropList, mazePropList); + output.writeRepeatedMessage(FieldNames.mapList, mapList); } if ((bitField0_ & 0x00000100) != 0) { - output.writeRepeatedMessage(FieldNames.mapList, mapList); + output.writeRepeatedMessage(FieldNames.mazeGroupList, mazeGroupList); } output.endObject(); } @@ -940,11 +940,10 @@ public GetSceneMapInfoScRsp mergeFrom(final JsonSource input) throws IOException } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 764919441: - case 2115673898: { - if (input.isAtField(FieldNames.curMapEntryId)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - curMapEntryId = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -952,10 +951,11 @@ public GetSceneMapInfoScRsp mergeFrom(final JsonSource input) throws IOException } break; } - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case 764919441: + case 2115673898: { + if (input.isAtField(FieldNames.curMapEntryId)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + curMapEntryId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -999,11 +999,11 @@ public GetSceneMapInfoScRsp mergeFrom(final JsonSource input) throws IOException } break; } - case -337762404: - case 231688696: { - if (input.isAtField(FieldNames.unlockedChestList)) { + case 1676123008: + case 1875839866: { + if (input.isAtField(FieldNames.mazePropList)) { if (!input.trySkipNullValue()) { - input.readRepeatedMessage(unlockedChestList); + input.readRepeatedMessage(mazePropList); bitField0_ |= 0x00000020; } } else { @@ -1011,11 +1011,11 @@ public GetSceneMapInfoScRsp mergeFrom(final JsonSource input) throws IOException } break; } - case -317054274: - case 407435998: { - if (input.isAtField(FieldNames.mazeGroupList)) { + case -337762404: + case 231688696: { + if (input.isAtField(FieldNames.unlockedChestList)) { if (!input.trySkipNullValue()) { - input.readRepeatedMessage(mazeGroupList); + input.readRepeatedMessage(unlockedChestList); bitField0_ |= 0x00000040; } } else { @@ -1023,11 +1023,11 @@ public GetSceneMapInfoScRsp mergeFrom(final JsonSource input) throws IOException } break; } - case 1676123008: - case 1875839866: { - if (input.isAtField(FieldNames.mazePropList)) { + case 836484122: + case 178830753: { + if (input.isAtField(FieldNames.mapList)) { if (!input.trySkipNullValue()) { - input.readRepeatedMessage(mazePropList); + input.readRepeatedMessage(mapList); bitField0_ |= 0x00000080; } } else { @@ -1035,11 +1035,11 @@ public GetSceneMapInfoScRsp mergeFrom(final JsonSource input) throws IOException } break; } - case 836484122: - case 178830753: { - if (input.isAtField(FieldNames.mapList)) { + case -317054274: + case 407435998: { + if (input.isAtField(FieldNames.mazeGroupList)) { if (!input.trySkipNullValue()) { - input.readRepeatedMessage(mapList); + input.readRepeatedMessage(mazeGroupList); bitField0_ |= 0x00000100; } } else { @@ -1100,23 +1100,23 @@ public GetSceneMapInfoScRsp create() { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName curMapEntryId = FieldName.forField("curMapEntryId", "cur_map_entry_id"); - static final FieldName retcode = FieldName.forField("retcode"); + static final FieldName curMapEntryId = FieldName.forField("curMapEntryId", "cur_map_entry_id"); + static final FieldName entryId = FieldName.forField("entryId", "entry_id"); static final FieldName lightenSectionList = FieldName.forField("lightenSectionList", "lighten_section_list"); static final FieldName unlockedTeleportList = FieldName.forField("unlockedTeleportList", "unlocked_teleport_list"); - static final FieldName unlockedChestList = FieldName.forField("unlockedChestList", "unlocked_chest_list"); - - static final FieldName mazeGroupList = FieldName.forField("mazeGroupList", "maze_group_list"); - static final FieldName mazePropList = FieldName.forField("mazePropList", "maze_prop_list"); + static final FieldName unlockedChestList = FieldName.forField("unlockedChestList", "unlocked_chest_list"); + static final FieldName mapList = FieldName.forField("mapList", "map_list"); + + static final FieldName mazeGroupList = FieldName.forField("mazeGroupList", "maze_group_list"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/GetShopListCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetShopListCsReqOuterClass.java index 31cc89ddf..ad0df6ebb 100644 --- a/src/generated/main/emu/lunarcore/proto/GetShopListCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetShopListCsReqOuterClass.java @@ -19,7 +19,7 @@ public static final class GetShopListCsReq extends ProtoMessageoptional uint32 shop_type = 1; + * optional uint32 shop_type = 10; */ private int shopType; @@ -34,7 +34,7 @@ public static GetShopListCsReq newInstance() { } /** - * optional uint32 shop_type = 1; + * optional uint32 shop_type = 10; * @return whether the shopType field is set */ public boolean hasShopType() { @@ -42,7 +42,7 @@ public boolean hasShopType() { } /** - * optional uint32 shop_type = 1; + * optional uint32 shop_type = 10; * @return this */ public GetShopListCsReq clearShopType() { @@ -52,7 +52,7 @@ public GetShopListCsReq clearShopType() { } /** - * optional uint32 shop_type = 1; + * optional uint32 shop_type = 10; * @return the shopType */ public int getShopType() { @@ -60,7 +60,7 @@ public int getShopType() { } /** - * optional uint32 shop_type = 1; + * optional uint32 shop_type = 10; * @param value the shopType to set * @return this */ @@ -129,7 +129,7 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(shopType); } } @@ -150,7 +150,7 @@ public GetShopListCsReq mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { + case 80: { // shopType shopType = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/GetShopListScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetShopListScRspOuterClass.java index 3eed9f8c6..ad5a9e397 100644 --- a/src/generated/main/emu/lunarcore/proto/GetShopListScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetShopListScRspOuterClass.java @@ -20,17 +20,17 @@ public static final class GetShopListScRsp extends ProtoMessageoptional uint32 retcode = 1; + * optional uint32 shop_type = 3; */ - private int retcode; + private int shopType; /** - * optional uint32 shop_type = 4; + * optional uint32 retcode = 13; */ - private int shopType; + private int retcode; /** - * repeated .Shop shop_list = 14; + * repeated .Shop shop_list = 8; */ private final RepeatedMessage shopList = RepeatedMessage.newEmptyInstance(ShopOuterClass.Shop.getFactory()); @@ -45,81 +45,81 @@ public static GetShopListScRsp newInstance() { } /** - * optional uint32 retcode = 1; - * @return whether the retcode field is set + * optional uint32 shop_type = 3; + * @return whether the shopType field is set */ - public boolean hasRetcode() { + public boolean hasShopType() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 retcode = 1; + * optional uint32 shop_type = 3; * @return this */ - public GetShopListScRsp clearRetcode() { + public GetShopListScRsp clearShopType() { bitField0_ &= ~0x00000001; - retcode = 0; + shopType = 0; return this; } /** - * optional uint32 retcode = 1; - * @return the retcode + * optional uint32 shop_type = 3; + * @return the shopType */ - public int getRetcode() { - return retcode; + public int getShopType() { + return shopType; } /** - * optional uint32 retcode = 1; - * @param value the retcode to set + * optional uint32 shop_type = 3; + * @param value the shopType to set * @return this */ - public GetShopListScRsp setRetcode(final int value) { + public GetShopListScRsp setShopType(final int value) { bitField0_ |= 0x00000001; - retcode = value; + shopType = value; return this; } /** - * optional uint32 shop_type = 4; - * @return whether the shopType field is set + * optional uint32 retcode = 13; + * @return whether the retcode field is set */ - public boolean hasShopType() { + public boolean hasRetcode() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 shop_type = 4; + * optional uint32 retcode = 13; * @return this */ - public GetShopListScRsp clearShopType() { + public GetShopListScRsp clearRetcode() { bitField0_ &= ~0x00000002; - shopType = 0; + retcode = 0; return this; } /** - * optional uint32 shop_type = 4; - * @return the shopType + * optional uint32 retcode = 13; + * @return the retcode */ - public int getShopType() { - return shopType; + public int getRetcode() { + return retcode; } /** - * optional uint32 shop_type = 4; - * @param value the shopType to set + * optional uint32 retcode = 13; + * @param value the retcode to set * @return this */ - public GetShopListScRsp setShopType(final int value) { + public GetShopListScRsp setRetcode(final int value) { bitField0_ |= 0x00000002; - shopType = value; + retcode = value; return this; } /** - * repeated .Shop shop_list = 14; + * repeated .Shop shop_list = 8; * @return whether the shopList field is set */ public boolean hasShopList() { @@ -127,7 +127,7 @@ public boolean hasShopList() { } /** - * repeated .Shop shop_list = 14; + * repeated .Shop shop_list = 8; * @return this */ public GetShopListScRsp clearShopList() { @@ -137,7 +137,7 @@ public GetShopListScRsp clearShopList() { } /** - * repeated .Shop shop_list = 14; + * repeated .Shop shop_list = 8; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -151,7 +151,7 @@ public RepeatedMessage getShopList() { } /** - * repeated .Shop shop_list = 14; + * repeated .Shop shop_list = 8; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -165,7 +165,7 @@ public RepeatedMessage getMutableShopList() { } /** - * repeated .Shop shop_list = 14; + * repeated .Shop shop_list = 8; * @param value the shopList to add * @return this */ @@ -176,7 +176,7 @@ public GetShopListScRsp addShopList(final ShopOuterClass.Shop value) { } /** - * repeated .Shop shop_list = 14; + * repeated .Shop shop_list = 8; * @param values the shopList to add * @return this */ @@ -191,8 +191,8 @@ public GetShopListScRsp copyFrom(final GetShopListScRsp other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - retcode = other.retcode; shopType = other.shopType; + retcode = other.retcode; shopList.copyFrom(other.shopList); } return this; @@ -204,12 +204,12 @@ public GetShopListScRsp mergeFrom(final GetShopListScRsp other) { return this; } cachedSize = -1; - if (other.hasRetcode()) { - setRetcode(other.retcode); - } if (other.hasShopType()) { setShopType(other.shopType); } + if (other.hasRetcode()) { + setRetcode(other.retcode); + } if (other.hasShopList()) { getMutableShopList().addAll(other.shopList); } @@ -223,8 +223,8 @@ public GetShopListScRsp clear() { } cachedSize = -1; bitField0_ = 0; - retcode = 0; shopType = 0; + retcode = 0; shopList.clear(); return this; } @@ -250,24 +250,24 @@ public boolean equals(Object o) { } GetShopListScRsp other = (GetShopListScRsp) o; return bitField0_ == other.bitField0_ - && (!hasRetcode() || retcode == other.retcode) && (!hasShopType() || shopType == other.shopType) + && (!hasRetcode() || retcode == other.retcode) && (!hasShopList() || shopList.equals(other.shopList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); - output.writeUInt32NoTag(retcode); + output.writeRawByte((byte) 24); + output.writeUInt32NoTag(shopType); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 32); - output.writeUInt32NoTag(shopType); + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < shopList.length(); i++) { - output.writeRawByte((byte) 114); + output.writeRawByte((byte) 66); output.writeMessageNoTag(shopList.get(i)); } } @@ -277,10 +277,10 @@ public void writeTo(final ProtoSink output) throws IOException { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(shopType); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(shopType); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { size += (1 * shopList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(shopList); @@ -295,25 +295,25 @@ public GetShopListScRsp mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { - // retcode - retcode = input.readUInt32(); + case 24: { + // shopType + shopType = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 32) { + if (tag != 104) { break; } } - case 32: { - // shopType - shopType = input.readUInt32(); + case 104: { + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 114) { + if (tag != 66) { break; } } - case 114: { + case 66: { // shopList tag = input.readRepeatedMessage(shopList, tag); bitField0_ |= 0x00000004; @@ -339,10 +339,10 @@ public GetShopListScRsp mergeFrom(final ProtoSource input) throws IOException { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.shopType, shopType); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.shopType, shopType); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000004) != 0) { output.writeRepeatedMessage(FieldNames.shopList, shopList); @@ -357,10 +357,11 @@ public GetShopListScRsp mergeFrom(final JsonSource input) throws IOException { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case -345279664: + case -2103716125: { + if (input.isAtField(FieldNames.shopType)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + shopType = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -368,11 +369,10 @@ public GetShopListScRsp mergeFrom(final JsonSource input) throws IOException { } break; } - case -345279664: - case -2103716125: { - if (input.isAtField(FieldNames.shopType)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - shopType = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -445,10 +445,10 @@ public GetShopListScRsp create() { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName shopType = FieldName.forField("shopType", "shop_type"); + static final FieldName retcode = FieldName.forField("retcode"); + static final FieldName shopList = FieldName.forField("shopList", "shop_list"); } } diff --git a/src/generated/main/emu/lunarcore/proto/GetUnlockTeleportCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetUnlockTeleportCsReqOuterClass.java index 4b50bbfe8..bfa494108 100644 --- a/src/generated/main/emu/lunarcore/proto/GetUnlockTeleportCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetUnlockTeleportCsReqOuterClass.java @@ -20,7 +20,7 @@ public static final class GetUnlockTeleportCsReq extends ProtoMessagerepeated uint32 entry_id_list = 6; + * repeated uint32 entry_id_list = 1; */ private final RepeatedInt entryIdList = RepeatedInt.newEmptyInstance(); @@ -35,7 +35,7 @@ public static GetUnlockTeleportCsReq newInstance() { } /** - * repeated uint32 entry_id_list = 6; + * repeated uint32 entry_id_list = 1; * @return whether the entryIdList field is set */ public boolean hasEntryIdList() { @@ -43,7 +43,7 @@ public boolean hasEntryIdList() { } /** - * repeated uint32 entry_id_list = 6; + * repeated uint32 entry_id_list = 1; * @return this */ public GetUnlockTeleportCsReq clearEntryIdList() { @@ -53,7 +53,7 @@ public GetUnlockTeleportCsReq clearEntryIdList() { } /** - * repeated uint32 entry_id_list = 6; + * repeated uint32 entry_id_list = 1; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -67,7 +67,7 @@ public RepeatedInt getEntryIdList() { } /** - * repeated uint32 entry_id_list = 6; + * repeated uint32 entry_id_list = 1; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -81,7 +81,7 @@ public RepeatedInt getMutableEntryIdList() { } /** - * repeated uint32 entry_id_list = 6; + * repeated uint32 entry_id_list = 1; * @param value the entryIdList to add * @return this */ @@ -92,7 +92,7 @@ public GetUnlockTeleportCsReq addEntryIdList(final int value) { } /** - * repeated uint32 entry_id_list = 6; + * repeated uint32 entry_id_list = 1; * @param values the entryIdList to add * @return this */ @@ -163,7 +163,7 @@ public boolean equals(Object o) { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { for (int i = 0; i < entryIdList.length(); i++) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(entryIdList.array()[i]); } } @@ -185,7 +185,7 @@ public GetUnlockTeleportCsReq mergeFrom(final ProtoSource input) throws IOExcept int tag = input.readTag(); while (true) { switch (tag) { - case 50: { + case 10: { // entryIdList [packed=true] input.readPackedUInt32(entryIdList, tag); bitField0_ |= 0x00000001; @@ -204,7 +204,7 @@ public GetUnlockTeleportCsReq mergeFrom(final ProtoSource input) throws IOExcept tag = input.readTag(); break; } - case 48: { + case 8: { // entryIdList [packed=false] tag = input.readRepeatedUInt32(entryIdList, tag); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/GetUnlockTeleportScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetUnlockTeleportScRspOuterClass.java index 2c5e09a0e..54e00f3e4 100644 --- a/src/generated/main/emu/lunarcore/proto/GetUnlockTeleportScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetUnlockTeleportScRspOuterClass.java @@ -20,12 +20,12 @@ public static final class GetUnlockTeleportScRsp extends ProtoMessageoptional uint32 retcode = 15; + * optional uint32 retcode = 6; */ private int retcode; /** - * repeated uint32 unlocked_teleport_list = 5; + * repeated uint32 unlocked_teleport_list = 3; */ private final RepeatedInt unlockedTeleportList = RepeatedInt.newEmptyInstance(); @@ -40,7 +40,7 @@ public static GetUnlockTeleportScRsp newInstance() { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 6; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -48,7 +48,7 @@ public boolean hasRetcode() { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 6; * @return this */ public GetUnlockTeleportScRsp clearRetcode() { @@ -58,7 +58,7 @@ public GetUnlockTeleportScRsp clearRetcode() { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 6; * @return the retcode */ public int getRetcode() { @@ -66,7 +66,7 @@ public int getRetcode() { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 6; * @param value the retcode to set * @return this */ @@ -77,7 +77,7 @@ public GetUnlockTeleportScRsp setRetcode(final int value) { } /** - * repeated uint32 unlocked_teleport_list = 5; + * repeated uint32 unlocked_teleport_list = 3; * @return whether the unlockedTeleportList field is set */ public boolean hasUnlockedTeleportList() { @@ -85,7 +85,7 @@ public boolean hasUnlockedTeleportList() { } /** - * repeated uint32 unlocked_teleport_list = 5; + * repeated uint32 unlocked_teleport_list = 3; * @return this */ public GetUnlockTeleportScRsp clearUnlockedTeleportList() { @@ -95,7 +95,7 @@ public GetUnlockTeleportScRsp clearUnlockedTeleportList() { } /** - * repeated uint32 unlocked_teleport_list = 5; + * repeated uint32 unlocked_teleport_list = 3; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -109,7 +109,7 @@ public RepeatedInt getUnlockedTeleportList() { } /** - * repeated uint32 unlocked_teleport_list = 5; + * repeated uint32 unlocked_teleport_list = 3; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -123,7 +123,7 @@ public RepeatedInt getMutableUnlockedTeleportList() { } /** - * repeated uint32 unlocked_teleport_list = 5; + * repeated uint32 unlocked_teleport_list = 3; * @param value the unlockedTeleportList to add * @return this */ @@ -134,7 +134,7 @@ public GetUnlockTeleportScRsp addUnlockedTeleportList(final int value) { } /** - * repeated uint32 unlocked_teleport_list = 5; + * repeated uint32 unlocked_teleport_list = 3; * @param values the unlockedTeleportList to add * @return this */ @@ -210,12 +210,12 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < unlockedTeleportList.length(); i++) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(unlockedTeleportList.array()[i]); } } @@ -240,16 +240,16 @@ public GetUnlockTeleportScRsp mergeFrom(final ProtoSource input) throws IOExcept int tag = input.readTag(); while (true) { switch (tag) { - case 120: { + case 48: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 42) { + if (tag != 26) { break; } } - case 42: { + case 26: { // unlockedTeleportList [packed=true] input.readPackedUInt32(unlockedTeleportList, tag); bitField0_ |= 0x00000002; @@ -268,7 +268,7 @@ public GetUnlockTeleportScRsp mergeFrom(final ProtoSource input) throws IOExcept tag = input.readTag(); break; } - case 40: { + case 24: { // unlockedTeleportList [packed=false] tag = input.readRepeatedUInt32(unlockedTeleportList, tag); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/GoodsOuterClass.java b/src/generated/main/emu/lunarcore/proto/GoodsOuterClass.java index 05e67a171..2fa1970e4 100644 --- a/src/generated/main/emu/lunarcore/proto/GoodsOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GoodsOuterClass.java @@ -19,29 +19,29 @@ public static final class Goods extends ProtoMessage implements Cloneable private static final long serialVersionUID = 0L; /** - * optional int64 end_time = 5; + * optional int64 begin_time = 3; */ - private long endTime; + private long beginTime; /** - * optional int64 begin_time = 12; + * optional int64 end_time = 13; */ - private long beginTime; + private long endTime; /** - * optional uint32 buy_times = 1; + * optional uint32 goods_id = 4; */ - private int buyTimes; + private int goodsId; /** - * optional uint32 item_id = 2; + * optional uint32 buy_times = 8; */ - private int itemId; + private int buyTimes; /** - * optional uint32 goods_id = 9; + * optional uint32 item_id = 14; */ - private int goodsId; + private int itemId; private Goods() { } @@ -54,187 +54,187 @@ public static Goods newInstance() { } /** - * optional int64 end_time = 5; - * @return whether the endTime field is set + * optional int64 begin_time = 3; + * @return whether the beginTime field is set */ - public boolean hasEndTime() { + public boolean hasBeginTime() { return (bitField0_ & 0x00000001) != 0; } /** - * optional int64 end_time = 5; + * optional int64 begin_time = 3; * @return this */ - public Goods clearEndTime() { + public Goods clearBeginTime() { bitField0_ &= ~0x00000001; - endTime = 0L; + beginTime = 0L; return this; } /** - * optional int64 end_time = 5; - * @return the endTime + * optional int64 begin_time = 3; + * @return the beginTime */ - public long getEndTime() { - return endTime; + public long getBeginTime() { + return beginTime; } /** - * optional int64 end_time = 5; - * @param value the endTime to set + * optional int64 begin_time = 3; + * @param value the beginTime to set * @return this */ - public Goods setEndTime(final long value) { + public Goods setBeginTime(final long value) { bitField0_ |= 0x00000001; - endTime = value; + beginTime = value; return this; } /** - * optional int64 begin_time = 12; - * @return whether the beginTime field is set + * optional int64 end_time = 13; + * @return whether the endTime field is set */ - public boolean hasBeginTime() { + public boolean hasEndTime() { return (bitField0_ & 0x00000002) != 0; } /** - * optional int64 begin_time = 12; + * optional int64 end_time = 13; * @return this */ - public Goods clearBeginTime() { + public Goods clearEndTime() { bitField0_ &= ~0x00000002; - beginTime = 0L; + endTime = 0L; return this; } /** - * optional int64 begin_time = 12; - * @return the beginTime + * optional int64 end_time = 13; + * @return the endTime */ - public long getBeginTime() { - return beginTime; + public long getEndTime() { + return endTime; } /** - * optional int64 begin_time = 12; - * @param value the beginTime to set + * optional int64 end_time = 13; + * @param value the endTime to set * @return this */ - public Goods setBeginTime(final long value) { + public Goods setEndTime(final long value) { bitField0_ |= 0x00000002; - beginTime = value; + endTime = value; return this; } /** - * optional uint32 buy_times = 1; - * @return whether the buyTimes field is set + * optional uint32 goods_id = 4; + * @return whether the goodsId field is set */ - public boolean hasBuyTimes() { + public boolean hasGoodsId() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 buy_times = 1; + * optional uint32 goods_id = 4; * @return this */ - public Goods clearBuyTimes() { + public Goods clearGoodsId() { bitField0_ &= ~0x00000004; - buyTimes = 0; + goodsId = 0; return this; } /** - * optional uint32 buy_times = 1; - * @return the buyTimes + * optional uint32 goods_id = 4; + * @return the goodsId */ - public int getBuyTimes() { - return buyTimes; + public int getGoodsId() { + return goodsId; } /** - * optional uint32 buy_times = 1; - * @param value the buyTimes to set + * optional uint32 goods_id = 4; + * @param value the goodsId to set * @return this */ - public Goods setBuyTimes(final int value) { + public Goods setGoodsId(final int value) { bitField0_ |= 0x00000004; - buyTimes = value; + goodsId = value; return this; } /** - * optional uint32 item_id = 2; - * @return whether the itemId field is set + * optional uint32 buy_times = 8; + * @return whether the buyTimes field is set */ - public boolean hasItemId() { + public boolean hasBuyTimes() { return (bitField0_ & 0x00000008) != 0; } /** - * optional uint32 item_id = 2; + * optional uint32 buy_times = 8; * @return this */ - public Goods clearItemId() { + public Goods clearBuyTimes() { bitField0_ &= ~0x00000008; - itemId = 0; + buyTimes = 0; return this; } /** - * optional uint32 item_id = 2; - * @return the itemId + * optional uint32 buy_times = 8; + * @return the buyTimes */ - public int getItemId() { - return itemId; + public int getBuyTimes() { + return buyTimes; } /** - * optional uint32 item_id = 2; - * @param value the itemId to set + * optional uint32 buy_times = 8; + * @param value the buyTimes to set * @return this */ - public Goods setItemId(final int value) { + public Goods setBuyTimes(final int value) { bitField0_ |= 0x00000008; - itemId = value; + buyTimes = value; return this; } /** - * optional uint32 goods_id = 9; - * @return whether the goodsId field is set + * optional uint32 item_id = 14; + * @return whether the itemId field is set */ - public boolean hasGoodsId() { + public boolean hasItemId() { return (bitField0_ & 0x00000010) != 0; } /** - * optional uint32 goods_id = 9; + * optional uint32 item_id = 14; * @return this */ - public Goods clearGoodsId() { + public Goods clearItemId() { bitField0_ &= ~0x00000010; - goodsId = 0; + itemId = 0; return this; } /** - * optional uint32 goods_id = 9; - * @return the goodsId + * optional uint32 item_id = 14; + * @return the itemId */ - public int getGoodsId() { - return goodsId; + public int getItemId() { + return itemId; } /** - * optional uint32 goods_id = 9; - * @param value the goodsId to set + * optional uint32 item_id = 14; + * @param value the itemId to set * @return this */ - public Goods setGoodsId(final int value) { + public Goods setItemId(final int value) { bitField0_ |= 0x00000010; - goodsId = value; + itemId = value; return this; } @@ -243,11 +243,11 @@ public Goods copyFrom(final Goods other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - endTime = other.endTime; beginTime = other.beginTime; + endTime = other.endTime; + goodsId = other.goodsId; buyTimes = other.buyTimes; itemId = other.itemId; - goodsId = other.goodsId; } return this; } @@ -258,11 +258,14 @@ public Goods mergeFrom(final Goods other) { return this; } cachedSize = -1; + if (other.hasBeginTime()) { + setBeginTime(other.beginTime); + } if (other.hasEndTime()) { setEndTime(other.endTime); } - if (other.hasBeginTime()) { - setBeginTime(other.beginTime); + if (other.hasGoodsId()) { + setGoodsId(other.goodsId); } if (other.hasBuyTimes()) { setBuyTimes(other.buyTimes); @@ -270,9 +273,6 @@ public Goods mergeFrom(final Goods other) { if (other.hasItemId()) { setItemId(other.itemId); } - if (other.hasGoodsId()) { - setGoodsId(other.goodsId); - } return this; } @@ -283,11 +283,11 @@ public Goods clear() { } cachedSize = -1; bitField0_ = 0; - endTime = 0L; beginTime = 0L; + endTime = 0L; + goodsId = 0; buyTimes = 0; itemId = 0; - goodsId = 0; return this; } @@ -311,34 +311,34 @@ public boolean equals(Object o) { } Goods other = (Goods) o; return bitField0_ == other.bitField0_ - && (!hasEndTime() || endTime == other.endTime) && (!hasBeginTime() || beginTime == other.beginTime) + && (!hasEndTime() || endTime == other.endTime) + && (!hasGoodsId() || goodsId == other.goodsId) && (!hasBuyTimes() || buyTimes == other.buyTimes) - && (!hasItemId() || itemId == other.itemId) - && (!hasGoodsId() || goodsId == other.goodsId); + && (!hasItemId() || itemId == other.itemId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 40); - output.writeInt64NoTag(endTime); + output.writeRawByte((byte) 24); + output.writeInt64NoTag(beginTime); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 96); - output.writeInt64NoTag(beginTime); + output.writeRawByte((byte) 104); + output.writeInt64NoTag(endTime); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 8); - output.writeUInt32NoTag(buyTimes); + output.writeRawByte((byte) 32); + output.writeUInt32NoTag(goodsId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 16); - output.writeUInt32NoTag(itemId); + output.writeRawByte((byte) 64); + output.writeUInt32NoTag(buyTimes); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 72); - output.writeUInt32NoTag(goodsId); + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(itemId); } } @@ -346,19 +346,19 @@ public void writeTo(final ProtoSink output) throws IOException { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeInt64SizeNoTag(endTime); + size += 1 + ProtoSink.computeInt64SizeNoTag(beginTime); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeInt64SizeNoTag(beginTime); + size += 1 + ProtoSink.computeInt64SizeNoTag(endTime); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(buyTimes); + size += 1 + ProtoSink.computeUInt32SizeNoTag(goodsId); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(itemId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(buyTimes); } if ((bitField0_ & 0x00000010) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(goodsId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(itemId); } return size; } @@ -370,45 +370,45 @@ public Goods mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { - // endTime - endTime = input.readInt64(); + case 24: { + // beginTime + beginTime = input.readInt64(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 96) { + if (tag != 104) { break; } } - case 96: { - // beginTime - beginTime = input.readInt64(); + case 104: { + // endTime + endTime = input.readInt64(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 8) { + if (tag != 32) { break; } } - case 8: { - // buyTimes - buyTimes = input.readUInt32(); + case 32: { + // goodsId + goodsId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 16) { + if (tag != 64) { break; } } - case 16: { - // itemId - itemId = input.readUInt32(); + case 64: { + // buyTimes + buyTimes = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 72) { + if (tag != 112) { break; } } - case 72: { - // goodsId - goodsId = input.readUInt32(); + case 112: { + // itemId + itemId = input.readUInt32(); bitField0_ |= 0x00000010; tag = input.readTag(); if (tag != 0) { @@ -433,19 +433,19 @@ public Goods mergeFrom(final ProtoSource input) throws IOException { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeInt64(FieldNames.endTime, endTime); + output.writeInt64(FieldNames.beginTime, beginTime); } if ((bitField0_ & 0x00000002) != 0) { - output.writeInt64(FieldNames.beginTime, beginTime); + output.writeInt64(FieldNames.endTime, endTime); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.buyTimes, buyTimes); + output.writeUInt32(FieldNames.goodsId, goodsId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.itemId, itemId); + output.writeUInt32(FieldNames.buyTimes, buyTimes); } if ((bitField0_ & 0x00000010) != 0) { - output.writeUInt32(FieldNames.goodsId, goodsId); + output.writeUInt32(FieldNames.itemId, itemId); } output.endObject(); } @@ -457,24 +457,36 @@ public Goods mergeFrom(final JsonSource input) throws IOException { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { + case -1072839914: + case 1112183971: { + if (input.isAtField(FieldNames.beginTime)) { + if (!input.trySkipNullValue()) { + beginTime = input.readInt64(); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } case -1607243192: case 1725551537: { if (input.isAtField(FieldNames.endTime)) { if (!input.trySkipNullValue()) { endTime = input.readInt64(); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; } } else { input.skipUnknownField(); } break; } - case -1072839914: - case 1112183971: { - if (input.isAtField(FieldNames.beginTime)) { + case 207037201: + case 2123207332: { + if (input.isAtField(FieldNames.goodsId)) { if (!input.trySkipNullValue()) { - beginTime = input.readInt64(); - bitField0_ |= 0x00000002; + goodsId = input.readUInt32(); + bitField0_ |= 0x00000004; } } else { input.skipUnknownField(); @@ -486,7 +498,7 @@ public Goods mergeFrom(final JsonSource input) throws IOException { if (input.isAtField(FieldNames.buyTimes)) { if (!input.trySkipNullValue()) { buyTimes = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; } } else { input.skipUnknownField(); @@ -498,18 +510,6 @@ public Goods mergeFrom(final JsonSource input) throws IOException { if (input.isAtField(FieldNames.itemId)) { if (!input.trySkipNullValue()) { itemId = input.readUInt32(); - bitField0_ |= 0x00000008; - } - } else { - input.skipUnknownField(); - } - break; - } - case 207037201: - case 2123207332: { - if (input.isAtField(FieldNames.goodsId)) { - if (!input.trySkipNullValue()) { - goodsId = input.readUInt32(); bitField0_ |= 0x00000010; } } else { @@ -569,15 +569,15 @@ public Goods create() { * Contains name constants used for serializing JSON */ static class FieldNames { + static final FieldName beginTime = FieldName.forField("beginTime", "begin_time"); + static final FieldName endTime = FieldName.forField("endTime", "end_time"); - static final FieldName beginTime = FieldName.forField("beginTime", "begin_time"); + static final FieldName goodsId = FieldName.forField("goodsId", "goods_id"); static final FieldName buyTimes = FieldName.forField("buyTimes", "buy_times"); static final FieldName itemId = FieldName.forField("itemId", "item_id"); - - static final FieldName goodsId = FieldName.forField("goodsId", "goods_id"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/GroupStateChangeCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/GroupStateChangeCsReqOuterClass.java index dba35092e..152f82303 100644 --- a/src/generated/main/emu/lunarcore/proto/GroupStateChangeCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GroupStateChangeCsReqOuterClass.java @@ -19,7 +19,7 @@ public static final class GroupStateChangeCsReq extends ProtoMessageoptional .GroupStateInfo group_state_info = 6; + * optional .GroupStateInfo group_state_info = 8; */ private final GroupStateInfoOuterClass.GroupStateInfo groupStateInfo = GroupStateInfoOuterClass.GroupStateInfo.newInstance(); @@ -34,7 +34,7 @@ public static GroupStateChangeCsReq newInstance() { } /** - * optional .GroupStateInfo group_state_info = 6; + * optional .GroupStateInfo group_state_info = 8; * @return whether the groupStateInfo field is set */ public boolean hasGroupStateInfo() { @@ -42,7 +42,7 @@ public boolean hasGroupStateInfo() { } /** - * optional .GroupStateInfo group_state_info = 6; + * optional .GroupStateInfo group_state_info = 8; * @return this */ public GroupStateChangeCsReq clearGroupStateInfo() { @@ -52,7 +52,7 @@ public GroupStateChangeCsReq clearGroupStateInfo() { } /** - * optional .GroupStateInfo group_state_info = 6; + * optional .GroupStateInfo group_state_info = 8; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -66,7 +66,7 @@ public GroupStateInfoOuterClass.GroupStateInfo getGroupStateInfo() { } /** - * optional .GroupStateInfo group_state_info = 6; + * optional .GroupStateInfo group_state_info = 8; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -80,7 +80,7 @@ public GroupStateInfoOuterClass.GroupStateInfo getMutableGroupStateInfo() { } /** - * optional .GroupStateInfo group_state_info = 6; + * optional .GroupStateInfo group_state_info = 8; * @param value the groupStateInfo to set * @return this */ @@ -151,7 +151,7 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 50); + output.writeRawByte((byte) 66); output.writeMessageNoTag(groupStateInfo); } } @@ -172,7 +172,7 @@ public GroupStateChangeCsReq mergeFrom(final ProtoSource input) throws IOExcepti int tag = input.readTag(); while (true) { switch (tag) { - case 50: { + case 66: { // groupStateInfo input.readMessage(groupStateInfo); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/GroupStateChangeScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/GroupStateChangeScNotifyOuterClass.java index bdd29e77e..4fd2d708c 100644 --- a/src/generated/main/emu/lunarcore/proto/GroupStateChangeScNotifyOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GroupStateChangeScNotifyOuterClass.java @@ -19,7 +19,7 @@ public static final class GroupStateChangeScNotify extends ProtoMessageoptional .GroupStateInfo group_state_info = 8; + * optional .GroupStateInfo group_state_info = 6; */ private final GroupStateInfoOuterClass.GroupStateInfo groupStateInfo = GroupStateInfoOuterClass.GroupStateInfo.newInstance(); @@ -34,7 +34,7 @@ public static GroupStateChangeScNotify newInstance() { } /** - * optional .GroupStateInfo group_state_info = 8; + * optional .GroupStateInfo group_state_info = 6; * @return whether the groupStateInfo field is set */ public boolean hasGroupStateInfo() { @@ -42,7 +42,7 @@ public boolean hasGroupStateInfo() { } /** - * optional .GroupStateInfo group_state_info = 8; + * optional .GroupStateInfo group_state_info = 6; * @return this */ public GroupStateChangeScNotify clearGroupStateInfo() { @@ -52,7 +52,7 @@ public GroupStateChangeScNotify clearGroupStateInfo() { } /** - * optional .GroupStateInfo group_state_info = 8; + * optional .GroupStateInfo group_state_info = 6; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -66,7 +66,7 @@ public GroupStateInfoOuterClass.GroupStateInfo getGroupStateInfo() { } /** - * optional .GroupStateInfo group_state_info = 8; + * optional .GroupStateInfo group_state_info = 6; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -80,7 +80,7 @@ public GroupStateInfoOuterClass.GroupStateInfo getMutableGroupStateInfo() { } /** - * optional .GroupStateInfo group_state_info = 8; + * optional .GroupStateInfo group_state_info = 6; * @param value the groupStateInfo to set * @return this */ @@ -151,7 +151,7 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 66); + output.writeRawByte((byte) 50); output.writeMessageNoTag(groupStateInfo); } } @@ -172,7 +172,7 @@ public GroupStateChangeScNotify mergeFrom(final ProtoSource input) throws IOExce int tag = input.readTag(); while (true) { switch (tag) { - case 66: { + case 50: { // groupStateInfo input.readMessage(groupStateInfo); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/GroupStateChangeScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GroupStateChangeScRspOuterClass.java index d6be4f149..90613262e 100644 --- a/src/generated/main/emu/lunarcore/proto/GroupStateChangeScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GroupStateChangeScRspOuterClass.java @@ -19,7 +19,7 @@ public static final class GroupStateChangeScRsp extends ProtoMessageoptional uint32 retcode = 4; + * optional uint32 retcode = 10; */ private int retcode; @@ -39,7 +39,7 @@ public static GroupStateChangeScRsp newInstance() { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 10; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public boolean hasRetcode() { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 10; * @return this */ public GroupStateChangeScRsp clearRetcode() { @@ -57,7 +57,7 @@ public GroupStateChangeScRsp clearRetcode() { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 10; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public int getRetcode() { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 10; * @param value the retcode to set * @return this */ @@ -199,7 +199,7 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { @@ -227,7 +227,7 @@ public GroupStateChangeScRsp mergeFrom(final ProtoSource input) throws IOExcepti int tag = input.readTag(); while (true) { switch (tag) { - case 32: { + case 80: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/GroupStateInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/GroupStateInfoOuterClass.java index 209a57b1b..7de7788bc 100644 --- a/src/generated/main/emu/lunarcore/proto/GroupStateInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GroupStateInfoOuterClass.java @@ -19,22 +19,22 @@ public static final class GroupStateInfo extends ProtoMessage im private static final long serialVersionUID = 0L; /** - * optional uint32 FIKOEFBNMHB = 4; + * optional uint32 group_id = 1; */ - private int fIKOEFBNMHB; + private int groupId; /** - * optional uint32 entry_id = 5; + * optional uint32 entry_id = 3; */ private int entryId; /** - * optional uint32 group_id = 9; + * optional uint32 IJMFKKGOPJF = 8; */ - private int groupId; + private int iJMFKKGOPJF; /** - * optional uint32 group_state = 15; + * optional uint32 group_state = 14; */ private int groupState; @@ -49,44 +49,44 @@ public static GroupStateInfo newInstance() { } /** - * optional uint32 FIKOEFBNMHB = 4; - * @return whether the fIKOEFBNMHB field is set + * optional uint32 group_id = 1; + * @return whether the groupId field is set */ - public boolean hasFIKOEFBNMHB() { + public boolean hasGroupId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 FIKOEFBNMHB = 4; + * optional uint32 group_id = 1; * @return this */ - public GroupStateInfo clearFIKOEFBNMHB() { + public GroupStateInfo clearGroupId() { bitField0_ &= ~0x00000001; - fIKOEFBNMHB = 0; + groupId = 0; return this; } /** - * optional uint32 FIKOEFBNMHB = 4; - * @return the fIKOEFBNMHB + * optional uint32 group_id = 1; + * @return the groupId */ - public int getFIKOEFBNMHB() { - return fIKOEFBNMHB; + public int getGroupId() { + return groupId; } /** - * optional uint32 FIKOEFBNMHB = 4; - * @param value the fIKOEFBNMHB to set + * optional uint32 group_id = 1; + * @param value the groupId to set * @return this */ - public GroupStateInfo setFIKOEFBNMHB(final int value) { + public GroupStateInfo setGroupId(final int value) { bitField0_ |= 0x00000001; - fIKOEFBNMHB = value; + groupId = value; return this; } /** - * optional uint32 entry_id = 5; + * optional uint32 entry_id = 3; * @return whether the entryId field is set */ public boolean hasEntryId() { @@ -94,7 +94,7 @@ public boolean hasEntryId() { } /** - * optional uint32 entry_id = 5; + * optional uint32 entry_id = 3; * @return this */ public GroupStateInfo clearEntryId() { @@ -104,7 +104,7 @@ public GroupStateInfo clearEntryId() { } /** - * optional uint32 entry_id = 5; + * optional uint32 entry_id = 3; * @return the entryId */ public int getEntryId() { @@ -112,7 +112,7 @@ public int getEntryId() { } /** - * optional uint32 entry_id = 5; + * optional uint32 entry_id = 3; * @param value the entryId to set * @return this */ @@ -123,44 +123,44 @@ public GroupStateInfo setEntryId(final int value) { } /** - * optional uint32 group_id = 9; - * @return whether the groupId field is set + * optional uint32 IJMFKKGOPJF = 8; + * @return whether the iJMFKKGOPJF field is set */ - public boolean hasGroupId() { + public boolean hasIJMFKKGOPJF() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 group_id = 9; + * optional uint32 IJMFKKGOPJF = 8; * @return this */ - public GroupStateInfo clearGroupId() { + public GroupStateInfo clearIJMFKKGOPJF() { bitField0_ &= ~0x00000004; - groupId = 0; + iJMFKKGOPJF = 0; return this; } /** - * optional uint32 group_id = 9; - * @return the groupId + * optional uint32 IJMFKKGOPJF = 8; + * @return the iJMFKKGOPJF */ - public int getGroupId() { - return groupId; + public int getIJMFKKGOPJF() { + return iJMFKKGOPJF; } /** - * optional uint32 group_id = 9; - * @param value the groupId to set + * optional uint32 IJMFKKGOPJF = 8; + * @param value the iJMFKKGOPJF to set * @return this */ - public GroupStateInfo setGroupId(final int value) { + public GroupStateInfo setIJMFKKGOPJF(final int value) { bitField0_ |= 0x00000004; - groupId = value; + iJMFKKGOPJF = value; return this; } /** - * optional uint32 group_state = 15; + * optional uint32 group_state = 14; * @return whether the groupState field is set */ public boolean hasGroupState() { @@ -168,7 +168,7 @@ public boolean hasGroupState() { } /** - * optional uint32 group_state = 15; + * optional uint32 group_state = 14; * @return this */ public GroupStateInfo clearGroupState() { @@ -178,7 +178,7 @@ public GroupStateInfo clearGroupState() { } /** - * optional uint32 group_state = 15; + * optional uint32 group_state = 14; * @return the groupState */ public int getGroupState() { @@ -186,7 +186,7 @@ public int getGroupState() { } /** - * optional uint32 group_state = 15; + * optional uint32 group_state = 14; * @param value the groupState to set * @return this */ @@ -201,9 +201,9 @@ public GroupStateInfo copyFrom(final GroupStateInfo other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - fIKOEFBNMHB = other.fIKOEFBNMHB; - entryId = other.entryId; groupId = other.groupId; + entryId = other.entryId; + iJMFKKGOPJF = other.iJMFKKGOPJF; groupState = other.groupState; } return this; @@ -215,14 +215,14 @@ public GroupStateInfo mergeFrom(final GroupStateInfo other) { return this; } cachedSize = -1; - if (other.hasFIKOEFBNMHB()) { - setFIKOEFBNMHB(other.fIKOEFBNMHB); + if (other.hasGroupId()) { + setGroupId(other.groupId); } if (other.hasEntryId()) { setEntryId(other.entryId); } - if (other.hasGroupId()) { - setGroupId(other.groupId); + if (other.hasIJMFKKGOPJF()) { + setIJMFKKGOPJF(other.iJMFKKGOPJF); } if (other.hasGroupState()) { setGroupState(other.groupState); @@ -237,9 +237,9 @@ public GroupStateInfo clear() { } cachedSize = -1; bitField0_ = 0; - fIKOEFBNMHB = 0; - entryId = 0; groupId = 0; + entryId = 0; + iJMFKKGOPJF = 0; groupState = 0; return this; } @@ -264,28 +264,28 @@ public boolean equals(Object o) { } GroupStateInfo other = (GroupStateInfo) o; return bitField0_ == other.bitField0_ - && (!hasFIKOEFBNMHB() || fIKOEFBNMHB == other.fIKOEFBNMHB) - && (!hasEntryId() || entryId == other.entryId) && (!hasGroupId() || groupId == other.groupId) + && (!hasEntryId() || entryId == other.entryId) + && (!hasIJMFKKGOPJF() || iJMFKKGOPJF == other.iJMFKKGOPJF) && (!hasGroupState() || groupState == other.groupState); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); - output.writeUInt32NoTag(fIKOEFBNMHB); + output.writeRawByte((byte) 8); + output.writeUInt32NoTag(groupId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(entryId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 72); - output.writeUInt32NoTag(groupId); + output.writeRawByte((byte) 64); + output.writeUInt32NoTag(iJMFKKGOPJF); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(groupState); } } @@ -294,13 +294,13 @@ public void writeTo(final ProtoSink output) throws IOException { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(fIKOEFBNMHB); + size += 1 + ProtoSink.computeUInt32SizeNoTag(groupId); } if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(entryId); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(groupId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(iJMFKKGOPJF); } if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(groupState); @@ -315,34 +315,34 @@ public GroupStateInfo mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { - // fIKOEFBNMHB - fIKOEFBNMHB = input.readUInt32(); + case 8: { + // groupId + groupId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 40) { + if (tag != 24) { break; } } - case 40: { + case 24: { // entryId entryId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 72) { + if (tag != 64) { break; } } - case 72: { - // groupId - groupId = input.readUInt32(); + case 64: { + // iJMFKKGOPJF + iJMFKKGOPJF = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 120) { + if (tag != 112) { break; } } - case 120: { + case 112: { // groupState groupState = input.readUInt32(); bitField0_ |= 0x00000008; @@ -369,13 +369,13 @@ public GroupStateInfo mergeFrom(final ProtoSource input) throws IOException { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.fIKOEFBNMHB, fIKOEFBNMHB); + output.writeUInt32(FieldNames.groupId, groupId); } if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.entryId, entryId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.groupId, groupId); + output.writeUInt32(FieldNames.iJMFKKGOPJF, iJMFKKGOPJF); } if ((bitField0_ & 0x00000008) != 0) { output.writeUInt32(FieldNames.groupState, groupState); @@ -390,10 +390,11 @@ public GroupStateInfo mergeFrom(final JsonSource input) throws IOException { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1689558285: { - if (input.isAtField(FieldNames.fIKOEFBNMHB)) { + case 293428218: + case 506361563: { + if (input.isAtField(FieldNames.groupId)) { if (!input.trySkipNullValue()) { - fIKOEFBNMHB = input.readUInt32(); + groupId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -413,11 +414,10 @@ public GroupStateInfo mergeFrom(final JsonSource input) throws IOException { } break; } - case 293428218: - case 506361563: { - if (input.isAtField(FieldNames.groupId)) { + case 370526858: { + if (input.isAtField(FieldNames.iJMFKKGOPJF)) { if (!input.trySkipNullValue()) { - groupId = input.readUInt32(); + iJMFKKGOPJF = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -490,11 +490,11 @@ public GroupStateInfo create() { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName fIKOEFBNMHB = FieldName.forField("FIKOEFBNMHB"); + static final FieldName groupId = FieldName.forField("groupId", "group_id"); static final FieldName entryId = FieldName.forField("entryId", "entry_id"); - static final FieldName groupId = FieldName.forField("groupId", "group_id"); + static final FieldName iJMFKKGOPJF = FieldName.forField("IJMFKKGOPJF"); static final FieldName groupState = FieldName.forField("groupState", "group_state"); } diff --git a/src/generated/main/emu/lunarcore/proto/HandleFriendCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/HandleFriendCsReqOuterClass.java index 1fda94dfb..c3e3ba9a1 100644 --- a/src/generated/main/emu/lunarcore/proto/HandleFriendCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/HandleFriendCsReqOuterClass.java @@ -19,12 +19,12 @@ public static final class HandleFriendCsReq extends ProtoMessageoptional uint32 uid = 7; + * optional uint32 uid = 2; */ private int uid; /** - * optional bool handle_result = 13; + * optional bool handle_result = 12; */ private boolean handleResult; @@ -39,7 +39,7 @@ public static HandleFriendCsReq newInstance() { } /** - * optional uint32 uid = 7; + * optional uint32 uid = 2; * @return whether the uid field is set */ public boolean hasUid() { @@ -47,7 +47,7 @@ public boolean hasUid() { } /** - * optional uint32 uid = 7; + * optional uint32 uid = 2; * @return this */ public HandleFriendCsReq clearUid() { @@ -57,7 +57,7 @@ public HandleFriendCsReq clearUid() { } /** - * optional uint32 uid = 7; + * optional uint32 uid = 2; * @return the uid */ public int getUid() { @@ -65,7 +65,7 @@ public int getUid() { } /** - * optional uint32 uid = 7; + * optional uint32 uid = 2; * @param value the uid to set * @return this */ @@ -76,7 +76,7 @@ public HandleFriendCsReq setUid(final int value) { } /** - * optional bool handle_result = 13; + * optional bool handle_result = 12; * @return whether the handleResult field is set */ public boolean hasHandleResult() { @@ -84,7 +84,7 @@ public boolean hasHandleResult() { } /** - * optional bool handle_result = 13; + * optional bool handle_result = 12; * @return this */ public HandleFriendCsReq clearHandleResult() { @@ -94,7 +94,7 @@ public HandleFriendCsReq clearHandleResult() { } /** - * optional bool handle_result = 13; + * optional bool handle_result = 12; * @return the handleResult */ public boolean getHandleResult() { @@ -102,7 +102,7 @@ public boolean getHandleResult() { } /** - * optional bool handle_result = 13; + * optional bool handle_result = 12; * @param value the handleResult to set * @return this */ @@ -177,11 +177,11 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(uid); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 96); output.writeBoolNoTag(handleResult); } } @@ -205,16 +205,16 @@ public HandleFriendCsReq mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { + case 16: { // uid uid = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 104) { + if (tag != 96) { break; } } - case 104: { + case 96: { // handleResult handleResult = input.readBool(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/HandleFriendScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/HandleFriendScRspOuterClass.java index d6fddcf9a..d972f5d52 100644 --- a/src/generated/main/emu/lunarcore/proto/HandleFriendScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/HandleFriendScRspOuterClass.java @@ -19,22 +19,22 @@ public static final class HandleFriendScRsp extends ProtoMessageoptional uint32 retcode = 5; + * optional uint32 uid = 6; */ - private int retcode; + private int uid; /** - * optional uint32 uid = 10; + * optional uint32 retcode = 15; */ - private int uid; + private int retcode; /** - * optional bool handle_result = 8; + * optional bool handle_result = 5; */ private boolean handleResult; /** - * optional .FriendListInfo handle_friend_info = 12; + * optional .FriendListInfo handle_friend_info = 3; */ private final FriendListInfoOuterClass.FriendListInfo handleFriendInfo = FriendListInfoOuterClass.FriendListInfo.newInstance(); @@ -49,81 +49,81 @@ public static HandleFriendScRsp newInstance() { } /** - * optional uint32 retcode = 5; - * @return whether the retcode field is set + * optional uint32 uid = 6; + * @return whether the uid field is set */ - public boolean hasRetcode() { + public boolean hasUid() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 retcode = 5; + * optional uint32 uid = 6; * @return this */ - public HandleFriendScRsp clearRetcode() { + public HandleFriendScRsp clearUid() { bitField0_ &= ~0x00000001; - retcode = 0; + uid = 0; return this; } /** - * optional uint32 retcode = 5; - * @return the retcode + * optional uint32 uid = 6; + * @return the uid */ - public int getRetcode() { - return retcode; + public int getUid() { + return uid; } /** - * optional uint32 retcode = 5; - * @param value the retcode to set + * optional uint32 uid = 6; + * @param value the uid to set * @return this */ - public HandleFriendScRsp setRetcode(final int value) { + public HandleFriendScRsp setUid(final int value) { bitField0_ |= 0x00000001; - retcode = value; + uid = value; return this; } /** - * optional uint32 uid = 10; - * @return whether the uid field is set + * optional uint32 retcode = 15; + * @return whether the retcode field is set */ - public boolean hasUid() { + public boolean hasRetcode() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 uid = 10; + * optional uint32 retcode = 15; * @return this */ - public HandleFriendScRsp clearUid() { + public HandleFriendScRsp clearRetcode() { bitField0_ &= ~0x00000002; - uid = 0; + retcode = 0; return this; } /** - * optional uint32 uid = 10; - * @return the uid + * optional uint32 retcode = 15; + * @return the retcode */ - public int getUid() { - return uid; + public int getRetcode() { + return retcode; } /** - * optional uint32 uid = 10; - * @param value the uid to set + * optional uint32 retcode = 15; + * @param value the retcode to set * @return this */ - public HandleFriendScRsp setUid(final int value) { + public HandleFriendScRsp setRetcode(final int value) { bitField0_ |= 0x00000002; - uid = value; + retcode = value; return this; } /** - * optional bool handle_result = 8; + * optional bool handle_result = 5; * @return whether the handleResult field is set */ public boolean hasHandleResult() { @@ -131,7 +131,7 @@ public boolean hasHandleResult() { } /** - * optional bool handle_result = 8; + * optional bool handle_result = 5; * @return this */ public HandleFriendScRsp clearHandleResult() { @@ -141,7 +141,7 @@ public HandleFriendScRsp clearHandleResult() { } /** - * optional bool handle_result = 8; + * optional bool handle_result = 5; * @return the handleResult */ public boolean getHandleResult() { @@ -149,7 +149,7 @@ public boolean getHandleResult() { } /** - * optional bool handle_result = 8; + * optional bool handle_result = 5; * @param value the handleResult to set * @return this */ @@ -160,7 +160,7 @@ public HandleFriendScRsp setHandleResult(final boolean value) { } /** - * optional .FriendListInfo handle_friend_info = 12; + * optional .FriendListInfo handle_friend_info = 3; * @return whether the handleFriendInfo field is set */ public boolean hasHandleFriendInfo() { @@ -168,7 +168,7 @@ public boolean hasHandleFriendInfo() { } /** - * optional .FriendListInfo handle_friend_info = 12; + * optional .FriendListInfo handle_friend_info = 3; * @return this */ public HandleFriendScRsp clearHandleFriendInfo() { @@ -178,7 +178,7 @@ public HandleFriendScRsp clearHandleFriendInfo() { } /** - * optional .FriendListInfo handle_friend_info = 12; + * optional .FriendListInfo handle_friend_info = 3; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -192,7 +192,7 @@ public FriendListInfoOuterClass.FriendListInfo getHandleFriendInfo() { } /** - * optional .FriendListInfo handle_friend_info = 12; + * optional .FriendListInfo handle_friend_info = 3; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -206,7 +206,7 @@ public FriendListInfoOuterClass.FriendListInfo getMutableHandleFriendInfo() { } /** - * optional .FriendListInfo handle_friend_info = 12; + * optional .FriendListInfo handle_friend_info = 3; * @param value the handleFriendInfo to set * @return this */ @@ -222,8 +222,8 @@ public HandleFriendScRsp copyFrom(final HandleFriendScRsp other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - retcode = other.retcode; uid = other.uid; + retcode = other.retcode; handleResult = other.handleResult; handleFriendInfo.copyFrom(other.handleFriendInfo); } @@ -236,12 +236,12 @@ public HandleFriendScRsp mergeFrom(final HandleFriendScRsp other) { return this; } cachedSize = -1; - if (other.hasRetcode()) { - setRetcode(other.retcode); - } if (other.hasUid()) { setUid(other.uid); } + if (other.hasRetcode()) { + setRetcode(other.retcode); + } if (other.hasHandleResult()) { setHandleResult(other.handleResult); } @@ -258,8 +258,8 @@ public HandleFriendScRsp clear() { } cachedSize = -1; bitField0_ = 0; - retcode = 0; uid = 0; + retcode = 0; handleResult = false; handleFriendInfo.clear(); return this; @@ -286,8 +286,8 @@ public boolean equals(Object o) { } HandleFriendScRsp other = (HandleFriendScRsp) o; return bitField0_ == other.bitField0_ - && (!hasRetcode() || retcode == other.retcode) && (!hasUid() || uid == other.uid) + && (!hasRetcode() || retcode == other.retcode) && (!hasHandleResult() || handleResult == other.handleResult) && (!hasHandleFriendInfo() || handleFriendInfo.equals(other.handleFriendInfo)); } @@ -295,19 +295,19 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 40); - output.writeUInt32NoTag(retcode); + output.writeRawByte((byte) 48); + output.writeUInt32NoTag(uid); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 80); - output.writeUInt32NoTag(uid); + output.writeRawByte((byte) 120); + output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 40); output.writeBoolNoTag(handleResult); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 98); + output.writeRawByte((byte) 26); output.writeMessageNoTag(handleFriendInfo); } } @@ -316,10 +316,10 @@ public void writeTo(final ProtoSink output) throws IOException { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(uid); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(uid); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { size += 2; @@ -337,34 +337,34 @@ public HandleFriendScRsp mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { - // retcode - retcode = input.readUInt32(); + case 48: { + // uid + uid = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 80) { + if (tag != 120) { break; } } - case 80: { - // uid - uid = input.readUInt32(); + case 120: { + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 64) { + if (tag != 40) { break; } } - case 64: { + case 40: { // handleResult handleResult = input.readBool(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 98) { + if (tag != 26) { break; } } - case 98: { + case 26: { // handleFriendInfo input.readMessage(handleFriendInfo); bitField0_ |= 0x00000008; @@ -391,10 +391,10 @@ public HandleFriendScRsp mergeFrom(final ProtoSource input) throws IOException { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.uid, uid); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.uid, uid); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000004) != 0) { output.writeBool(FieldNames.handleResult, handleResult); @@ -412,10 +412,10 @@ public HandleFriendScRsp mergeFrom(final JsonSource input) throws IOException { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case 115792: { + if (input.isAtField(FieldNames.uid)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + uid = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -423,10 +423,10 @@ public HandleFriendScRsp mergeFrom(final JsonSource input) throws IOException { } break; } - case 115792: { - if (input.isAtField(FieldNames.uid)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - uid = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -511,10 +511,10 @@ public HandleFriendScRsp create() { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName uid = FieldName.forField("uid"); + static final FieldName retcode = FieldName.forField("retcode"); + static final FieldName handleResult = FieldName.forField("handleResult", "handle_result"); static final FieldName handleFriendInfo = FieldName.forField("handleFriendInfo", "handle_friend_info"); diff --git a/src/generated/main/emu/lunarcore/proto/HeadIconOuterClass.java b/src/generated/main/emu/lunarcore/proto/HeadIconOuterClass.java index e1277db63..e1076e756 100644 --- a/src/generated/main/emu/lunarcore/proto/HeadIconOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/HeadIconOuterClass.java @@ -19,7 +19,7 @@ public static final class HeadIcon extends ProtoMessage implements Clo private static final long serialVersionUID = 0L; /** - * optional uint32 id = 8; + * optional uint32 id = 10; */ private int id; @@ -34,7 +34,7 @@ public static HeadIcon newInstance() { } /** - * optional uint32 id = 8; + * optional uint32 id = 10; * @return whether the id field is set */ public boolean hasId() { @@ -42,7 +42,7 @@ public boolean hasId() { } /** - * optional uint32 id = 8; + * optional uint32 id = 10; * @return this */ public HeadIcon clearId() { @@ -52,7 +52,7 @@ public HeadIcon clearId() { } /** - * optional uint32 id = 8; + * optional uint32 id = 10; * @return the id */ public int getId() { @@ -60,7 +60,7 @@ public int getId() { } /** - * optional uint32 id = 8; + * optional uint32 id = 10; * @param value the id to set * @return this */ @@ -129,7 +129,7 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(id); } } @@ -150,7 +150,7 @@ public HeadIcon mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { + case 80: { // id id = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/HeroBasicTypeInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/HeroBasicTypeInfoOuterClass.java index 21c483b05..3a549078d 100644 --- a/src/generated/main/emu/lunarcore/proto/HeroBasicTypeInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/HeroBasicTypeInfoOuterClass.java @@ -20,17 +20,17 @@ public static final class HeroBasicTypeInfo extends ProtoMessageoptional uint32 rank = 9; + * optional uint32 rank = 11; */ private int rank; /** - * optional .HeroBasicType basic_type = 3; + * optional .HeroBasicType basic_type = 2; */ private int basicType; /** - * repeated .AvatarSkillTree skill_tree_list = 1; + * repeated .AvatarSkillTree skill_tree_list = 12; */ private final RepeatedMessage skillTreeList = RepeatedMessage.newEmptyInstance(AvatarSkillTreeOuterClass.AvatarSkillTree.getFactory()); @@ -45,7 +45,7 @@ public static HeroBasicTypeInfo newInstance() { } /** - * optional uint32 rank = 9; + * optional uint32 rank = 11; * @return whether the rank field is set */ public boolean hasRank() { @@ -53,7 +53,7 @@ public boolean hasRank() { } /** - * optional uint32 rank = 9; + * optional uint32 rank = 11; * @return this */ public HeroBasicTypeInfo clearRank() { @@ -63,7 +63,7 @@ public HeroBasicTypeInfo clearRank() { } /** - * optional uint32 rank = 9; + * optional uint32 rank = 11; * @return the rank */ public int getRank() { @@ -71,7 +71,7 @@ public int getRank() { } /** - * optional uint32 rank = 9; + * optional uint32 rank = 11; * @param value the rank to set * @return this */ @@ -82,7 +82,7 @@ public HeroBasicTypeInfo setRank(final int value) { } /** - * optional .HeroBasicType basic_type = 3; + * optional .HeroBasicType basic_type = 2; * @return whether the basicType field is set */ public boolean hasBasicType() { @@ -90,7 +90,7 @@ public boolean hasBasicType() { } /** - * optional .HeroBasicType basic_type = 3; + * optional .HeroBasicType basic_type = 2; * @return this */ public HeroBasicTypeInfo clearBasicType() { @@ -100,7 +100,7 @@ public HeroBasicTypeInfo clearBasicType() { } /** - * optional .HeroBasicType basic_type = 3; + * optional .HeroBasicType basic_type = 2; * @return the basicType */ public HeroBasicTypeOuterClass.HeroBasicType getBasicType() { @@ -133,7 +133,7 @@ public HeroBasicTypeInfo setBasicTypeValue(final int value) { } /** - * optional .HeroBasicType basic_type = 3; + * optional .HeroBasicType basic_type = 2; * @param value the basicType to set * @return this */ @@ -144,7 +144,7 @@ public HeroBasicTypeInfo setBasicType(final HeroBasicTypeOuterClass.HeroBasicTyp } /** - * repeated .AvatarSkillTree skill_tree_list = 1; + * repeated .AvatarSkillTree skill_tree_list = 12; * @return whether the skillTreeList field is set */ public boolean hasSkillTreeList() { @@ -152,7 +152,7 @@ public boolean hasSkillTreeList() { } /** - * repeated .AvatarSkillTree skill_tree_list = 1; + * repeated .AvatarSkillTree skill_tree_list = 12; * @return this */ public HeroBasicTypeInfo clearSkillTreeList() { @@ -162,7 +162,7 @@ public HeroBasicTypeInfo clearSkillTreeList() { } /** - * repeated .AvatarSkillTree skill_tree_list = 1; + * repeated .AvatarSkillTree skill_tree_list = 12; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -176,7 +176,7 @@ public RepeatedMessage getSkillTreeLi } /** - * repeated .AvatarSkillTree skill_tree_list = 1; + * repeated .AvatarSkillTree skill_tree_list = 12; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -190,7 +190,7 @@ public RepeatedMessage getMutableSkil } /** - * repeated .AvatarSkillTree skill_tree_list = 1; + * repeated .AvatarSkillTree skill_tree_list = 12; * @param value the skillTreeList to add * @return this */ @@ -202,7 +202,7 @@ public HeroBasicTypeInfo addSkillTreeList( } /** - * repeated .AvatarSkillTree skill_tree_list = 1; + * repeated .AvatarSkillTree skill_tree_list = 12; * @param values the skillTreeList to add * @return this */ @@ -285,16 +285,16 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(rank); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 16); output.writeEnumNoTag(basicType); } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < skillTreeList.length(); i++) { - output.writeRawByte((byte) 10); + output.writeRawByte((byte) 98); output.writeMessageNoTag(skillTreeList.get(i)); } } @@ -322,16 +322,16 @@ public HeroBasicTypeInfo mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 72: { + case 88: { // rank rank = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 24) { + if (tag != 16) { break; } } - case 24: { + case 16: { // basicType final int value = input.readInt32(); if (HeroBasicTypeOuterClass.HeroBasicType.forNumber(value) != null) { @@ -339,11 +339,11 @@ public HeroBasicTypeInfo mergeFrom(final ProtoSource input) throws IOException { bitField0_ |= 0x00000002; } tag = input.readTag(); - if (tag != 10) { + if (tag != 98) { break; } } - case 10: { + case 98: { // skillTreeList tag = input.readRepeatedMessage(skillTreeList, tag); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/CommonRogueUpdateScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/InteractChargerCsReqOuterClass.java similarity index 50% rename from src/generated/main/emu/lunarcore/proto/CommonRogueUpdateScNotifyOuterClass.java rename to src/generated/main/emu/lunarcore/proto/InteractChargerCsReqOuterClass.java index 8a79146b1..ab212f780 100644 --- a/src/generated/main/emu/lunarcore/proto/CommonRogueUpdateScNotifyOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/InteractChargerCsReqOuterClass.java @@ -11,82 +11,82 @@ import us.hebi.quickbuf.ProtoSink; import us.hebi.quickbuf.ProtoSource; -public final class CommonRogueUpdateScNotifyOuterClass { +public final class InteractChargerCsReqOuterClass { /** - * Protobuf type {@code CommonRogueUpdateScNotify} + * Protobuf type {@code InteractChargerCsReq} */ - public static final class CommonRogueUpdateScNotify extends ProtoMessage implements Cloneable { + public static final class InteractChargerCsReq extends ProtoMessage implements Cloneable { private static final long serialVersionUID = 0L; /** * 
-     * CJFJFKJICGK NALLCHLAJPN = 10;
+     *  obf: GLOGIAFNKHA
      *
* - * optional .RogueUpdate rogue_update = 15; + * optional .ChargerInfo charger_info = 8; */ - private final RogueUpdateOuterClass.RogueUpdate rogueUpdate = RogueUpdateOuterClass.RogueUpdate.newInstance(); + private final ChargerInfoOuterClass.ChargerInfo chargerInfo = ChargerInfoOuterClass.ChargerInfo.newInstance(); - private CommonRogueUpdateScNotify() { + private InteractChargerCsReq() { } /** - * @return a new empty instance of {@code CommonRogueUpdateScNotify} + * @return a new empty instance of {@code InteractChargerCsReq} */ - public static CommonRogueUpdateScNotify newInstance() { - return new CommonRogueUpdateScNotify(); + public static InteractChargerCsReq newInstance() { + return new InteractChargerCsReq(); } /** * 
-     * CJFJFKJICGK NALLCHLAJPN = 10;
+     *  obf: GLOGIAFNKHA
      *
* - * optional .RogueUpdate rogue_update = 15; - * @return whether the rogueUpdate field is set + * optional .ChargerInfo charger_info = 8; + * @return whether the chargerInfo field is set */ - public boolean hasRogueUpdate() { + public boolean hasChargerInfo() { return (bitField0_ & 0x00000001) != 0; } /** * 
-     * CJFJFKJICGK NALLCHLAJPN = 10;
+     *  obf: GLOGIAFNKHA
      *
* - * optional .RogueUpdate rogue_update = 15; + * optional .ChargerInfo charger_info = 8; * @return this */ - public CommonRogueUpdateScNotify clearRogueUpdate() { + public InteractChargerCsReq clearChargerInfo() { bitField0_ &= ~0x00000001; - rogueUpdate.clear(); + chargerInfo.clear(); return this; } /** * 
-     * CJFJFKJICGK NALLCHLAJPN = 10;
+     *  obf: GLOGIAFNKHA
      *
* - * optional .RogueUpdate rogue_update = 15; + * optional .ChargerInfo charger_info = 8; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. * - * Use {@link #getMutableRogueUpdate()} if you want to modify it. + * Use {@link #getMutableChargerInfo()} if you want to modify it. * * @return internal storage object for reading */ - public RogueUpdateOuterClass.RogueUpdate getRogueUpdate() { - return rogueUpdate; + public ChargerInfoOuterClass.ChargerInfo getChargerInfo() { + return chargerInfo; } /** * 
-     * CJFJFKJICGK NALLCHLAJPN = 10;
+     *  obf: GLOGIAFNKHA
      *
* - * optional .RogueUpdate rogue_update = 15; + * optional .ChargerInfo charger_info = 8; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -94,67 +94,67 @@ public RogueUpdateOuterClass.RogueUpdate getRogueUpdate() { * * @return internal storage object for modifications */ - public RogueUpdateOuterClass.RogueUpdate getMutableRogueUpdate() { + public ChargerInfoOuterClass.ChargerInfo getMutableChargerInfo() { bitField0_ |= 0x00000001; - return rogueUpdate; + return chargerInfo; } /** * 
-     * CJFJFKJICGK NALLCHLAJPN = 10;
+     *  obf: GLOGIAFNKHA
      *
* - * optional .RogueUpdate rogue_update = 15; - * @param value the rogueUpdate to set + * optional .ChargerInfo charger_info = 8; + * @param value the chargerInfo to set * @return this */ - public CommonRogueUpdateScNotify setRogueUpdate(final RogueUpdateOuterClass.RogueUpdate value) { + public InteractChargerCsReq setChargerInfo(final ChargerInfoOuterClass.ChargerInfo value) { bitField0_ |= 0x00000001; - rogueUpdate.copyFrom(value); + chargerInfo.copyFrom(value); return this; } @Override - public CommonRogueUpdateScNotify copyFrom(final CommonRogueUpdateScNotify other) { + public InteractChargerCsReq copyFrom(final InteractChargerCsReq other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - rogueUpdate.copyFrom(other.rogueUpdate); + chargerInfo.copyFrom(other.chargerInfo); } return this; } @Override - public CommonRogueUpdateScNotify mergeFrom(final CommonRogueUpdateScNotify other) { + public InteractChargerCsReq mergeFrom(final InteractChargerCsReq other) { if (other.isEmpty()) { return this; } cachedSize = -1; - if (other.hasRogueUpdate()) { - getMutableRogueUpdate().mergeFrom(other.rogueUpdate); + if (other.hasChargerInfo()) { + getMutableChargerInfo().mergeFrom(other.chargerInfo); } return this; } @Override - public CommonRogueUpdateScNotify clear() { + public InteractChargerCsReq clear() { if (isEmpty()) { return this; } cachedSize = -1; bitField0_ = 0; - rogueUpdate.clear(); + chargerInfo.clear(); return this; } @Override - public CommonRogueUpdateScNotify clearQuick() { + public InteractChargerCsReq clearQuick() { if (isEmpty()) { return this; } cachedSize = -1; bitField0_ = 0; - rogueUpdate.clearQuick(); + chargerInfo.clearQuick(); return this; } @@ -163,19 +163,19 @@ public boolean equals(Object o) { if (o == this) { return true; } - if (!(o instanceof CommonRogueUpdateScNotify)) { + if (!(o instanceof InteractChargerCsReq)) { return false; } - CommonRogueUpdateScNotify other = (CommonRogueUpdateScNotify) o; + InteractChargerCsReq other = (InteractChargerCsReq) o; return bitField0_ == other.bitField0_ - && (!hasRogueUpdate() || rogueUpdate.equals(other.rogueUpdate)); + && (!hasChargerInfo() || chargerInfo.equals(other.chargerInfo)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 122); - output.writeMessageNoTag(rogueUpdate); + output.writeRawByte((byte) 66); + output.writeMessageNoTag(chargerInfo); } } @@ -183,21 +183,21 @@ public void writeTo(final ProtoSink output) throws IOException { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(rogueUpdate); + size += 1 + ProtoSink.computeMessageSizeNoTag(chargerInfo); } return size; } @Override @SuppressWarnings("fallthrough") - public CommonRogueUpdateScNotify mergeFrom(final ProtoSource input) throws IOException { + public InteractChargerCsReq mergeFrom(final ProtoSource input) throws IOException { // Enabled Fall-Through Optimization (QuickBuffers) int tag = input.readTag(); while (true) { switch (tag) { - case 122: { - // rogueUpdate - input.readMessage(rogueUpdate); + case 66: { + // chargerInfo + input.readMessage(chargerInfo); bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 0) { @@ -222,23 +222,23 @@ public CommonRogueUpdateScNotify mergeFrom(final ProtoSource input) throws IOExc public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeMessage(FieldNames.rogueUpdate, rogueUpdate); + output.writeMessage(FieldNames.chargerInfo, chargerInfo); } output.endObject(); } @Override - public CommonRogueUpdateScNotify mergeFrom(final JsonSource input) throws IOException { + public InteractChargerCsReq mergeFrom(final JsonSource input) throws IOException { if (!input.beginObject()) { return this; } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -782477501: - case 1952403150: { - if (input.isAtField(FieldNames.rogueUpdate)) { + case 1038073356: + case 2135678991: { + if (input.isAtField(FieldNames.chargerInfo)) { if (!input.trySkipNullValue()) { - input.readMessage(rogueUpdate); + input.readMessage(chargerInfo); bitField0_ |= 0x00000001; } } else { @@ -257,8 +257,8 @@ public CommonRogueUpdateScNotify mergeFrom(final JsonSource input) throws IOExce } @Override - public CommonRogueUpdateScNotify clone() { - return new CommonRogueUpdateScNotify().copyFrom(this); + public InteractChargerCsReq clone() { + return new InteractChargerCsReq().copyFrom(this); } @Override @@ -266,32 +266,32 @@ public boolean isEmpty() { return ((bitField0_) == 0); } - public static CommonRogueUpdateScNotify parseFrom(final byte[] data) throws + public static InteractChargerCsReq parseFrom(final byte[] data) throws InvalidProtocolBufferException { - return ProtoMessage.mergeFrom(new CommonRogueUpdateScNotify(), data).checkInitialized(); + return ProtoMessage.mergeFrom(new InteractChargerCsReq(), data).checkInitialized(); } - public static CommonRogueUpdateScNotify parseFrom(final ProtoSource input) throws IOException { - return ProtoMessage.mergeFrom(new CommonRogueUpdateScNotify(), input).checkInitialized(); + public static InteractChargerCsReq parseFrom(final ProtoSource input) throws IOException { + return ProtoMessage.mergeFrom(new InteractChargerCsReq(), input).checkInitialized(); } - public static CommonRogueUpdateScNotify parseFrom(final JsonSource input) throws IOException { - return ProtoMessage.mergeFrom(new CommonRogueUpdateScNotify(), input).checkInitialized(); + public static InteractChargerCsReq parseFrom(final JsonSource input) throws IOException { + return ProtoMessage.mergeFrom(new InteractChargerCsReq(), input).checkInitialized(); } /** - * @return factory for creating CommonRogueUpdateScNotify messages + * @return factory for creating InteractChargerCsReq messages */ - public static MessageFactory getFactory() { - return CommonRogueUpdateScNotifyFactory.INSTANCE; + public static MessageFactory getFactory() { + return InteractChargerCsReqFactory.INSTANCE; } - private enum CommonRogueUpdateScNotifyFactory implements MessageFactory { + private enum InteractChargerCsReqFactory implements MessageFactory { INSTANCE; @Override - public CommonRogueUpdateScNotify create() { - return CommonRogueUpdateScNotify.newInstance(); + public InteractChargerCsReq create() { + return InteractChargerCsReq.newInstance(); } } @@ -299,7 +299,7 @@ public CommonRogueUpdateScNotify create() { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName rogueUpdate = FieldName.forField("rogueUpdate", "rogue_update"); + static final FieldName chargerInfo = FieldName.forField("chargerInfo", "charger_info"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/InteractChargerScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/InteractChargerScRspOuterClass.java new file mode 100644 index 000000000..42b90752f --- /dev/null +++ b/src/generated/main/emu/lunarcore/proto/InteractChargerScRspOuterClass.java @@ -0,0 +1,810 @@ +// Code generated by protocol buffer compiler. Do not edit! +package emu.lunarcore.proto; + +import java.io.IOException; +import us.hebi.quickbuf.FieldName; +import us.hebi.quickbuf.InvalidProtocolBufferException; +import us.hebi.quickbuf.JsonSink; +import us.hebi.quickbuf.JsonSource; +import us.hebi.quickbuf.MessageFactory; +import us.hebi.quickbuf.ProtoMessage; +import us.hebi.quickbuf.ProtoSink; +import us.hebi.quickbuf.ProtoSource; + +public final class InteractChargerScRspOuterClass { + /** + * Protobuf type {@code InteractChargerScRsp} + */ + public static final class InteractChargerScRsp extends ProtoMessage implements Cloneable { + private static final long serialVersionUID = 0L; + + /** + * optional uint32 retcode = 12; + */ + private int retcode; + + /** + * 
+     *  obf: MIAGCEIOPJH
+     *
+ * + * optional .InteractChargerScRsp.ECKNFHCDJFH OEKHAFALOFB = 6; + */ + private final ECKNFHCDJFH oEKHAFALOFB = ECKNFHCDJFH.newInstance(); + + /** + * optional .ChargerInfo charger_info = 13; + */ + private final ChargerInfoOuterClass.ChargerInfo chargerInfo = ChargerInfoOuterClass.ChargerInfo.newInstance(); + + private InteractChargerScRsp() { + } + + /** + * @return a new empty instance of {@code InteractChargerScRsp} + */ + public static InteractChargerScRsp newInstance() { + return new InteractChargerScRsp(); + } + + /** + * optional uint32 retcode = 12; + * @return whether the retcode field is set + */ + public boolean hasRetcode() { + return (bitField0_ & 0x00000001) != 0; + } + + /** + * optional uint32 retcode = 12; + * @return this + */ + public InteractChargerScRsp clearRetcode() { + bitField0_ &= ~0x00000001; + retcode = 0; + return this; + } + + /** + * optional uint32 retcode = 12; + * @return the retcode + */ + public int getRetcode() { + return retcode; + } + + /** + * optional uint32 retcode = 12; + * @param value the retcode to set + * @return this + */ + public InteractChargerScRsp setRetcode(final int value) { + bitField0_ |= 0x00000001; + retcode = value; + return this; + } + + /** + * 
+     *  obf: MIAGCEIOPJH
+     *
+ * + * optional .InteractChargerScRsp.ECKNFHCDJFH OEKHAFALOFB = 6; + * @return whether the oEKHAFALOFB field is set + */ + public boolean hasOEKHAFALOFB() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * 
+     *  obf: MIAGCEIOPJH
+     *
+ * + * optional .InteractChargerScRsp.ECKNFHCDJFH OEKHAFALOFB = 6; + * @return this + */ + public InteractChargerScRsp clearOEKHAFALOFB() { + bitField0_ &= ~0x00000002; + oEKHAFALOFB.clear(); + return this; + } + + /** + * 
+     *  obf: MIAGCEIOPJH
+     *
+ * + * optional .InteractChargerScRsp.ECKNFHCDJFH OEKHAFALOFB = 6; + * + * This method returns the internal storage object without modifying any has state. + * The returned object should not be modified and be treated as read-only. + * + * Use {@link #getMutableOEKHAFALOFB()} if you want to modify it. + * + * @return internal storage object for reading + */ + public ECKNFHCDJFH getOEKHAFALOFB() { + return oEKHAFALOFB; + } + + /** + * 
+     *  obf: MIAGCEIOPJH
+     *
+ * + * optional .InteractChargerScRsp.ECKNFHCDJFH OEKHAFALOFB = 6; + * + * This method returns the internal storage object and sets the corresponding + * has state. The returned object will become part of this message and its + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public ECKNFHCDJFH getMutableOEKHAFALOFB() { + bitField0_ |= 0x00000002; + return oEKHAFALOFB; + } + + /** + * 
+     *  obf: MIAGCEIOPJH
+     *
+ * + * optional .InteractChargerScRsp.ECKNFHCDJFH OEKHAFALOFB = 6; + * @param value the oEKHAFALOFB to set + * @return this + */ + public InteractChargerScRsp setOEKHAFALOFB(final ECKNFHCDJFH value) { + bitField0_ |= 0x00000002; + oEKHAFALOFB.copyFrom(value); + return this; + } + + /** + * optional .ChargerInfo charger_info = 13; + * @return whether the chargerInfo field is set + */ + public boolean hasChargerInfo() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional .ChargerInfo charger_info = 13; + * @return this + */ + public InteractChargerScRsp clearChargerInfo() { + bitField0_ &= ~0x00000004; + chargerInfo.clear(); + return this; + } + + /** + * optional .ChargerInfo charger_info = 13; + * + * This method returns the internal storage object without modifying any has state. + * The returned object should not be modified and be treated as read-only. + * + * Use {@link #getMutableChargerInfo()} if you want to modify it. + * + * @return internal storage object for reading + */ + public ChargerInfoOuterClass.ChargerInfo getChargerInfo() { + return chargerInfo; + } + + /** + * optional .ChargerInfo charger_info = 13; + * + * This method returns the internal storage object and sets the corresponding + * has state. The returned object will become part of this message and its + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public ChargerInfoOuterClass.ChargerInfo getMutableChargerInfo() { + bitField0_ |= 0x00000004; + return chargerInfo; + } + + /** + * optional .ChargerInfo charger_info = 13; + * @param value the chargerInfo to set + * @return this + */ + public InteractChargerScRsp setChargerInfo(final ChargerInfoOuterClass.ChargerInfo value) { + bitField0_ |= 0x00000004; + chargerInfo.copyFrom(value); + return this; + } + + @Override + public InteractChargerScRsp copyFrom(final InteractChargerScRsp other) { + cachedSize = other.cachedSize; + if ((bitField0_ | other.bitField0_) != 0) { + bitField0_ = other.bitField0_; + retcode = other.retcode; + oEKHAFALOFB.copyFrom(other.oEKHAFALOFB); + chargerInfo.copyFrom(other.chargerInfo); + } + return this; + } + + @Override + public InteractChargerScRsp mergeFrom(final InteractChargerScRsp other) { + if (other.isEmpty()) { + return this; + } + cachedSize = -1; + if (other.hasRetcode()) { + setRetcode(other.retcode); + } + if (other.hasOEKHAFALOFB()) { + getMutableOEKHAFALOFB().mergeFrom(other.oEKHAFALOFB); + } + if (other.hasChargerInfo()) { + getMutableChargerInfo().mergeFrom(other.chargerInfo); + } + return this; + } + + @Override + public InteractChargerScRsp clear() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + retcode = 0; + oEKHAFALOFB.clear(); + chargerInfo.clear(); + return this; + } + + @Override + public InteractChargerScRsp clearQuick() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + oEKHAFALOFB.clearQuick(); + chargerInfo.clearQuick(); + return this; + } + + @Override + public boolean equals(Object o) { + if (o == this) { + return true; + } + if (!(o instanceof InteractChargerScRsp)) { + return false; + } + InteractChargerScRsp other = (InteractChargerScRsp) o; + return bitField0_ == other.bitField0_ + && (!hasRetcode() || retcode == other.retcode) + && (!hasOEKHAFALOFB() || oEKHAFALOFB.equals(other.oEKHAFALOFB)) + && (!hasChargerInfo() || chargerInfo.equals(other.chargerInfo)); + } + + @Override + public void writeTo(final ProtoSink output) throws IOException { + if ((bitField0_ & 0x00000001) != 0) { + output.writeRawByte((byte) 96); + output.writeUInt32NoTag(retcode); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 50); + output.writeMessageNoTag(oEKHAFALOFB); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 106); + output.writeMessageNoTag(chargerInfo); + } + } + + @Override + protected int computeSerializedSize() { + int size = 0; + if ((bitField0_ & 0x00000001) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + } + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeMessageSizeNoTag(oEKHAFALOFB); + } + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeMessageSizeNoTag(chargerInfo); + } + return size; + } + + @Override + @SuppressWarnings("fallthrough") + public InteractChargerScRsp mergeFrom(final ProtoSource input) throws IOException { + // Enabled Fall-Through Optimization (QuickBuffers) + int tag = input.readTag(); + while (true) { + switch (tag) { + case 96: { + // retcode + retcode = input.readUInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 50) { + break; + } + } + case 50: { + // oEKHAFALOFB + input.readMessage(oEKHAFALOFB); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 106) { + break; + } + } + case 106: { + // chargerInfo + input.readMessage(chargerInfo); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 0) { + break; + } + } + case 0: { + return this; + } + default: { + if (!input.skipField(tag)) { + return this; + } + tag = input.readTag(); + break; + } + } + } + } + + @Override + public void writeTo(final JsonSink output) throws IOException { + output.beginObject(); + if ((bitField0_ & 0x00000001) != 0) { + output.writeUInt32(FieldNames.retcode, retcode); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeMessage(FieldNames.oEKHAFALOFB, oEKHAFALOFB); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeMessage(FieldNames.chargerInfo, chargerInfo); + } + output.endObject(); + } + + @Override + public InteractChargerScRsp mergeFrom(final JsonSource input) throws IOException { + if (!input.beginObject()) { + return this; + } + while (!input.isAtEnd()) { + switch (input.readFieldHash()) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { + if (!input.trySkipNullValue()) { + retcode = input.readUInt32(); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } + case 1533003560: { + if (input.isAtField(FieldNames.oEKHAFALOFB)) { + if (!input.trySkipNullValue()) { + input.readMessage(oEKHAFALOFB); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + case 1038073356: + case 2135678991: { + if (input.isAtField(FieldNames.chargerInfo)) { + if (!input.trySkipNullValue()) { + input.readMessage(chargerInfo); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } + default: { + input.skipUnknownField(); + break; + } + } + } + input.endObject(); + return this; + } + + @Override + public InteractChargerScRsp clone() { + return new InteractChargerScRsp().copyFrom(this); + } + + @Override + public boolean isEmpty() { + return ((bitField0_) == 0); + } + + public static InteractChargerScRsp parseFrom(final byte[] data) throws + InvalidProtocolBufferException { + return ProtoMessage.mergeFrom(new InteractChargerScRsp(), data).checkInitialized(); + } + + public static InteractChargerScRsp parseFrom(final ProtoSource input) throws IOException { + return ProtoMessage.mergeFrom(new InteractChargerScRsp(), input).checkInitialized(); + } + + public static InteractChargerScRsp parseFrom(final JsonSource input) throws IOException { + return ProtoMessage.mergeFrom(new InteractChargerScRsp(), input).checkInitialized(); + } + + /** + * @return factory for creating InteractChargerScRsp messages + */ + public static MessageFactory getFactory() { + return InteractChargerScRspFactory.INSTANCE; + } + + /** + * Protobuf type {@code ECKNFHCDJFH} + */ + public static final class ECKNFHCDJFH extends ProtoMessage implements Cloneable { + private static final long serialVersionUID = 0L; + + /** + * optional uint32 PJHMBIAHHBG = 3; + */ + private int pJHMBIAHHBG; + + /** + * optional uint32 CLMDBEPFDNG = 14; + */ + private int cLMDBEPFDNG; + + private ECKNFHCDJFH() { + } + + /** + * @return a new empty instance of {@code ECKNFHCDJFH} + */ + public static ECKNFHCDJFH newInstance() { + return new ECKNFHCDJFH(); + } + + /** + * optional uint32 PJHMBIAHHBG = 3; + * @return whether the pJHMBIAHHBG field is set + */ + public boolean hasPJHMBIAHHBG() { + return (bitField0_ & 0x00000001) != 0; + } + + /** + * optional uint32 PJHMBIAHHBG = 3; + * @return this + */ + public ECKNFHCDJFH clearPJHMBIAHHBG() { + bitField0_ &= ~0x00000001; + pJHMBIAHHBG = 0; + return this; + } + + /** + * optional uint32 PJHMBIAHHBG = 3; + * @return the pJHMBIAHHBG + */ + public int getPJHMBIAHHBG() { + return pJHMBIAHHBG; + } + + /** + * optional uint32 PJHMBIAHHBG = 3; + * @param value the pJHMBIAHHBG to set + * @return this + */ + public ECKNFHCDJFH setPJHMBIAHHBG(final int value) { + bitField0_ |= 0x00000001; + pJHMBIAHHBG = value; + return this; + } + + /** + * optional uint32 CLMDBEPFDNG = 14; + * @return whether the cLMDBEPFDNG field is set + */ + public boolean hasCLMDBEPFDNG() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 CLMDBEPFDNG = 14; + * @return this + */ + public ECKNFHCDJFH clearCLMDBEPFDNG() { + bitField0_ &= ~0x00000002; + cLMDBEPFDNG = 0; + return this; + } + + /** + * optional uint32 CLMDBEPFDNG = 14; + * @return the cLMDBEPFDNG + */ + public int getCLMDBEPFDNG() { + return cLMDBEPFDNG; + } + + /** + * optional uint32 CLMDBEPFDNG = 14; + * @param value the cLMDBEPFDNG to set + * @return this + */ + public ECKNFHCDJFH setCLMDBEPFDNG(final int value) { + bitField0_ |= 0x00000002; + cLMDBEPFDNG = value; + return this; + } + + @Override + public ECKNFHCDJFH copyFrom(final ECKNFHCDJFH other) { + cachedSize = other.cachedSize; + if ((bitField0_ | other.bitField0_) != 0) { + bitField0_ = other.bitField0_; + pJHMBIAHHBG = other.pJHMBIAHHBG; + cLMDBEPFDNG = other.cLMDBEPFDNG; + } + return this; + } + + @Override + public ECKNFHCDJFH mergeFrom(final ECKNFHCDJFH other) { + if (other.isEmpty()) { + return this; + } + cachedSize = -1; + if (other.hasPJHMBIAHHBG()) { + setPJHMBIAHHBG(other.pJHMBIAHHBG); + } + if (other.hasCLMDBEPFDNG()) { + setCLMDBEPFDNG(other.cLMDBEPFDNG); + } + return this; + } + + @Override + public ECKNFHCDJFH clear() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + pJHMBIAHHBG = 0; + cLMDBEPFDNG = 0; + return this; + } + + @Override + public ECKNFHCDJFH clearQuick() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + return this; + } + + @Override + public boolean equals(Object o) { + if (o == this) { + return true; + } + if (!(o instanceof ECKNFHCDJFH)) { + return false; + } + ECKNFHCDJFH other = (ECKNFHCDJFH) o; + return bitField0_ == other.bitField0_ + && (!hasPJHMBIAHHBG() || pJHMBIAHHBG == other.pJHMBIAHHBG) + && (!hasCLMDBEPFDNG() || cLMDBEPFDNG == other.cLMDBEPFDNG); + } + + @Override + public void writeTo(final ProtoSink output) throws IOException { + if ((bitField0_ & 0x00000001) != 0) { + output.writeRawByte((byte) 24); + output.writeUInt32NoTag(pJHMBIAHHBG); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(cLMDBEPFDNG); + } + } + + @Override + protected int computeSerializedSize() { + int size = 0; + if ((bitField0_ & 0x00000001) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(pJHMBIAHHBG); + } + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(cLMDBEPFDNG); + } + return size; + } + + @Override + @SuppressWarnings("fallthrough") + public ECKNFHCDJFH mergeFrom(final ProtoSource input) throws IOException { + // Enabled Fall-Through Optimization (QuickBuffers) + int tag = input.readTag(); + while (true) { + switch (tag) { + case 24: { + // pJHMBIAHHBG + pJHMBIAHHBG = input.readUInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 112) { + break; + } + } + case 112: { + // cLMDBEPFDNG + cLMDBEPFDNG = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 0) { + break; + } + } + case 0: { + return this; + } + default: { + if (!input.skipField(tag)) { + return this; + } + tag = input.readTag(); + break; + } + } + } + } + + @Override + public void writeTo(final JsonSink output) throws IOException { + output.beginObject(); + if ((bitField0_ & 0x00000001) != 0) { + output.writeUInt32(FieldNames.pJHMBIAHHBG, pJHMBIAHHBG); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeUInt32(FieldNames.cLMDBEPFDNG, cLMDBEPFDNG); + } + output.endObject(); + } + + @Override + public ECKNFHCDJFH mergeFrom(final JsonSource input) throws IOException { + if (!input.beginObject()) { + return this; + } + while (!input.isAtEnd()) { + switch (input.readFieldHash()) { + case 978262976: { + if (input.isAtField(FieldNames.pJHMBIAHHBG)) { + if (!input.trySkipNullValue()) { + pJHMBIAHHBG = input.readUInt32(); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } + case -877688540: { + if (input.isAtField(FieldNames.cLMDBEPFDNG)) { + if (!input.trySkipNullValue()) { + cLMDBEPFDNG = input.readUInt32(); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + default: { + input.skipUnknownField(); + break; + } + } + } + input.endObject(); + return this; + } + + @Override + public ECKNFHCDJFH clone() { + return new ECKNFHCDJFH().copyFrom(this); + } + + @Override + public boolean isEmpty() { + return ((bitField0_) == 0); + } + + public static ECKNFHCDJFH parseFrom(final byte[] data) throws InvalidProtocolBufferException { + return ProtoMessage.mergeFrom(new ECKNFHCDJFH(), data).checkInitialized(); + } + + public static ECKNFHCDJFH parseFrom(final ProtoSource input) throws IOException { + return ProtoMessage.mergeFrom(new ECKNFHCDJFH(), input).checkInitialized(); + } + + public static ECKNFHCDJFH parseFrom(final JsonSource input) throws IOException { + return ProtoMessage.mergeFrom(new ECKNFHCDJFH(), input).checkInitialized(); + } + + /** + * @return factory for creating ECKNFHCDJFH messages + */ + public static MessageFactory getFactory() { + return ECKNFHCDJFHFactory.INSTANCE; + } + + private enum ECKNFHCDJFHFactory implements MessageFactory { + INSTANCE; + + @Override + public ECKNFHCDJFH create() { + return ECKNFHCDJFH.newInstance(); + } + } + + /** + * Contains name constants used for serializing JSON + */ + static class FieldNames { + static final FieldName pJHMBIAHHBG = FieldName.forField("PJHMBIAHHBG"); + + static final FieldName cLMDBEPFDNG = FieldName.forField("CLMDBEPFDNG"); + } + } + + private enum InteractChargerScRspFactory implements MessageFactory { + INSTANCE; + + @Override + public InteractChargerScRsp create() { + return InteractChargerScRsp.newInstance(); + } + } + + /** + * Contains name constants used for serializing JSON + */ + static class FieldNames { + static final FieldName retcode = FieldName.forField("retcode"); + + static final FieldName oEKHAFALOFB = FieldName.forField("OEKHAFALOFB"); + + static final FieldName chargerInfo = FieldName.forField("chargerInfo", "charger_info"); + } + } +} diff --git a/src/generated/main/emu/lunarcore/proto/InteractPropCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/InteractPropCsReqOuterClass.java index d6d1862e7..b458dcafe 100644 --- a/src/generated/main/emu/lunarcore/proto/InteractPropCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/InteractPropCsReqOuterClass.java @@ -19,14 +19,14 @@ public static final class InteractPropCsReq extends ProtoMessageoptional uint32 interact_id = 7; + * optional uint32 prop_entity_id = 5; */ - private int interactId; + private int propEntityId; /** - * optional uint32 prop_entity_id = 15; + * optional uint32 interact_id = 15; */ - private int propEntityId; + private int interactId; private InteractPropCsReq() { } @@ -39,76 +39,76 @@ public static InteractPropCsReq newInstance() { } /** - * optional uint32 interact_id = 7; - * @return whether the interactId field is set + * optional uint32 prop_entity_id = 5; + * @return whether the propEntityId field is set */ - public boolean hasInteractId() { + public boolean hasPropEntityId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 interact_id = 7; + * optional uint32 prop_entity_id = 5; * @return this */ - public InteractPropCsReq clearInteractId() { + public InteractPropCsReq clearPropEntityId() { bitField0_ &= ~0x00000001; - interactId = 0; + propEntityId = 0; return this; } /** - * optional uint32 interact_id = 7; - * @return the interactId + * optional uint32 prop_entity_id = 5; + * @return the propEntityId */ - public int getInteractId() { - return interactId; + public int getPropEntityId() { + return propEntityId; } /** - * optional uint32 interact_id = 7; - * @param value the interactId to set + * optional uint32 prop_entity_id = 5; + * @param value the propEntityId to set * @return this */ - public InteractPropCsReq setInteractId(final int value) { + public InteractPropCsReq setPropEntityId(final int value) { bitField0_ |= 0x00000001; - interactId = value; + propEntityId = value; return this; } /** - * optional uint32 prop_entity_id = 15; - * @return whether the propEntityId field is set + * optional uint32 interact_id = 15; + * @return whether the interactId field is set */ - public boolean hasPropEntityId() { + public boolean hasInteractId() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 prop_entity_id = 15; + * optional uint32 interact_id = 15; * @return this */ - public InteractPropCsReq clearPropEntityId() { + public InteractPropCsReq clearInteractId() { bitField0_ &= ~0x00000002; - propEntityId = 0; + interactId = 0; return this; } /** - * optional uint32 prop_entity_id = 15; - * @return the propEntityId + * optional uint32 interact_id = 15; + * @return the interactId */ - public int getPropEntityId() { - return propEntityId; + public int getInteractId() { + return interactId; } /** - * optional uint32 prop_entity_id = 15; - * @param value the propEntityId to set + * optional uint32 interact_id = 15; + * @param value the interactId to set * @return this */ - public InteractPropCsReq setPropEntityId(final int value) { + public InteractPropCsReq setInteractId(final int value) { bitField0_ |= 0x00000002; - propEntityId = value; + interactId = value; return this; } @@ -117,8 +117,8 @@ public InteractPropCsReq copyFrom(final InteractPropCsReq other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - interactId = other.interactId; propEntityId = other.propEntityId; + interactId = other.interactId; } return this; } @@ -129,12 +129,12 @@ public InteractPropCsReq mergeFrom(final InteractPropCsReq other) { return this; } cachedSize = -1; - if (other.hasInteractId()) { - setInteractId(other.interactId); - } if (other.hasPropEntityId()) { setPropEntityId(other.propEntityId); } + if (other.hasInteractId()) { + setInteractId(other.interactId); + } return this; } @@ -145,8 +145,8 @@ public InteractPropCsReq clear() { } cachedSize = -1; bitField0_ = 0; - interactId = 0; propEntityId = 0; + interactId = 0; return this; } @@ -170,19 +170,19 @@ public boolean equals(Object o) { } InteractPropCsReq other = (InteractPropCsReq) o; return bitField0_ == other.bitField0_ - && (!hasInteractId() || interactId == other.interactId) - && (!hasPropEntityId() || propEntityId == other.propEntityId); + && (!hasPropEntityId() || propEntityId == other.propEntityId) + && (!hasInteractId() || interactId == other.interactId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 56); - output.writeUInt32NoTag(interactId); + output.writeRawByte((byte) 40); + output.writeUInt32NoTag(propEntityId); } if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 120); - output.writeUInt32NoTag(propEntityId); + output.writeUInt32NoTag(interactId); } } @@ -190,10 +190,10 @@ public void writeTo(final ProtoSink output) throws IOException { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(interactId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(propEntityId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(propEntityId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(interactId); } return size; } @@ -205,9 +205,9 @@ public InteractPropCsReq mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { - // interactId - interactId = input.readUInt32(); + case 40: { + // propEntityId + propEntityId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 120) { @@ -215,8 +215,8 @@ public InteractPropCsReq mergeFrom(final ProtoSource input) throws IOException { } } case 120: { - // propEntityId - propEntityId = input.readUInt32(); + // interactId + interactId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -241,10 +241,10 @@ public InteractPropCsReq mergeFrom(final ProtoSource input) throws IOException { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.interactId, interactId); + output.writeUInt32(FieldNames.propEntityId, propEntityId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.propEntityId, propEntityId); + output.writeUInt32(FieldNames.interactId, interactId); } output.endObject(); } @@ -256,11 +256,11 @@ public InteractPropCsReq mergeFrom(final JsonSource input) throws IOException { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1603081743: - case 1844094916: { - if (input.isAtField(FieldNames.interactId)) { + case -68717343: + case -57484005: { + if (input.isAtField(FieldNames.propEntityId)) { if (!input.trySkipNullValue()) { - interactId = input.readUInt32(); + propEntityId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -268,11 +268,11 @@ public InteractPropCsReq mergeFrom(final JsonSource input) throws IOException { } break; } - case -68717343: - case -57484005: { - if (input.isAtField(FieldNames.propEntityId)) { + case -1603081743: + case 1844094916: { + if (input.isAtField(FieldNames.interactId)) { if (!input.trySkipNullValue()) { - propEntityId = input.readUInt32(); + interactId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -333,9 +333,9 @@ public InteractPropCsReq create() { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName interactId = FieldName.forField("interactId", "interact_id"); - static final FieldName propEntityId = FieldName.forField("propEntityId", "prop_entity_id"); + + static final FieldName interactId = FieldName.forField("interactId", "interact_id"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/InteractPropScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/InteractPropScRspOuterClass.java index 4e2fce52b..f9ecac2be 100644 --- a/src/generated/main/emu/lunarcore/proto/InteractPropScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/InteractPropScRspOuterClass.java @@ -19,19 +19,19 @@ public static final class InteractPropScRsp extends ProtoMessageoptional uint32 prop_state = 3; + * optional uint32 prop_state = 2; */ private int propState; /** - * optional uint32 prop_entity_id = 6; + * optional uint32 retcode = 7; */ - private int propEntityId; + private int retcode; /** - * optional uint32 retcode = 7; + * optional uint32 prop_entity_id = 9; */ - private int retcode; + private int propEntityId; private InteractPropScRsp() { } @@ -44,7 +44,7 @@ public static InteractPropScRsp newInstance() { } /** - * optional uint32 prop_state = 3; + * optional uint32 prop_state = 2; * @return whether the propState field is set */ public boolean hasPropState() { @@ -52,7 +52,7 @@ public boolean hasPropState() { } /** - * optional uint32 prop_state = 3; + * optional uint32 prop_state = 2; * @return this */ public InteractPropScRsp clearPropState() { @@ -62,7 +62,7 @@ public InteractPropScRsp clearPropState() { } /** - * optional uint32 prop_state = 3; + * optional uint32 prop_state = 2; * @return the propState */ public int getPropState() { @@ -70,7 +70,7 @@ public int getPropState() { } /** - * optional uint32 prop_state = 3; + * optional uint32 prop_state = 2; * @param value the propState to set * @return this */ @@ -81,76 +81,76 @@ public InteractPropScRsp setPropState(final int value) { } /** - * optional uint32 prop_entity_id = 6; - * @return whether the propEntityId field is set + * optional uint32 retcode = 7; + * @return whether the retcode field is set */ - public boolean hasPropEntityId() { + public boolean hasRetcode() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 prop_entity_id = 6; + * optional uint32 retcode = 7; * @return this */ - public InteractPropScRsp clearPropEntityId() { + public InteractPropScRsp clearRetcode() { bitField0_ &= ~0x00000002; - propEntityId = 0; + retcode = 0; return this; } /** - * optional uint32 prop_entity_id = 6; - * @return the propEntityId + * optional uint32 retcode = 7; + * @return the retcode */ - public int getPropEntityId() { - return propEntityId; + public int getRetcode() { + return retcode; } /** - * optional uint32 prop_entity_id = 6; - * @param value the propEntityId to set + * optional uint32 retcode = 7; + * @param value the retcode to set * @return this */ - public InteractPropScRsp setPropEntityId(final int value) { + public InteractPropScRsp setRetcode(final int value) { bitField0_ |= 0x00000002; - propEntityId = value; + retcode = value; return this; } /** - * optional uint32 retcode = 7; - * @return whether the retcode field is set + * optional uint32 prop_entity_id = 9; + * @return whether the propEntityId field is set */ - public boolean hasRetcode() { + public boolean hasPropEntityId() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 retcode = 7; + * optional uint32 prop_entity_id = 9; * @return this */ - public InteractPropScRsp clearRetcode() { + public InteractPropScRsp clearPropEntityId() { bitField0_ &= ~0x00000004; - retcode = 0; + propEntityId = 0; return this; } /** - * optional uint32 retcode = 7; - * @return the retcode + * optional uint32 prop_entity_id = 9; + * @return the propEntityId */ - public int getRetcode() { - return retcode; + public int getPropEntityId() { + return propEntityId; } /** - * optional uint32 retcode = 7; - * @param value the retcode to set + * optional uint32 prop_entity_id = 9; + * @param value the propEntityId to set * @return this */ - public InteractPropScRsp setRetcode(final int value) { + public InteractPropScRsp setPropEntityId(final int value) { bitField0_ |= 0x00000004; - retcode = value; + propEntityId = value; return this; } @@ -160,8 +160,8 @@ public InteractPropScRsp copyFrom(final InteractPropScRsp other) { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; propState = other.propState; - propEntityId = other.propEntityId; retcode = other.retcode; + propEntityId = other.propEntityId; } return this; } @@ -175,12 +175,12 @@ public InteractPropScRsp mergeFrom(final InteractPropScRsp other) { if (other.hasPropState()) { setPropState(other.propState); } - if (other.hasPropEntityId()) { - setPropEntityId(other.propEntityId); - } if (other.hasRetcode()) { setRetcode(other.retcode); } + if (other.hasPropEntityId()) { + setPropEntityId(other.propEntityId); + } return this; } @@ -192,8 +192,8 @@ public InteractPropScRsp clear() { cachedSize = -1; bitField0_ = 0; propState = 0; - propEntityId = 0; retcode = 0; + propEntityId = 0; return this; } @@ -218,24 +218,24 @@ public boolean equals(Object o) { InteractPropScRsp other = (InteractPropScRsp) o; return bitField0_ == other.bitField0_ && (!hasPropState() || propState == other.propState) - && (!hasPropEntityId() || propEntityId == other.propEntityId) - && (!hasRetcode() || retcode == other.retcode); + && (!hasRetcode() || retcode == other.retcode) + && (!hasPropEntityId() || propEntityId == other.propEntityId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(propState); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 48); - output.writeUInt32NoTag(propEntityId); - } - if ((bitField0_ & 0x00000004) != 0) { output.writeRawByte((byte) 56); output.writeUInt32NoTag(retcode); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 72); + output.writeUInt32NoTag(propEntityId); + } } @Override @@ -245,10 +245,10 @@ protected int computeSerializedSize() { size += 1 + ProtoSink.computeUInt32SizeNoTag(propState); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(propEntityId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(propEntityId); } return size; } @@ -260,27 +260,27 @@ public InteractPropScRsp mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { + case 16: { // propState propState = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 48) { + if (tag != 56) { break; } } - case 48: { - // propEntityId - propEntityId = input.readUInt32(); + case 56: { + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 56) { + if (tag != 72) { break; } } - case 56: { - // retcode - retcode = input.readUInt32(); + case 72: { + // propEntityId + propEntityId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 0) { @@ -308,10 +308,10 @@ public void writeTo(final JsonSink output) throws IOException { output.writeUInt32(FieldNames.propState, propState); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.propEntityId, propEntityId); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.propEntityId, propEntityId); } output.endObject(); } @@ -335,11 +335,10 @@ public InteractPropScRsp mergeFrom(final JsonSource input) throws IOException { } break; } - case -68717343: - case -57484005: { - if (input.isAtField(FieldNames.propEntityId)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - propEntityId = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -347,10 +346,11 @@ public InteractPropScRsp mergeFrom(final JsonSource input) throws IOException { } break; } - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case -68717343: + case -57484005: { + if (input.isAtField(FieldNames.propEntityId)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + propEntityId = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -413,9 +413,9 @@ public InteractPropScRsp create() { static class FieldNames { static final FieldName propState = FieldName.forField("propState", "prop_state"); - static final FieldName propEntityId = FieldName.forField("propEntityId", "prop_entity_id"); - static final FieldName retcode = FieldName.forField("retcode"); + + static final FieldName propEntityId = FieldName.forField("propEntityId", "prop_entity_id"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/ItemCostListOuterClass.java b/src/generated/main/emu/lunarcore/proto/ItemCostListOuterClass.java index fddb7dc41..7baa98971 100644 --- a/src/generated/main/emu/lunarcore/proto/ItemCostListOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ItemCostListOuterClass.java @@ -20,7 +20,7 @@ public static final class ItemCostList extends ProtoMessage implem private static final long serialVersionUID = 0L; /** - * repeated .ItemCost item_list = 9; + * repeated .ItemCost item_list = 15; */ private final RepeatedMessage itemList = RepeatedMessage.newEmptyInstance(ItemCostOuterClass.ItemCost.getFactory()); @@ -35,7 +35,7 @@ public static ItemCostList newInstance() { } /** - * repeated .ItemCost item_list = 9; + * repeated .ItemCost item_list = 15; * @return whether the itemList field is set */ public boolean hasItemList() { @@ -43,7 +43,7 @@ public boolean hasItemList() { } /** - * repeated .ItemCost item_list = 9; + * repeated .ItemCost item_list = 15; * @return this */ public ItemCostList clearItemList() { @@ -53,7 +53,7 @@ public ItemCostList clearItemList() { } /** - * repeated .ItemCost item_list = 9; + * repeated .ItemCost item_list = 15; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -67,7 +67,7 @@ public RepeatedMessage getItemList() { } /** - * repeated .ItemCost item_list = 9; + * repeated .ItemCost item_list = 15; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -81,7 +81,7 @@ public RepeatedMessage getMutableItemList() { } /** - * repeated .ItemCost item_list = 9; + * repeated .ItemCost item_list = 15; * @param value the itemList to add * @return this */ @@ -92,7 +92,7 @@ public ItemCostList addItemList(final ItemCostOuterClass.ItemCost value) { } /** - * repeated .ItemCost item_list = 9; + * repeated .ItemCost item_list = 15; * @param values the itemList to add * @return this */ @@ -163,7 +163,7 @@ public boolean equals(Object o) { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { for (int i = 0; i < itemList.length(); i++) { - output.writeRawByte((byte) 74); + output.writeRawByte((byte) 122); output.writeMessageNoTag(itemList.get(i)); } } @@ -185,7 +185,7 @@ public ItemCostList mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 74: { + case 122: { // itemList tag = input.readRepeatedMessage(itemList, tag); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/ItemCostOuterClass.java b/src/generated/main/emu/lunarcore/proto/ItemCostOuterClass.java index f62cf1b9f..7e678fe68 100644 --- a/src/generated/main/emu/lunarcore/proto/ItemCostOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ItemCostOuterClass.java @@ -19,19 +19,19 @@ public static final class ItemCost extends ProtoMessage implements Clo private static final long serialVersionUID = 0L; /** - * optional uint32 equipment_unique_id = 2; + * optional uint32 relic_unique_id = 3; */ - private int equipmentUniqueId; + private int relicUniqueId; /** - * optional uint32 relic_unique_id = 13; + * optional uint32 equipment_unique_id = 13; */ - private int relicUniqueId; + private int equipmentUniqueId; /** - * optional .PileItem pile_item = 6; + * optional .PileItem pile_item = 12; */ - private final PileItem pileItem = PileItem.newInstance(); + private final PileItemOuterClass.PileItem pileItem = PileItemOuterClass.PileItem.newInstance(); private ItemCost() { } @@ -44,81 +44,81 @@ public static ItemCost newInstance() { } /** - * optional uint32 equipment_unique_id = 2; - * @return whether the equipmentUniqueId field is set + * optional uint32 relic_unique_id = 3; + * @return whether the relicUniqueId field is set */ - public boolean hasEquipmentUniqueId() { + public boolean hasRelicUniqueId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 equipment_unique_id = 2; + * optional uint32 relic_unique_id = 3; * @return this */ - public ItemCost clearEquipmentUniqueId() { + public ItemCost clearRelicUniqueId() { bitField0_ &= ~0x00000001; - equipmentUniqueId = 0; + relicUniqueId = 0; return this; } /** - * optional uint32 equipment_unique_id = 2; - * @return the equipmentUniqueId + * optional uint32 relic_unique_id = 3; + * @return the relicUniqueId */ - public int getEquipmentUniqueId() { - return equipmentUniqueId; + public int getRelicUniqueId() { + return relicUniqueId; } /** - * optional uint32 equipment_unique_id = 2; - * @param value the equipmentUniqueId to set + * optional uint32 relic_unique_id = 3; + * @param value the relicUniqueId to set * @return this */ - public ItemCost setEquipmentUniqueId(final int value) { + public ItemCost setRelicUniqueId(final int value) { bitField0_ |= 0x00000001; - equipmentUniqueId = value; + relicUniqueId = value; return this; } /** - * optional uint32 relic_unique_id = 13; - * @return whether the relicUniqueId field is set + * optional uint32 equipment_unique_id = 13; + * @return whether the equipmentUniqueId field is set */ - public boolean hasRelicUniqueId() { + public boolean hasEquipmentUniqueId() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 relic_unique_id = 13; + * optional uint32 equipment_unique_id = 13; * @return this */ - public ItemCost clearRelicUniqueId() { + public ItemCost clearEquipmentUniqueId() { bitField0_ &= ~0x00000002; - relicUniqueId = 0; + equipmentUniqueId = 0; return this; } /** - * optional uint32 relic_unique_id = 13; - * @return the relicUniqueId + * optional uint32 equipment_unique_id = 13; + * @return the equipmentUniqueId */ - public int getRelicUniqueId() { - return relicUniqueId; + public int getEquipmentUniqueId() { + return equipmentUniqueId; } /** - * optional uint32 relic_unique_id = 13; - * @param value the relicUniqueId to set + * optional uint32 equipment_unique_id = 13; + * @param value the equipmentUniqueId to set * @return this */ - public ItemCost setRelicUniqueId(final int value) { + public ItemCost setEquipmentUniqueId(final int value) { bitField0_ |= 0x00000002; - relicUniqueId = value; + equipmentUniqueId = value; return this; } /** - * optional .PileItem pile_item = 6; + * optional .PileItem pile_item = 12; * @return whether the pileItem field is set */ public boolean hasPileItem() { @@ -126,7 +126,7 @@ public boolean hasPileItem() { } /** - * optional .PileItem pile_item = 6; + * optional .PileItem pile_item = 12; * @return this */ public ItemCost clearPileItem() { @@ -136,7 +136,7 @@ public ItemCost clearPileItem() { } /** - * optional .PileItem pile_item = 6; + * optional .PileItem pile_item = 12; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -145,12 +145,12 @@ public ItemCost clearPileItem() { * * @return internal storage object for reading */ - public PileItem getPileItem() { + public PileItemOuterClass.PileItem getPileItem() { return pileItem; } /** - * optional .PileItem pile_item = 6; + * optional .PileItem pile_item = 12; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -158,17 +158,17 @@ public PileItem getPileItem() { * * @return internal storage object for modifications */ - public PileItem getMutablePileItem() { + public PileItemOuterClass.PileItem getMutablePileItem() { bitField0_ |= 0x00000004; return pileItem; } /** - * optional .PileItem pile_item = 6; + * optional .PileItem pile_item = 12; * @param value the pileItem to set * @return this */ - public ItemCost setPileItem(final PileItem value) { + public ItemCost setPileItem(final PileItemOuterClass.PileItem value) { bitField0_ |= 0x00000004; pileItem.copyFrom(value); return this; @@ -179,8 +179,8 @@ public ItemCost copyFrom(final ItemCost other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - equipmentUniqueId = other.equipmentUniqueId; relicUniqueId = other.relicUniqueId; + equipmentUniqueId = other.equipmentUniqueId; pileItem.copyFrom(other.pileItem); } return this; @@ -192,12 +192,12 @@ public ItemCost mergeFrom(final ItemCost other) { return this; } cachedSize = -1; - if (other.hasEquipmentUniqueId()) { - setEquipmentUniqueId(other.equipmentUniqueId); - } if (other.hasRelicUniqueId()) { setRelicUniqueId(other.relicUniqueId); } + if (other.hasEquipmentUniqueId()) { + setEquipmentUniqueId(other.equipmentUniqueId); + } if (other.hasPileItem()) { getMutablePileItem().mergeFrom(other.pileItem); } @@ -211,8 +211,8 @@ public ItemCost clear() { } cachedSize = -1; bitField0_ = 0; - equipmentUniqueId = 0; relicUniqueId = 0; + equipmentUniqueId = 0; pileItem.clear(); return this; } @@ -238,23 +238,23 @@ public boolean equals(Object o) { } ItemCost other = (ItemCost) o; return bitField0_ == other.bitField0_ - && (!hasEquipmentUniqueId() || equipmentUniqueId == other.equipmentUniqueId) && (!hasRelicUniqueId() || relicUniqueId == other.relicUniqueId) + && (!hasEquipmentUniqueId() || equipmentUniqueId == other.equipmentUniqueId) && (!hasPileItem() || pileItem.equals(other.pileItem)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); - output.writeUInt32NoTag(equipmentUniqueId); + output.writeRawByte((byte) 24); + output.writeUInt32NoTag(relicUniqueId); } if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 104); - output.writeUInt32NoTag(relicUniqueId); + output.writeUInt32NoTag(equipmentUniqueId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 50); + output.writeRawByte((byte) 98); output.writeMessageNoTag(pileItem); } } @@ -263,10 +263,10 @@ public void writeTo(final ProtoSink output) throws IOException { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(equipmentUniqueId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(relicUniqueId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(relicUniqueId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(equipmentUniqueId); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(pileItem); @@ -281,9 +281,9 @@ public ItemCost mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { - // equipmentUniqueId - equipmentUniqueId = input.readUInt32(); + case 24: { + // relicUniqueId + relicUniqueId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 104) { @@ -291,15 +291,15 @@ public ItemCost mergeFrom(final ProtoSource input) throws IOException { } } case 104: { - // relicUniqueId - relicUniqueId = input.readUInt32(); + // equipmentUniqueId + equipmentUniqueId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 50) { + if (tag != 98) { break; } } - case 50: { + case 98: { // pileItem input.readMessage(pileItem); bitField0_ |= 0x00000004; @@ -326,10 +326,10 @@ public ItemCost mergeFrom(final ProtoSource input) throws IOException { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.equipmentUniqueId, equipmentUniqueId); + output.writeUInt32(FieldNames.relicUniqueId, relicUniqueId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.relicUniqueId, relicUniqueId); + output.writeUInt32(FieldNames.equipmentUniqueId, equipmentUniqueId); } if ((bitField0_ & 0x00000004) != 0) { output.writeMessage(FieldNames.pileItem, pileItem); @@ -344,11 +344,11 @@ public ItemCost mergeFrom(final JsonSource input) throws IOException { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1867136902: - case 760467160: { - if (input.isAtField(FieldNames.equipmentUniqueId)) { + case -1966200481: + case 49648253: { + if (input.isAtField(FieldNames.relicUniqueId)) { if (!input.trySkipNullValue()) { - equipmentUniqueId = input.readUInt32(); + relicUniqueId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -356,11 +356,11 @@ public ItemCost mergeFrom(final JsonSource input) throws IOException { } break; } - case -1966200481: - case 49648253: { - if (input.isAtField(FieldNames.relicUniqueId)) { + case -1867136902: + case 760467160: { + if (input.isAtField(FieldNames.equipmentUniqueId)) { if (!input.trySkipNullValue()) { - relicUniqueId = input.readUInt32(); + equipmentUniqueId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -432,337 +432,11 @@ public ItemCost create() { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName equipmentUniqueId = FieldName.forField("equipmentUniqueId", "equipment_unique_id"); - static final FieldName relicUniqueId = FieldName.forField("relicUniqueId", "relic_unique_id"); - static final FieldName pileItem = FieldName.forField("pileItem", "pile_item"); - } - } - - /** - * Protobuf type {@code PileItem} - */ - public static final class PileItem extends ProtoMessage implements Cloneable { - private static final long serialVersionUID = 0L; - - /** - * optional uint32 item_id = 10; - */ - private int itemId; - - /** - * optional uint32 item_num = 12; - */ - private int itemNum; - - private PileItem() { - } - - /** - * @return a new empty instance of {@code PileItem} - */ - public static PileItem newInstance() { - return new PileItem(); - } - - /** - * optional uint32 item_id = 10; - * @return whether the itemId field is set - */ - public boolean hasItemId() { - return (bitField0_ & 0x00000001) != 0; - } - - /** - * optional uint32 item_id = 10; - * @return this - */ - public PileItem clearItemId() { - bitField0_ &= ~0x00000001; - itemId = 0; - return this; - } - - /** - * optional uint32 item_id = 10; - * @return the itemId - */ - public int getItemId() { - return itemId; - } - - /** - * optional uint32 item_id = 10; - * @param value the itemId to set - * @return this - */ - public PileItem setItemId(final int value) { - bitField0_ |= 0x00000001; - itemId = value; - return this; - } - - /** - * optional uint32 item_num = 12; - * @return whether the itemNum field is set - */ - public boolean hasItemNum() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 item_num = 12; - * @return this - */ - public PileItem clearItemNum() { - bitField0_ &= ~0x00000002; - itemNum = 0; - return this; - } - - /** - * optional uint32 item_num = 12; - * @return the itemNum - */ - public int getItemNum() { - return itemNum; - } - - /** - * optional uint32 item_num = 12; - * @param value the itemNum to set - * @return this - */ - public PileItem setItemNum(final int value) { - bitField0_ |= 0x00000002; - itemNum = value; - return this; - } - - @Override - public PileItem copyFrom(final PileItem other) { - cachedSize = other.cachedSize; - if ((bitField0_ | other.bitField0_) != 0) { - bitField0_ = other.bitField0_; - itemId = other.itemId; - itemNum = other.itemNum; - } - return this; - } - - @Override - public PileItem mergeFrom(final PileItem other) { - if (other.isEmpty()) { - return this; - } - cachedSize = -1; - if (other.hasItemId()) { - setItemId(other.itemId); - } - if (other.hasItemNum()) { - setItemNum(other.itemNum); - } - return this; - } - - @Override - public PileItem clear() { - if (isEmpty()) { - return this; - } - cachedSize = -1; - bitField0_ = 0; - itemId = 0; - itemNum = 0; - return this; - } - - @Override - public PileItem clearQuick() { - if (isEmpty()) { - return this; - } - cachedSize = -1; - bitField0_ = 0; - return this; - } - - @Override - public boolean equals(Object o) { - if (o == this) { - return true; - } - if (!(o instanceof PileItem)) { - return false; - } - PileItem other = (PileItem) o; - return bitField0_ == other.bitField0_ - && (!hasItemId() || itemId == other.itemId) - && (!hasItemNum() || itemNum == other.itemNum); - } - - @Override - public void writeTo(final ProtoSink output) throws IOException { - if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 80); - output.writeUInt32NoTag(itemId); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 96); - output.writeUInt32NoTag(itemNum); - } - } - - @Override - protected int computeSerializedSize() { - int size = 0; - if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(itemId); - } - if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(itemNum); - } - return size; - } - - @Override - @SuppressWarnings("fallthrough") - public PileItem mergeFrom(final ProtoSource input) throws IOException { - // Enabled Fall-Through Optimization (QuickBuffers) - int tag = input.readTag(); - while (true) { - switch (tag) { - case 80: { - // itemId - itemId = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 96) { - break; - } - } - case 96: { - // itemNum - itemNum = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 0) { - break; - } - } - case 0: { - return this; - } - default: { - if (!input.skipField(tag)) { - return this; - } - tag = input.readTag(); - break; - } - } - } - } - - @Override - public void writeTo(final JsonSink output) throws IOException { - output.beginObject(); - if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.itemId, itemId); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.itemNum, itemNum); - } - output.endObject(); - } - - @Override - public PileItem mergeFrom(final JsonSource input) throws IOException { - if (!input.beginObject()) { - return this; - } - while (!input.isAtEnd()) { - switch (input.readFieldHash()) { - case -1178662002: - case 2116204999: { - if (input.isAtField(FieldNames.itemId)) { - if (!input.trySkipNullValue()) { - itemId = input.readUInt32(); - bitField0_ |= 0x00000001; - } - } else { - input.skipUnknownField(); - } - break; - } - case 2116189043: - case 1177850970: { - if (input.isAtField(FieldNames.itemNum)) { - if (!input.trySkipNullValue()) { - itemNum = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } - default: { - input.skipUnknownField(); - break; - } - } - } - input.endObject(); - return this; - } - - @Override - public PileItem clone() { - return new PileItem().copyFrom(this); - } - - @Override - public boolean isEmpty() { - return ((bitField0_) == 0); - } - - public static PileItem parseFrom(final byte[] data) throws InvalidProtocolBufferException { - return ProtoMessage.mergeFrom(new PileItem(), data).checkInitialized(); - } - - public static PileItem parseFrom(final ProtoSource input) throws IOException { - return ProtoMessage.mergeFrom(new PileItem(), input).checkInitialized(); - } - - public static PileItem parseFrom(final JsonSource input) throws IOException { - return ProtoMessage.mergeFrom(new PileItem(), input).checkInitialized(); - } - - /** - * @return factory for creating PileItem messages - */ - public static MessageFactory getFactory() { - return PileItemFactory.INSTANCE; - } - - private enum PileItemFactory implements MessageFactory { - INSTANCE; - - @Override - public PileItem create() { - return PileItem.newInstance(); - } - } - - /** - * Contains name constants used for serializing JSON - */ - static class FieldNames { - static final FieldName itemId = FieldName.forField("itemId", "item_id"); + static final FieldName equipmentUniqueId = FieldName.forField("equipmentUniqueId", "equipment_unique_id"); - static final FieldName itemNum = FieldName.forField("itemNum", "item_num"); + static final FieldName pileItem = FieldName.forField("pileItem", "pile_item"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/ItemListOuterClass.java b/src/generated/main/emu/lunarcore/proto/ItemListOuterClass.java index 578734d1e..09de41161 100644 --- a/src/generated/main/emu/lunarcore/proto/ItemListOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ItemListOuterClass.java @@ -20,7 +20,7 @@ public static final class ItemList extends ProtoMessage implements Clo private static final long serialVersionUID = 0L; /** - * repeated .Item item_list = 13; + * repeated .Item item_list = 14; */ private final RepeatedMessage itemList = RepeatedMessage.newEmptyInstance(ItemOuterClass.Item.getFactory()); @@ -35,7 +35,7 @@ public static ItemList newInstance() { } /** - * repeated .Item item_list = 13; + * repeated .Item item_list = 14; * @return whether the itemList field is set */ public boolean hasItemList() { @@ -43,7 +43,7 @@ public boolean hasItemList() { } /** - * repeated .Item item_list = 13; + * repeated .Item item_list = 14; * @return this */ public ItemList clearItemList() { @@ -53,7 +53,7 @@ public ItemList clearItemList() { } /** - * repeated .Item item_list = 13; + * repeated .Item item_list = 14; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -67,7 +67,7 @@ public RepeatedMessage getItemList() { } /** - * repeated .Item item_list = 13; + * repeated .Item item_list = 14; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -81,7 +81,7 @@ public RepeatedMessage getMutableItemList() { } /** - * repeated .Item item_list = 13; + * repeated .Item item_list = 14; * @param value the itemList to add * @return this */ @@ -92,7 +92,7 @@ public ItemList addItemList(final ItemOuterClass.Item value) { } /** - * repeated .Item item_list = 13; + * repeated .Item item_list = 14; * @param values the itemList to add * @return this */ @@ -163,7 +163,7 @@ public boolean equals(Object o) { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { for (int i = 0; i < itemList.length(); i++) { - output.writeRawByte((byte) 106); + output.writeRawByte((byte) 114); output.writeMessageNoTag(itemList.get(i)); } } @@ -185,7 +185,7 @@ public ItemList mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 106: { + case 114: { // itemList tag = input.readRepeatedMessage(itemList, tag); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/ItemOuterClass.java b/src/generated/main/emu/lunarcore/proto/ItemOuterClass.java index c56e1d6cb..c55300c67 100644 --- a/src/generated/main/emu/lunarcore/proto/ItemOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ItemOuterClass.java @@ -19,9 +19,9 @@ public static final class Item extends ProtoMessage implements Cloneable { private static final long serialVersionUID = 0L; /** - * optional uint32 num = 4; + * optional uint32 main_affix_id = 4; */ - private int num; + private int mainAffixId; /** * optional uint32 unique_id = 5; @@ -29,29 +29,29 @@ public static final class Item extends ProtoMessage implements Cloneable { private int uniqueId; /** - * optional uint32 level = 6; + * optional uint32 item_id = 6; */ - private int level; + private int itemId; /** - * optional uint32 promotion = 8; + * optional uint32 num = 11; */ - private int promotion; + private int num; /** - * optional uint32 main_affix_id = 11; + * optional uint32 level = 13; */ - private int mainAffixId; + private int level; /** - * optional uint32 item_id = 13; + * optional uint32 rank = 14; */ - private int itemId; + private int rank; /** - * optional uint32 rank = 15; + * optional uint32 promotion = 15; */ - private int rank; + private int promotion; private Item() { } @@ -64,39 +64,39 @@ public static Item newInstance() { } /** - * optional uint32 num = 4; - * @return whether the num field is set + * optional uint32 main_affix_id = 4; + * @return whether the mainAffixId field is set */ - public boolean hasNum() { + public boolean hasMainAffixId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 num = 4; + * optional uint32 main_affix_id = 4; * @return this */ - public Item clearNum() { + public Item clearMainAffixId() { bitField0_ &= ~0x00000001; - num = 0; + mainAffixId = 0; return this; } /** - * optional uint32 num = 4; - * @return the num + * optional uint32 main_affix_id = 4; + * @return the mainAffixId */ - public int getNum() { - return num; + public int getMainAffixId() { + return mainAffixId; } /** - * optional uint32 num = 4; - * @param value the num to set + * optional uint32 main_affix_id = 4; + * @param value the mainAffixId to set * @return this */ - public Item setNum(final int value) { + public Item setMainAffixId(final int value) { bitField0_ |= 0x00000001; - num = value; + mainAffixId = value; return this; } @@ -138,187 +138,187 @@ public Item setUniqueId(final int value) { } /** - * optional uint32 level = 6; - * @return whether the level field is set + * optional uint32 item_id = 6; + * @return whether the itemId field is set */ - public boolean hasLevel() { + public boolean hasItemId() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 level = 6; + * optional uint32 item_id = 6; * @return this */ - public Item clearLevel() { + public Item clearItemId() { bitField0_ &= ~0x00000004; - level = 0; + itemId = 0; return this; } /** - * optional uint32 level = 6; - * @return the level + * optional uint32 item_id = 6; + * @return the itemId */ - public int getLevel() { - return level; + public int getItemId() { + return itemId; } /** - * optional uint32 level = 6; - * @param value the level to set + * optional uint32 item_id = 6; + * @param value the itemId to set * @return this */ - public Item setLevel(final int value) { + public Item setItemId(final int value) { bitField0_ |= 0x00000004; - level = value; + itemId = value; return this; } /** - * optional uint32 promotion = 8; - * @return whether the promotion field is set + * optional uint32 num = 11; + * @return whether the num field is set */ - public boolean hasPromotion() { + public boolean hasNum() { return (bitField0_ & 0x00000008) != 0; } /** - * optional uint32 promotion = 8; + * optional uint32 num = 11; * @return this */ - public Item clearPromotion() { + public Item clearNum() { bitField0_ &= ~0x00000008; - promotion = 0; + num = 0; return this; } /** - * optional uint32 promotion = 8; - * @return the promotion + * optional uint32 num = 11; + * @return the num */ - public int getPromotion() { - return promotion; + public int getNum() { + return num; } /** - * optional uint32 promotion = 8; - * @param value the promotion to set + * optional uint32 num = 11; + * @param value the num to set * @return this */ - public Item setPromotion(final int value) { + public Item setNum(final int value) { bitField0_ |= 0x00000008; - promotion = value; + num = value; return this; } /** - * optional uint32 main_affix_id = 11; - * @return whether the mainAffixId field is set + * optional uint32 level = 13; + * @return whether the level field is set */ - public boolean hasMainAffixId() { + public boolean hasLevel() { return (bitField0_ & 0x00000010) != 0; } /** - * optional uint32 main_affix_id = 11; + * optional uint32 level = 13; * @return this */ - public Item clearMainAffixId() { + public Item clearLevel() { bitField0_ &= ~0x00000010; - mainAffixId = 0; + level = 0; return this; } /** - * optional uint32 main_affix_id = 11; - * @return the mainAffixId + * optional uint32 level = 13; + * @return the level */ - public int getMainAffixId() { - return mainAffixId; + public int getLevel() { + return level; } /** - * optional uint32 main_affix_id = 11; - * @param value the mainAffixId to set + * optional uint32 level = 13; + * @param value the level to set * @return this */ - public Item setMainAffixId(final int value) { + public Item setLevel(final int value) { bitField0_ |= 0x00000010; - mainAffixId = value; + level = value; return this; } /** - * optional uint32 item_id = 13; - * @return whether the itemId field is set + * optional uint32 rank = 14; + * @return whether the rank field is set */ - public boolean hasItemId() { + public boolean hasRank() { return (bitField0_ & 0x00000020) != 0; } /** - * optional uint32 item_id = 13; + * optional uint32 rank = 14; * @return this */ - public Item clearItemId() { + public Item clearRank() { bitField0_ &= ~0x00000020; - itemId = 0; + rank = 0; return this; } /** - * optional uint32 item_id = 13; - * @return the itemId + * optional uint32 rank = 14; + * @return the rank */ - public int getItemId() { - return itemId; + public int getRank() { + return rank; } /** - * optional uint32 item_id = 13; - * @param value the itemId to set + * optional uint32 rank = 14; + * @param value the rank to set * @return this */ - public Item setItemId(final int value) { + public Item setRank(final int value) { bitField0_ |= 0x00000020; - itemId = value; + rank = value; return this; } /** - * optional uint32 rank = 15; - * @return whether the rank field is set + * optional uint32 promotion = 15; + * @return whether the promotion field is set */ - public boolean hasRank() { + public boolean hasPromotion() { return (bitField0_ & 0x00000040) != 0; } /** - * optional uint32 rank = 15; + * optional uint32 promotion = 15; * @return this */ - public Item clearRank() { + public Item clearPromotion() { bitField0_ &= ~0x00000040; - rank = 0; + promotion = 0; return this; } /** - * optional uint32 rank = 15; - * @return the rank + * optional uint32 promotion = 15; + * @return the promotion */ - public int getRank() { - return rank; + public int getPromotion() { + return promotion; } /** - * optional uint32 rank = 15; - * @param value the rank to set + * optional uint32 promotion = 15; + * @param value the promotion to set * @return this */ - public Item setRank(final int value) { + public Item setPromotion(final int value) { bitField0_ |= 0x00000040; - rank = value; + promotion = value; return this; } @@ -327,13 +327,13 @@ public Item copyFrom(final Item other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - num = other.num; - uniqueId = other.uniqueId; - level = other.level; - promotion = other.promotion; mainAffixId = other.mainAffixId; + uniqueId = other.uniqueId; itemId = other.itemId; + num = other.num; + level = other.level; rank = other.rank; + promotion = other.promotion; } return this; } @@ -344,27 +344,27 @@ public Item mergeFrom(final Item other) { return this; } cachedSize = -1; - if (other.hasNum()) { - setNum(other.num); + if (other.hasMainAffixId()) { + setMainAffixId(other.mainAffixId); } if (other.hasUniqueId()) { setUniqueId(other.uniqueId); } - if (other.hasLevel()) { - setLevel(other.level); - } - if (other.hasPromotion()) { - setPromotion(other.promotion); - } - if (other.hasMainAffixId()) { - setMainAffixId(other.mainAffixId); - } if (other.hasItemId()) { setItemId(other.itemId); } + if (other.hasNum()) { + setNum(other.num); + } + if (other.hasLevel()) { + setLevel(other.level); + } if (other.hasRank()) { setRank(other.rank); } + if (other.hasPromotion()) { + setPromotion(other.promotion); + } return this; } @@ -375,13 +375,13 @@ public Item clear() { } cachedSize = -1; bitField0_ = 0; - num = 0; - uniqueId = 0; - level = 0; - promotion = 0; mainAffixId = 0; + uniqueId = 0; itemId = 0; + num = 0; + level = 0; rank = 0; + promotion = 0; return this; } @@ -405,20 +405,20 @@ public boolean equals(Object o) { } Item other = (Item) o; return bitField0_ == other.bitField0_ - && (!hasNum() || num == other.num) - && (!hasUniqueId() || uniqueId == other.uniqueId) - && (!hasLevel() || level == other.level) - && (!hasPromotion() || promotion == other.promotion) && (!hasMainAffixId() || mainAffixId == other.mainAffixId) + && (!hasUniqueId() || uniqueId == other.uniqueId) && (!hasItemId() || itemId == other.itemId) - && (!hasRank() || rank == other.rank); + && (!hasNum() || num == other.num) + && (!hasLevel() || level == other.level) + && (!hasRank() || rank == other.rank) + && (!hasPromotion() || promotion == other.promotion); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { output.writeRawByte((byte) 32); - output.writeUInt32NoTag(num); + output.writeUInt32NoTag(mainAffixId); } if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 40); @@ -426,23 +426,23 @@ public void writeTo(final ProtoSink output) throws IOException { } if ((bitField0_ & 0x00000004) != 0) { output.writeRawByte((byte) 48); - output.writeUInt32NoTag(level); + output.writeUInt32NoTag(itemId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 64); - output.writeUInt32NoTag(promotion); + output.writeRawByte((byte) 88); + output.writeUInt32NoTag(num); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 88); - output.writeUInt32NoTag(mainAffixId); + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(level); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 104); - output.writeUInt32NoTag(itemId); + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(rank); } if ((bitField0_ & 0x00000040) != 0) { output.writeRawByte((byte) 120); - output.writeUInt32NoTag(rank); + output.writeUInt32NoTag(promotion); } } @@ -450,25 +450,25 @@ public void writeTo(final ProtoSink output) throws IOException { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(num); + size += 1 + ProtoSink.computeUInt32SizeNoTag(mainAffixId); } if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(uniqueId); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(level); + size += 1 + ProtoSink.computeUInt32SizeNoTag(itemId); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(promotion); + size += 1 + ProtoSink.computeUInt32SizeNoTag(num); } if ((bitField0_ & 0x00000010) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(mainAffixId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(level); } if ((bitField0_ & 0x00000020) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(itemId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(rank); } if ((bitField0_ & 0x00000040) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(rank); + size += 1 + ProtoSink.computeUInt32SizeNoTag(promotion); } return size; } @@ -481,8 +481,8 @@ public Item mergeFrom(final ProtoSource input) throws IOException { while (true) { switch (tag) { case 32: { - // num - num = input.readUInt32(); + // mainAffixId + mainAffixId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 40) { @@ -499,35 +499,35 @@ public Item mergeFrom(final ProtoSource input) throws IOException { } } case 48: { - // level - level = input.readUInt32(); + // itemId + itemId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 64) { + if (tag != 88) { break; } } - case 64: { - // promotion - promotion = input.readUInt32(); + case 88: { + // num + num = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 88) { + if (tag != 104) { break; } } - case 88: { - // mainAffixId - mainAffixId = input.readUInt32(); + case 104: { + // level + level = input.readUInt32(); bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 104) { + if (tag != 112) { break; } } - case 104: { - // itemId - itemId = input.readUInt32(); + case 112: { + // rank + rank = input.readUInt32(); bitField0_ |= 0x00000020; tag = input.readTag(); if (tag != 120) { @@ -535,8 +535,8 @@ public Item mergeFrom(final ProtoSource input) throws IOException { } } case 120: { - // rank - rank = input.readUInt32(); + // promotion + promotion = input.readUInt32(); bitField0_ |= 0x00000040; tag = input.readTag(); if (tag != 0) { @@ -561,25 +561,25 @@ public Item mergeFrom(final ProtoSource input) throws IOException { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.num, num); + output.writeUInt32(FieldNames.mainAffixId, mainAffixId); } if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.uniqueId, uniqueId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.level, level); + output.writeUInt32(FieldNames.itemId, itemId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.promotion, promotion); + output.writeUInt32(FieldNames.num, num); } if ((bitField0_ & 0x00000010) != 0) { - output.writeUInt32(FieldNames.mainAffixId, mainAffixId); + output.writeUInt32(FieldNames.level, level); } if ((bitField0_ & 0x00000020) != 0) { - output.writeUInt32(FieldNames.itemId, itemId); + output.writeUInt32(FieldNames.rank, rank); } if ((bitField0_ & 0x00000040) != 0) { - output.writeUInt32(FieldNames.rank, rank); + output.writeUInt32(FieldNames.promotion, promotion); } output.endObject(); } @@ -591,10 +591,11 @@ public Item mergeFrom(final JsonSource input) throws IOException { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 109446: { - if (input.isAtField(FieldNames.num)) { + case -1973876974: + case -1426712144: { + if (input.isAtField(FieldNames.mainAffixId)) { if (!input.trySkipNullValue()) { - num = input.readUInt32(); + mainAffixId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -614,10 +615,11 @@ public Item mergeFrom(final JsonSource input) throws IOException { } break; } - case 102865796: { - if (input.isAtField(FieldNames.level)) { + case -1178662002: + case 2116204999: { + if (input.isAtField(FieldNames.itemId)) { if (!input.trySkipNullValue()) { - level = input.readUInt32(); + itemId = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -625,10 +627,10 @@ public Item mergeFrom(final JsonSource input) throws IOException { } break; } - case -799212381: { - if (input.isAtField(FieldNames.promotion)) { + case 109446: { + if (input.isAtField(FieldNames.num)) { if (!input.trySkipNullValue()) { - promotion = input.readUInt32(); + num = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -636,11 +638,10 @@ public Item mergeFrom(final JsonSource input) throws IOException { } break; } - case -1973876974: - case -1426712144: { - if (input.isAtField(FieldNames.mainAffixId)) { + case 102865796: { + if (input.isAtField(FieldNames.level)) { if (!input.trySkipNullValue()) { - mainAffixId = input.readUInt32(); + level = input.readUInt32(); bitField0_ |= 0x00000010; } } else { @@ -648,11 +649,10 @@ public Item mergeFrom(final JsonSource input) throws IOException { } break; } - case -1178662002: - case 2116204999: { - if (input.isAtField(FieldNames.itemId)) { + case 3492908: { + if (input.isAtField(FieldNames.rank)) { if (!input.trySkipNullValue()) { - itemId = input.readUInt32(); + rank = input.readUInt32(); bitField0_ |= 0x00000020; } } else { @@ -660,10 +660,10 @@ public Item mergeFrom(final JsonSource input) throws IOException { } break; } - case 3492908: { - if (input.isAtField(FieldNames.rank)) { + case -799212381: { + if (input.isAtField(FieldNames.promotion)) { if (!input.trySkipNullValue()) { - rank = input.readUInt32(); + promotion = input.readUInt32(); bitField0_ |= 0x00000040; } } else { @@ -723,19 +723,19 @@ public Item create() { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName num = FieldName.forField("num"); + static final FieldName mainAffixId = FieldName.forField("mainAffixId", "main_affix_id"); static final FieldName uniqueId = FieldName.forField("uniqueId", "unique_id"); - static final FieldName level = FieldName.forField("level"); - - static final FieldName promotion = FieldName.forField("promotion"); + static final FieldName itemId = FieldName.forField("itemId", "item_id"); - static final FieldName mainAffixId = FieldName.forField("mainAffixId", "main_affix_id"); + static final FieldName num = FieldName.forField("num"); - static final FieldName itemId = FieldName.forField("itemId", "item_id"); + static final FieldName level = FieldName.forField("level"); static final FieldName rank = FieldName.forField("rank"); + + static final FieldName promotion = FieldName.forField("promotion"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/JHAHJFNNGHIOuterClass.java b/src/generated/main/emu/lunarcore/proto/JHAHJFNNGHIOuterClass.java deleted file mode 100644 index 52ae8687c..000000000 --- a/src/generated/main/emu/lunarcore/proto/JHAHJFNNGHIOuterClass.java +++ /dev/null @@ -1,600 +0,0 @@ -// Code generated by protocol buffer compiler. Do not edit! -package emu.lunarcore.proto; - -import java.io.IOException; -import us.hebi.quickbuf.FieldName; -import us.hebi.quickbuf.InvalidProtocolBufferException; -import us.hebi.quickbuf.JsonSink; -import us.hebi.quickbuf.JsonSource; -import us.hebi.quickbuf.MessageFactory; -import us.hebi.quickbuf.ProtoMessage; -import us.hebi.quickbuf.ProtoSink; -import us.hebi.quickbuf.ProtoSource; -import us.hebi.quickbuf.RepeatedInt; - -public final class JHAHJFNNGHIOuterClass { - /** - * Protobuf type {@code JHAHJFNNGHI} - */ - public static final class JHAHJFNNGHI extends ProtoMessage implements Cloneable { - private static final long serialVersionUID = 0L; - - /** - * 
-     *  3
-     *
- * - * optional uint32 JPEBPGIEGPO = 14; - */ - private int jPEBPGIEGPO; - - /** - * 
-     *  9
-     *
- * - * optional uint32 OIJBOCHMDKA = 15; - */ - private int oIJBOCHMDKA; - - /** - * 
-     *  true
-     *
- * - * optional bool CGAFFPHCNEA = 1; - */ - private boolean cGAFFPHCNEA; - - /** - * repeated uint32 maze_unlocked = 8; - */ - private final RepeatedInt mazeUnlocked = RepeatedInt.newEmptyInstance(); - - private JHAHJFNNGHI() { - } - - /** - * @return a new empty instance of {@code JHAHJFNNGHI} - */ - public static JHAHJFNNGHI newInstance() { - return new JHAHJFNNGHI(); - } - - /** - * 
-     *  3
-     *
- * - * optional uint32 JPEBPGIEGPO = 14; - * @return whether the jPEBPGIEGPO field is set - */ - public boolean hasJPEBPGIEGPO() { - return (bitField0_ & 0x00000001) != 0; - } - - /** - * 
-     *  3
-     *
- * - * optional uint32 JPEBPGIEGPO = 14; - * @return this - */ - public JHAHJFNNGHI clearJPEBPGIEGPO() { - bitField0_ &= ~0x00000001; - jPEBPGIEGPO = 0; - return this; - } - - /** - * 
-     *  3
-     *
- * - * optional uint32 JPEBPGIEGPO = 14; - * @return the jPEBPGIEGPO - */ - public int getJPEBPGIEGPO() { - return jPEBPGIEGPO; - } - - /** - * 
-     *  3
-     *
- * - * optional uint32 JPEBPGIEGPO = 14; - * @param value the jPEBPGIEGPO to set - * @return this - */ - public JHAHJFNNGHI setJPEBPGIEGPO(final int value) { - bitField0_ |= 0x00000001; - jPEBPGIEGPO = value; - return this; - } - - /** - * 
-     *  9
-     *
- * - * optional uint32 OIJBOCHMDKA = 15; - * @return whether the oIJBOCHMDKA field is set - */ - public boolean hasOIJBOCHMDKA() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * 
-     *  9
-     *
- * - * optional uint32 OIJBOCHMDKA = 15; - * @return this - */ - public JHAHJFNNGHI clearOIJBOCHMDKA() { - bitField0_ &= ~0x00000002; - oIJBOCHMDKA = 0; - return this; - } - - /** - * 
-     *  9
-     *
- * - * optional uint32 OIJBOCHMDKA = 15; - * @return the oIJBOCHMDKA - */ - public int getOIJBOCHMDKA() { - return oIJBOCHMDKA; - } - - /** - * 
-     *  9
-     *
- * - * optional uint32 OIJBOCHMDKA = 15; - * @param value the oIJBOCHMDKA to set - * @return this - */ - public JHAHJFNNGHI setOIJBOCHMDKA(final int value) { - bitField0_ |= 0x00000002; - oIJBOCHMDKA = value; - return this; - } - - /** - * 
-     *  true
-     *
- * - * optional bool CGAFFPHCNEA = 1; - * @return whether the cGAFFPHCNEA field is set - */ - public boolean hasCGAFFPHCNEA() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * 
-     *  true
-     *
- * - * optional bool CGAFFPHCNEA = 1; - * @return this - */ - public JHAHJFNNGHI clearCGAFFPHCNEA() { - bitField0_ &= ~0x00000004; - cGAFFPHCNEA = false; - return this; - } - - /** - * 
-     *  true
-     *
- * - * optional bool CGAFFPHCNEA = 1; - * @return the cGAFFPHCNEA - */ - public boolean getCGAFFPHCNEA() { - return cGAFFPHCNEA; - } - - /** - * 
-     *  true
-     *
- * - * optional bool CGAFFPHCNEA = 1; - * @param value the cGAFFPHCNEA to set - * @return this - */ - public JHAHJFNNGHI setCGAFFPHCNEA(final boolean value) { - bitField0_ |= 0x00000004; - cGAFFPHCNEA = value; - return this; - } - - /** - * repeated uint32 maze_unlocked = 8; - * @return whether the mazeUnlocked field is set - */ - public boolean hasMazeUnlocked() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * repeated uint32 maze_unlocked = 8; - * @return this - */ - public JHAHJFNNGHI clearMazeUnlocked() { - bitField0_ &= ~0x00000008; - mazeUnlocked.clear(); - return this; - } - - /** - * repeated uint32 maze_unlocked = 8; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * Use {@link #getMutableMazeUnlocked()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedInt getMazeUnlocked() { - return mazeUnlocked; - } - - /** - * repeated uint32 maze_unlocked = 8; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public RepeatedInt getMutableMazeUnlocked() { - bitField0_ |= 0x00000008; - return mazeUnlocked; - } - - /** - * repeated uint32 maze_unlocked = 8; - * @param value the mazeUnlocked to add - * @return this - */ - public JHAHJFNNGHI addMazeUnlocked(final int value) { - bitField0_ |= 0x00000008; - mazeUnlocked.add(value); - return this; - } - - /** - * repeated uint32 maze_unlocked = 8; - * @param values the mazeUnlocked to add - * @return this - */ - public JHAHJFNNGHI addAllMazeUnlocked(final int... values) { - bitField0_ |= 0x00000008; - mazeUnlocked.addAll(values); - return this; - } - - @Override - public JHAHJFNNGHI copyFrom(final JHAHJFNNGHI other) { - cachedSize = other.cachedSize; - if ((bitField0_ | other.bitField0_) != 0) { - bitField0_ = other.bitField0_; - jPEBPGIEGPO = other.jPEBPGIEGPO; - oIJBOCHMDKA = other.oIJBOCHMDKA; - cGAFFPHCNEA = other.cGAFFPHCNEA; - mazeUnlocked.copyFrom(other.mazeUnlocked); - } - return this; - } - - @Override - public JHAHJFNNGHI mergeFrom(final JHAHJFNNGHI other) { - if (other.isEmpty()) { - return this; - } - cachedSize = -1; - if (other.hasJPEBPGIEGPO()) { - setJPEBPGIEGPO(other.jPEBPGIEGPO); - } - if (other.hasOIJBOCHMDKA()) { - setOIJBOCHMDKA(other.oIJBOCHMDKA); - } - if (other.hasCGAFFPHCNEA()) { - setCGAFFPHCNEA(other.cGAFFPHCNEA); - } - if (other.hasMazeUnlocked()) { - getMutableMazeUnlocked().addAll(other.mazeUnlocked); - } - return this; - } - - @Override - public JHAHJFNNGHI clear() { - if (isEmpty()) { - return this; - } - cachedSize = -1; - bitField0_ = 0; - jPEBPGIEGPO = 0; - oIJBOCHMDKA = 0; - cGAFFPHCNEA = false; - mazeUnlocked.clear(); - return this; - } - - @Override - public JHAHJFNNGHI clearQuick() { - if (isEmpty()) { - return this; - } - cachedSize = -1; - bitField0_ = 0; - mazeUnlocked.clear(); - return this; - } - - @Override - public boolean equals(Object o) { - if (o == this) { - return true; - } - if (!(o instanceof JHAHJFNNGHI)) { - return false; - } - JHAHJFNNGHI other = (JHAHJFNNGHI) o; - return bitField0_ == other.bitField0_ - && (!hasJPEBPGIEGPO() || jPEBPGIEGPO == other.jPEBPGIEGPO) - && (!hasOIJBOCHMDKA() || oIJBOCHMDKA == other.oIJBOCHMDKA) - && (!hasCGAFFPHCNEA() || cGAFFPHCNEA == other.cGAFFPHCNEA) - && (!hasMazeUnlocked() || mazeUnlocked.equals(other.mazeUnlocked)); - } - - @Override - public void writeTo(final ProtoSink output) throws IOException { - if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 112); - output.writeUInt32NoTag(jPEBPGIEGPO); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 120); - output.writeUInt32NoTag(oIJBOCHMDKA); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 8); - output.writeBoolNoTag(cGAFFPHCNEA); - } - if ((bitField0_ & 0x00000008) != 0) { - for (int i = 0; i < mazeUnlocked.length(); i++) { - output.writeRawByte((byte) 64); - output.writeUInt32NoTag(mazeUnlocked.array()[i]); - } - } - } - - @Override - protected int computeSerializedSize() { - int size = 0; - if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(jPEBPGIEGPO); - } - if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(oIJBOCHMDKA); - } - if ((bitField0_ & 0x00000004) != 0) { - size += 2; - } - if ((bitField0_ & 0x00000008) != 0) { - size += (1 * mazeUnlocked.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(mazeUnlocked); - } - return size; - } - - @Override - @SuppressWarnings("fallthrough") - public JHAHJFNNGHI mergeFrom(final ProtoSource input) throws IOException { - // Enabled Fall-Through Optimization (QuickBuffers) - int tag = input.readTag(); - while (true) { - switch (tag) { - case 112: { - // jPEBPGIEGPO - jPEBPGIEGPO = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 120) { - break; - } - } - case 120: { - // oIJBOCHMDKA - oIJBOCHMDKA = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 8) { - break; - } - } - case 8: { - // cGAFFPHCNEA - cGAFFPHCNEA = input.readBool(); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 66) { - break; - } - } - case 66: { - // mazeUnlocked [packed=true] - input.readPackedUInt32(mazeUnlocked, tag); - bitField0_ |= 0x00000008; - tag = input.readTag(); - if (tag != 0) { - break; - } - } - case 0: { - return this; - } - default: { - if (!input.skipField(tag)) { - return this; - } - tag = input.readTag(); - break; - } - case 64: { - // mazeUnlocked [packed=false] - tag = input.readRepeatedUInt32(mazeUnlocked, tag); - bitField0_ |= 0x00000008; - break; - } - } - } - } - - @Override - public void writeTo(final JsonSink output) throws IOException { - output.beginObject(); - if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.jPEBPGIEGPO, jPEBPGIEGPO); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.oIJBOCHMDKA, oIJBOCHMDKA); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeBool(FieldNames.cGAFFPHCNEA, cGAFFPHCNEA); - } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRepeatedUInt32(FieldNames.mazeUnlocked, mazeUnlocked); - } - output.endObject(); - } - - @Override - public JHAHJFNNGHI mergeFrom(final JsonSource input) throws IOException { - if (!input.beginObject()) { - return this; - } - while (!input.isAtEnd()) { - switch (input.readFieldHash()) { - case 617496720: { - if (input.isAtField(FieldNames.jPEBPGIEGPO)) { - if (!input.trySkipNullValue()) { - jPEBPGIEGPO = input.readUInt32(); - bitField0_ |= 0x00000001; - } - } else { - input.skipUnknownField(); - } - break; - } - case 148222799: { - if (input.isAtField(FieldNames.oIJBOCHMDKA)) { - if (!input.trySkipNullValue()) { - oIJBOCHMDKA = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } - case -927350692: { - if (input.isAtField(FieldNames.cGAFFPHCNEA)) { - if (!input.trySkipNullValue()) { - cGAFFPHCNEA = input.readBool(); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } - case -1835898942: - case -958227613: { - if (input.isAtField(FieldNames.mazeUnlocked)) { - if (!input.trySkipNullValue()) { - input.readRepeatedUInt32(mazeUnlocked); - bitField0_ |= 0x00000008; - } - } else { - input.skipUnknownField(); - } - break; - } - default: { - input.skipUnknownField(); - break; - } - } - } - input.endObject(); - return this; - } - - @Override - public JHAHJFNNGHI clone() { - return new JHAHJFNNGHI().copyFrom(this); - } - - @Override - public boolean isEmpty() { - return ((bitField0_) == 0); - } - - public static JHAHJFNNGHI parseFrom(final byte[] data) throws InvalidProtocolBufferException { - return ProtoMessage.mergeFrom(new JHAHJFNNGHI(), data).checkInitialized(); - } - - public static JHAHJFNNGHI parseFrom(final ProtoSource input) throws IOException { - return ProtoMessage.mergeFrom(new JHAHJFNNGHI(), input).checkInitialized(); - } - - public static JHAHJFNNGHI parseFrom(final JsonSource input) throws IOException { - return ProtoMessage.mergeFrom(new JHAHJFNNGHI(), input).checkInitialized(); - } - - /** - * @return factory for creating JHAHJFNNGHI messages - */ - public static MessageFactory getFactory() { - return JHAHJFNNGHIFactory.INSTANCE; - } - - private enum JHAHJFNNGHIFactory implements MessageFactory { - INSTANCE; - - @Override - public JHAHJFNNGHI create() { - return JHAHJFNNGHI.newInstance(); - } - } - - /** - * Contains name constants used for serializing JSON - */ - static class FieldNames { - static final FieldName jPEBPGIEGPO = FieldName.forField("JPEBPGIEGPO"); - - static final FieldName oIJBOCHMDKA = FieldName.forField("OIJBOCHMDKA"); - - static final FieldName cGAFFPHCNEA = FieldName.forField("CGAFFPHCNEA"); - - static final FieldName mazeUnlocked = FieldName.forField("mazeUnlocked", "maze_unlocked"); - } - } -} diff --git a/src/generated/main/emu/lunarcore/proto/JoinLineupCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/JoinLineupCsReqOuterClass.java index cb939de91..0957b1f83 100644 --- a/src/generated/main/emu/lunarcore/proto/JoinLineupCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/JoinLineupCsReqOuterClass.java @@ -19,37 +19,37 @@ public static final class JoinLineupCsReq extends ProtoMessage private static final long serialVersionUID = 0L; /** - * optional uint32 plane_id = 7; + * optional uint32 index = 1; */ - private int planeId; + private int index; /** - * optional uint32 index = 8; + * optional uint32 slot = 7; */ - private int index; + private int slot; /** - * optional uint32 slot = 13; + * optional uint32 plane_id = 10; */ - private int slot; + private int planeId; /** - * optional uint32 base_avatar_id = 14; + * optional uint32 base_avatar_id = 11; */ private int baseAvatarId; /** - * optional .AvatarType avatar_type = 2; + * optional .ExtraLineupType extra_lineup_type = 3; */ - private int avatarType; + private int extraLineupType; /** - * optional .ExtraLineupType extra_lineup_type = 6; + * optional .AvatarType avatar_type = 14; */ - private int extraLineupType; + private int avatarType; /** - * optional bool is_virtual = 9; + * optional bool is_virtual = 15; */ private boolean isVirtual; @@ -64,118 +64,118 @@ public static JoinLineupCsReq newInstance() { } /** - * optional uint32 plane_id = 7; - * @return whether the planeId field is set + * optional uint32 index = 1; + * @return whether the index field is set */ - public boolean hasPlaneId() { + public boolean hasIndex() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 plane_id = 7; + * optional uint32 index = 1; * @return this */ - public JoinLineupCsReq clearPlaneId() { + public JoinLineupCsReq clearIndex() { bitField0_ &= ~0x00000001; - planeId = 0; + index = 0; return this; } /** - * optional uint32 plane_id = 7; - * @return the planeId + * optional uint32 index = 1; + * @return the index */ - public int getPlaneId() { - return planeId; + public int getIndex() { + return index; } /** - * optional uint32 plane_id = 7; - * @param value the planeId to set + * optional uint32 index = 1; + * @param value the index to set * @return this */ - public JoinLineupCsReq setPlaneId(final int value) { + public JoinLineupCsReq setIndex(final int value) { bitField0_ |= 0x00000001; - planeId = value; + index = value; return this; } /** - * optional uint32 index = 8; - * @return whether the index field is set + * optional uint32 slot = 7; + * @return whether the slot field is set */ - public boolean hasIndex() { + public boolean hasSlot() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 index = 8; + * optional uint32 slot = 7; * @return this */ - public JoinLineupCsReq clearIndex() { + public JoinLineupCsReq clearSlot() { bitField0_ &= ~0x00000002; - index = 0; + slot = 0; return this; } /** - * optional uint32 index = 8; - * @return the index + * optional uint32 slot = 7; + * @return the slot */ - public int getIndex() { - return index; + public int getSlot() { + return slot; } /** - * optional uint32 index = 8; - * @param value the index to set + * optional uint32 slot = 7; + * @param value the slot to set * @return this */ - public JoinLineupCsReq setIndex(final int value) { + public JoinLineupCsReq setSlot(final int value) { bitField0_ |= 0x00000002; - index = value; + slot = value; return this; } /** - * optional uint32 slot = 13; - * @return whether the slot field is set + * optional uint32 plane_id = 10; + * @return whether the planeId field is set */ - public boolean hasSlot() { + public boolean hasPlaneId() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 slot = 13; + * optional uint32 plane_id = 10; * @return this */ - public JoinLineupCsReq clearSlot() { + public JoinLineupCsReq clearPlaneId() { bitField0_ &= ~0x00000004; - slot = 0; + planeId = 0; return this; } /** - * optional uint32 slot = 13; - * @return the slot + * optional uint32 plane_id = 10; + * @return the planeId */ - public int getSlot() { - return slot; + public int getPlaneId() { + return planeId; } /** - * optional uint32 slot = 13; - * @param value the slot to set + * optional uint32 plane_id = 10; + * @param value the planeId to set * @return this */ - public JoinLineupCsReq setSlot(final int value) { + public JoinLineupCsReq setPlaneId(final int value) { bitField0_ |= 0x00000004; - slot = value; + planeId = value; return this; } /** - * optional uint32 base_avatar_id = 14; + * optional uint32 base_avatar_id = 11; * @return whether the baseAvatarId field is set */ public boolean hasBaseAvatarId() { @@ -183,7 +183,7 @@ public boolean hasBaseAvatarId() { } /** - * optional uint32 base_avatar_id = 14; + * optional uint32 base_avatar_id = 11; * @return this */ public JoinLineupCsReq clearBaseAvatarId() { @@ -193,7 +193,7 @@ public JoinLineupCsReq clearBaseAvatarId() { } /** - * optional uint32 base_avatar_id = 14; + * optional uint32 base_avatar_id = 11; * @return the baseAvatarId */ public int getBaseAvatarId() { @@ -201,7 +201,7 @@ public int getBaseAvatarId() { } /** - * optional uint32 base_avatar_id = 14; + * optional uint32 base_avatar_id = 11; * @param value the baseAvatarId to set * @return this */ @@ -212,132 +212,132 @@ public JoinLineupCsReq setBaseAvatarId(final int value) { } /** - * optional .AvatarType avatar_type = 2; - * @return whether the avatarType field is set + * optional .ExtraLineupType extra_lineup_type = 3; + * @return whether the extraLineupType field is set */ - public boolean hasAvatarType() { + public boolean hasExtraLineupType() { return (bitField0_ & 0x00000010) != 0; } /** - * optional .AvatarType avatar_type = 2; + * optional .ExtraLineupType extra_lineup_type = 3; * @return this */ - public JoinLineupCsReq clearAvatarType() { + public JoinLineupCsReq clearExtraLineupType() { bitField0_ &= ~0x00000010; - avatarType = 0; + extraLineupType = 0; return this; } /** - * optional .AvatarType avatar_type = 2; - * @return the avatarType + * optional .ExtraLineupType extra_lineup_type = 3; + * @return the extraLineupType */ - public AvatarTypeOuterClass.AvatarType getAvatarType() { - return AvatarTypeOuterClass.AvatarType.forNumber(avatarType); + public ExtraLineupTypeOuterClass.ExtraLineupType getExtraLineupType() { + return ExtraLineupTypeOuterClass.ExtraLineupType.forNumber(extraLineupType); } /** * Gets the value of the internal enum store. The result is - * equivalent to {@link JoinLineupCsReq#getAvatarType()}.getNumber(). + * equivalent to {@link JoinLineupCsReq#getExtraLineupType()}.getNumber(). * * @return numeric wire representation */ - public int getAvatarTypeValue() { - return avatarType; + public int getExtraLineupTypeValue() { + return extraLineupType; } /** * Sets the value of the internal enum store. This does not * do any validity checks, so be sure to use appropriate value - * constants from {@link AvatarTypeOuterClass.AvatarType}. Setting an invalid value - * can cause {@link JoinLineupCsReq#getAvatarType()} to return null + * constants from {@link ExtraLineupTypeOuterClass.ExtraLineupType}. Setting an invalid value + * can cause {@link JoinLineupCsReq#getExtraLineupType()} to return null * * @param value the numeric wire value to set * @return this */ - public JoinLineupCsReq setAvatarTypeValue(final int value) { + public JoinLineupCsReq setExtraLineupTypeValue(final int value) { bitField0_ |= 0x00000010; - avatarType = value; + extraLineupType = value; return this; } /** - * optional .AvatarType avatar_type = 2; - * @param value the avatarType to set + * optional .ExtraLineupType extra_lineup_type = 3; + * @param value the extraLineupType to set * @return this */ - public JoinLineupCsReq setAvatarType(final AvatarTypeOuterClass.AvatarType value) { + public JoinLineupCsReq setExtraLineupType( + final ExtraLineupTypeOuterClass.ExtraLineupType value) { bitField0_ |= 0x00000010; - avatarType = value.getNumber(); + extraLineupType = value.getNumber(); return this; } /** - * optional .ExtraLineupType extra_lineup_type = 6; - * @return whether the extraLineupType field is set + * optional .AvatarType avatar_type = 14; + * @return whether the avatarType field is set */ - public boolean hasExtraLineupType() { + public boolean hasAvatarType() { return (bitField0_ & 0x00000020) != 0; } /** - * optional .ExtraLineupType extra_lineup_type = 6; + * optional .AvatarType avatar_type = 14; * @return this */ - public JoinLineupCsReq clearExtraLineupType() { + public JoinLineupCsReq clearAvatarType() { bitField0_ &= ~0x00000020; - extraLineupType = 0; + avatarType = 0; return this; } /** - * optional .ExtraLineupType extra_lineup_type = 6; - * @return the extraLineupType + * optional .AvatarType avatar_type = 14; + * @return the avatarType */ - public ExtraLineupTypeOuterClass.ExtraLineupType getExtraLineupType() { - return ExtraLineupTypeOuterClass.ExtraLineupType.forNumber(extraLineupType); + public AvatarTypeOuterClass.AvatarType getAvatarType() { + return AvatarTypeOuterClass.AvatarType.forNumber(avatarType); } /** * Gets the value of the internal enum store. The result is - * equivalent to {@link JoinLineupCsReq#getExtraLineupType()}.getNumber(). + * equivalent to {@link JoinLineupCsReq#getAvatarType()}.getNumber(). * * @return numeric wire representation */ - public int getExtraLineupTypeValue() { - return extraLineupType; + public int getAvatarTypeValue() { + return avatarType; } /** * Sets the value of the internal enum store. This does not * do any validity checks, so be sure to use appropriate value - * constants from {@link ExtraLineupTypeOuterClass.ExtraLineupType}. Setting an invalid value - * can cause {@link JoinLineupCsReq#getExtraLineupType()} to return null + * constants from {@link AvatarTypeOuterClass.AvatarType}. Setting an invalid value + * can cause {@link JoinLineupCsReq#getAvatarType()} to return null * * @param value the numeric wire value to set * @return this */ - public JoinLineupCsReq setExtraLineupTypeValue(final int value) { + public JoinLineupCsReq setAvatarTypeValue(final int value) { bitField0_ |= 0x00000020; - extraLineupType = value; + avatarType = value; return this; } /** - * optional .ExtraLineupType extra_lineup_type = 6; - * @param value the extraLineupType to set + * optional .AvatarType avatar_type = 14; + * @param value the avatarType to set * @return this */ - public JoinLineupCsReq setExtraLineupType( - final ExtraLineupTypeOuterClass.ExtraLineupType value) { + public JoinLineupCsReq setAvatarType(final AvatarTypeOuterClass.AvatarType value) { bitField0_ |= 0x00000020; - extraLineupType = value.getNumber(); + avatarType = value.getNumber(); return this; } /** - * optional bool is_virtual = 9; + * optional bool is_virtual = 15; * @return whether the isVirtual field is set */ public boolean hasIsVirtual() { @@ -345,7 +345,7 @@ public boolean hasIsVirtual() { } /** - * optional bool is_virtual = 9; + * optional bool is_virtual = 15; * @return this */ public JoinLineupCsReq clearIsVirtual() { @@ -355,7 +355,7 @@ public JoinLineupCsReq clearIsVirtual() { } /** - * optional bool is_virtual = 9; + * optional bool is_virtual = 15; * @return the isVirtual */ public boolean getIsVirtual() { @@ -363,7 +363,7 @@ public boolean getIsVirtual() { } /** - * optional bool is_virtual = 9; + * optional bool is_virtual = 15; * @param value the isVirtual to set * @return this */ @@ -378,12 +378,12 @@ public JoinLineupCsReq copyFrom(final JoinLineupCsReq other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - planeId = other.planeId; index = other.index; slot = other.slot; + planeId = other.planeId; baseAvatarId = other.baseAvatarId; - avatarType = other.avatarType; extraLineupType = other.extraLineupType; + avatarType = other.avatarType; isVirtual = other.isVirtual; } return this; @@ -395,24 +395,24 @@ public JoinLineupCsReq mergeFrom(final JoinLineupCsReq other) { return this; } cachedSize = -1; - if (other.hasPlaneId()) { - setPlaneId(other.planeId); - } if (other.hasIndex()) { setIndex(other.index); } if (other.hasSlot()) { setSlot(other.slot); } + if (other.hasPlaneId()) { + setPlaneId(other.planeId); + } if (other.hasBaseAvatarId()) { setBaseAvatarId(other.baseAvatarId); } - if (other.hasAvatarType()) { - setAvatarTypeValue(other.avatarType); - } if (other.hasExtraLineupType()) { setExtraLineupTypeValue(other.extraLineupType); } + if (other.hasAvatarType()) { + setAvatarTypeValue(other.avatarType); + } if (other.hasIsVirtual()) { setIsVirtual(other.isVirtual); } @@ -426,12 +426,12 @@ public JoinLineupCsReq clear() { } cachedSize = -1; bitField0_ = 0; - planeId = 0; index = 0; slot = 0; + planeId = 0; baseAvatarId = 0; - avatarType = 0; extraLineupType = 0; + avatarType = 0; isVirtual = false; return this; } @@ -456,43 +456,43 @@ public boolean equals(Object o) { } JoinLineupCsReq other = (JoinLineupCsReq) o; return bitField0_ == other.bitField0_ - && (!hasPlaneId() || planeId == other.planeId) && (!hasIndex() || index == other.index) && (!hasSlot() || slot == other.slot) + && (!hasPlaneId() || planeId == other.planeId) && (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId) - && (!hasAvatarType() || avatarType == other.avatarType) && (!hasExtraLineupType() || extraLineupType == other.extraLineupType) + && (!hasAvatarType() || avatarType == other.avatarType) && (!hasIsVirtual() || isVirtual == other.isVirtual); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 56); - output.writeUInt32NoTag(planeId); + output.writeRawByte((byte) 8); + output.writeUInt32NoTag(index); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 64); - output.writeUInt32NoTag(index); + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(slot); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 104); - output.writeUInt32NoTag(slot); + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(planeId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(baseAvatarId); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 16); - output.writeEnumNoTag(avatarType); + output.writeRawByte((byte) 24); + output.writeEnumNoTag(extraLineupType); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 48); - output.writeEnumNoTag(extraLineupType); + output.writeRawByte((byte) 112); + output.writeEnumNoTag(avatarType); } if ((bitField0_ & 0x00000040) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 120); output.writeBoolNoTag(isVirtual); } } @@ -501,22 +501,22 @@ public void writeTo(final ProtoSink output) throws IOException { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(planeId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(index); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(index); + size += 1 + ProtoSink.computeUInt32SizeNoTag(slot); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(slot); + size += 1 + ProtoSink.computeUInt32SizeNoTag(planeId); } if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId); } if ((bitField0_ & 0x00000010) != 0) { - size += 1 + ProtoSink.computeEnumSizeNoTag(avatarType); + size += 1 + ProtoSink.computeEnumSizeNoTag(extraLineupType); } if ((bitField0_ & 0x00000020) != 0) { - size += 1 + ProtoSink.computeEnumSizeNoTag(extraLineupType); + size += 1 + ProtoSink.computeEnumSizeNoTag(avatarType); } if ((bitField0_ & 0x00000040) != 0) { size += 2; @@ -531,67 +531,67 @@ public JoinLineupCsReq mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { - // planeId - planeId = input.readUInt32(); + case 8: { + // index + index = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 64) { + if (tag != 56) { break; } } - case 64: { - // index - index = input.readUInt32(); + case 56: { + // slot + slot = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 104) { + if (tag != 80) { break; } } - case 104: { - // slot - slot = input.readUInt32(); + case 80: { + // planeId + planeId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 112) { + if (tag != 88) { break; } } - case 112: { + case 88: { // baseAvatarId baseAvatarId = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 16) { + if (tag != 24) { break; } } - case 16: { - // avatarType + case 24: { + // extraLineupType final int value = input.readInt32(); - if (AvatarTypeOuterClass.AvatarType.forNumber(value) != null) { - avatarType = value; + if (ExtraLineupTypeOuterClass.ExtraLineupType.forNumber(value) != null) { + extraLineupType = value; bitField0_ |= 0x00000010; } tag = input.readTag(); - if (tag != 48) { + if (tag != 112) { break; } } - case 48: { - // extraLineupType + case 112: { + // avatarType final int value = input.readInt32(); - if (ExtraLineupTypeOuterClass.ExtraLineupType.forNumber(value) != null) { - extraLineupType = value; + if (AvatarTypeOuterClass.AvatarType.forNumber(value) != null) { + avatarType = value; bitField0_ |= 0x00000020; } tag = input.readTag(); - if (tag != 72) { + if (tag != 120) { break; } } - case 72: { + case 120: { // isVirtual isVirtual = input.readBool(); bitField0_ |= 0x00000040; @@ -618,22 +618,22 @@ public JoinLineupCsReq mergeFrom(final ProtoSource input) throws IOException { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.planeId, planeId); + output.writeUInt32(FieldNames.index, index); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.index, index); + output.writeUInt32(FieldNames.slot, slot); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.slot, slot); + output.writeUInt32(FieldNames.planeId, planeId); } if ((bitField0_ & 0x00000008) != 0) { output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId); } if ((bitField0_ & 0x00000010) != 0) { - output.writeEnum(FieldNames.avatarType, avatarType, AvatarTypeOuterClass.AvatarType.converter()); + output.writeEnum(FieldNames.extraLineupType, extraLineupType, ExtraLineupTypeOuterClass.ExtraLineupType.converter()); } if ((bitField0_ & 0x00000020) != 0) { - output.writeEnum(FieldNames.extraLineupType, extraLineupType, ExtraLineupTypeOuterClass.ExtraLineupType.converter()); + output.writeEnum(FieldNames.avatarType, avatarType, AvatarTypeOuterClass.AvatarType.converter()); } if ((bitField0_ & 0x00000040) != 0) { output.writeBool(FieldNames.isVirtual, isVirtual); @@ -648,11 +648,10 @@ public JoinLineupCsReq mergeFrom(final JsonSource input) throws IOException { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -493896553: - case 1869097438: { - if (input.isAtField(FieldNames.planeId)) { + case 100346066: { + if (input.isAtField(FieldNames.index)) { if (!input.trySkipNullValue()) { - planeId = input.readUInt32(); + index = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -660,10 +659,10 @@ public JoinLineupCsReq mergeFrom(final JsonSource input) throws IOException { } break; } - case 100346066: { - if (input.isAtField(FieldNames.index)) { + case 3533310: { + if (input.isAtField(FieldNames.slot)) { if (!input.trySkipNullValue()) { - index = input.readUInt32(); + slot = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -671,10 +670,11 @@ public JoinLineupCsReq mergeFrom(final JsonSource input) throws IOException { } break; } - case 3533310: { - if (input.isAtField(FieldNames.slot)) { + case -493896553: + case 1869097438: { + if (input.isAtField(FieldNames.planeId)) { if (!input.trySkipNullValue()) { - slot = input.readUInt32(); + planeId = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -694,13 +694,13 @@ public JoinLineupCsReq mergeFrom(final JsonSource input) throws IOException { } break; } - case -403148749: - case 397309536: { - if (input.isAtField(FieldNames.avatarType)) { + case -468135527: + case -1144475077: { + if (input.isAtField(FieldNames.extraLineupType)) { if (!input.trySkipNullValue()) { - final AvatarTypeOuterClass.AvatarType value = input.readEnum(AvatarTypeOuterClass.AvatarType.converter()); + final ExtraLineupTypeOuterClass.ExtraLineupType value = input.readEnum(ExtraLineupTypeOuterClass.ExtraLineupType.converter()); if (value != null) { - avatarType = value.getNumber(); + extraLineupType = value.getNumber(); bitField0_ |= 0x00000010; } else { input.skipUnknownEnumValue(); @@ -711,13 +711,13 @@ public JoinLineupCsReq mergeFrom(final JsonSource input) throws IOException { } break; } - case -468135527: - case -1144475077: { - if (input.isAtField(FieldNames.extraLineupType)) { + case -403148749: + case 397309536: { + if (input.isAtField(FieldNames.avatarType)) { if (!input.trySkipNullValue()) { - final ExtraLineupTypeOuterClass.ExtraLineupType value = input.readEnum(ExtraLineupTypeOuterClass.ExtraLineupType.converter()); + final AvatarTypeOuterClass.AvatarType value = input.readEnum(AvatarTypeOuterClass.AvatarType.converter()); if (value != null) { - extraLineupType = value.getNumber(); + avatarType = value.getNumber(); bitField0_ |= 0x00000020; } else { input.skipUnknownEnumValue(); @@ -793,18 +793,18 @@ public JoinLineupCsReq create() { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName planeId = FieldName.forField("planeId", "plane_id"); - static final FieldName index = FieldName.forField("index"); static final FieldName slot = FieldName.forField("slot"); - static final FieldName baseAvatarId = FieldName.forField("baseAvatarId", "base_avatar_id"); + static final FieldName planeId = FieldName.forField("planeId", "plane_id"); - static final FieldName avatarType = FieldName.forField("avatarType", "avatar_type"); + static final FieldName baseAvatarId = FieldName.forField("baseAvatarId", "base_avatar_id"); static final FieldName extraLineupType = FieldName.forField("extraLineupType", "extra_lineup_type"); + static final FieldName avatarType = FieldName.forField("avatarType", "avatar_type"); + static final FieldName isVirtual = FieldName.forField("isVirtual", "is_virtual"); } } diff --git a/src/generated/main/emu/lunarcore/proto/KDHBAHABJMPOuterClass.java b/src/generated/main/emu/lunarcore/proto/KDHBAHABJMPOuterClass.java deleted file mode 100644 index 254bdb106..000000000 --- a/src/generated/main/emu/lunarcore/proto/KDHBAHABJMPOuterClass.java +++ /dev/null @@ -1,598 +0,0 @@ -// Code generated by protocol buffer compiler. Do not edit! -package emu.lunarcore.proto; - -import java.io.IOException; -import us.hebi.quickbuf.FieldName; -import us.hebi.quickbuf.InvalidProtocolBufferException; -import us.hebi.quickbuf.JsonSink; -import us.hebi.quickbuf.JsonSource; -import us.hebi.quickbuf.MessageFactory; -import us.hebi.quickbuf.ProtoMessage; -import us.hebi.quickbuf.ProtoSink; -import us.hebi.quickbuf.ProtoSource; - -public final class KDHBAHABJMPOuterClass { - /** - * Protobuf type {@code KDHBAHABJMP} - */ - public static final class KDHBAHABJMP extends ProtoMessage implements Cloneable { - private static final long serialVersionUID = 0L; - - /** - * optional uint32 HFCDDCPJGAK = 2; - */ - private int hFCDDCPJGAK; - - /** - * optional uint32 KAKJHOEBIOA = 5; - */ - private int kAKJHOEBIOA; - - /** - * optional uint32 LIHAFMAOKMG = 7; - */ - private int lIHAFMAOKMG; - - /** - * optional uint32 FNNEECKAFKK = 8; - */ - private int fNNEECKAFKK; - - /** - * 
-     *  HJEALCCKPAO AMMMELMOKJF = 12;
-     *
- * - * optional bool CMJFDLMBIOK = 14; - */ - private boolean cMJFDLMBIOK; - - private KDHBAHABJMP() { - } - - /** - * @return a new empty instance of {@code KDHBAHABJMP} - */ - public static KDHBAHABJMP newInstance() { - return new KDHBAHABJMP(); - } - - /** - * optional uint32 HFCDDCPJGAK = 2; - * @return whether the hFCDDCPJGAK field is set - */ - public boolean hasHFCDDCPJGAK() { - return (bitField0_ & 0x00000001) != 0; - } - - /** - * optional uint32 HFCDDCPJGAK = 2; - * @return this - */ - public KDHBAHABJMP clearHFCDDCPJGAK() { - bitField0_ &= ~0x00000001; - hFCDDCPJGAK = 0; - return this; - } - - /** - * optional uint32 HFCDDCPJGAK = 2; - * @return the hFCDDCPJGAK - */ - public int getHFCDDCPJGAK() { - return hFCDDCPJGAK; - } - - /** - * optional uint32 HFCDDCPJGAK = 2; - * @param value the hFCDDCPJGAK to set - * @return this - */ - public KDHBAHABJMP setHFCDDCPJGAK(final int value) { - bitField0_ |= 0x00000001; - hFCDDCPJGAK = value; - return this; - } - - /** - * optional uint32 KAKJHOEBIOA = 5; - * @return whether the kAKJHOEBIOA field is set - */ - public boolean hasKAKJHOEBIOA() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 KAKJHOEBIOA = 5; - * @return this - */ - public KDHBAHABJMP clearKAKJHOEBIOA() { - bitField0_ &= ~0x00000002; - kAKJHOEBIOA = 0; - return this; - } - - /** - * optional uint32 KAKJHOEBIOA = 5; - * @return the kAKJHOEBIOA - */ - public int getKAKJHOEBIOA() { - return kAKJHOEBIOA; - } - - /** - * optional uint32 KAKJHOEBIOA = 5; - * @param value the kAKJHOEBIOA to set - * @return this - */ - public KDHBAHABJMP setKAKJHOEBIOA(final int value) { - bitField0_ |= 0x00000002; - kAKJHOEBIOA = value; - return this; - } - - /** - * optional uint32 LIHAFMAOKMG = 7; - * @return whether the lIHAFMAOKMG field is set - */ - public boolean hasLIHAFMAOKMG() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 LIHAFMAOKMG = 7; - * @return this - */ - public KDHBAHABJMP clearLIHAFMAOKMG() { - bitField0_ &= ~0x00000004; - lIHAFMAOKMG = 0; - return this; - } - - /** - * optional uint32 LIHAFMAOKMG = 7; - * @return the lIHAFMAOKMG - */ - public int getLIHAFMAOKMG() { - return lIHAFMAOKMG; - } - - /** - * optional uint32 LIHAFMAOKMG = 7; - * @param value the lIHAFMAOKMG to set - * @return this - */ - public KDHBAHABJMP setLIHAFMAOKMG(final int value) { - bitField0_ |= 0x00000004; - lIHAFMAOKMG = value; - return this; - } - - /** - * optional uint32 FNNEECKAFKK = 8; - * @return whether the fNNEECKAFKK field is set - */ - public boolean hasFNNEECKAFKK() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 FNNEECKAFKK = 8; - * @return this - */ - public KDHBAHABJMP clearFNNEECKAFKK() { - bitField0_ &= ~0x00000008; - fNNEECKAFKK = 0; - return this; - } - - /** - * optional uint32 FNNEECKAFKK = 8; - * @return the fNNEECKAFKK - */ - public int getFNNEECKAFKK() { - return fNNEECKAFKK; - } - - /** - * optional uint32 FNNEECKAFKK = 8; - * @param value the fNNEECKAFKK to set - * @return this - */ - public KDHBAHABJMP setFNNEECKAFKK(final int value) { - bitField0_ |= 0x00000008; - fNNEECKAFKK = value; - return this; - } - - /** - * 
-     *  HJEALCCKPAO AMMMELMOKJF = 12;
-     *
- * - * optional bool CMJFDLMBIOK = 14; - * @return whether the cMJFDLMBIOK field is set - */ - public boolean hasCMJFDLMBIOK() { - return (bitField0_ & 0x00000010) != 0; - } - - /** - * 
-     *  HJEALCCKPAO AMMMELMOKJF = 12;
-     *
- * - * optional bool CMJFDLMBIOK = 14; - * @return this - */ - public KDHBAHABJMP clearCMJFDLMBIOK() { - bitField0_ &= ~0x00000010; - cMJFDLMBIOK = false; - return this; - } - - /** - * 
-     *  HJEALCCKPAO AMMMELMOKJF = 12;
-     *
- * - * optional bool CMJFDLMBIOK = 14; - * @return the cMJFDLMBIOK - */ - public boolean getCMJFDLMBIOK() { - return cMJFDLMBIOK; - } - - /** - * 
-     *  HJEALCCKPAO AMMMELMOKJF = 12;
-     *
- * - * optional bool CMJFDLMBIOK = 14; - * @param value the cMJFDLMBIOK to set - * @return this - */ - public KDHBAHABJMP setCMJFDLMBIOK(final boolean value) { - bitField0_ |= 0x00000010; - cMJFDLMBIOK = value; - return this; - } - - @Override - public KDHBAHABJMP copyFrom(final KDHBAHABJMP other) { - cachedSize = other.cachedSize; - if ((bitField0_ | other.bitField0_) != 0) { - bitField0_ = other.bitField0_; - hFCDDCPJGAK = other.hFCDDCPJGAK; - kAKJHOEBIOA = other.kAKJHOEBIOA; - lIHAFMAOKMG = other.lIHAFMAOKMG; - fNNEECKAFKK = other.fNNEECKAFKK; - cMJFDLMBIOK = other.cMJFDLMBIOK; - } - return this; - } - - @Override - public KDHBAHABJMP mergeFrom(final KDHBAHABJMP other) { - if (other.isEmpty()) { - return this; - } - cachedSize = -1; - if (other.hasHFCDDCPJGAK()) { - setHFCDDCPJGAK(other.hFCDDCPJGAK); - } - if (other.hasKAKJHOEBIOA()) { - setKAKJHOEBIOA(other.kAKJHOEBIOA); - } - if (other.hasLIHAFMAOKMG()) { - setLIHAFMAOKMG(other.lIHAFMAOKMG); - } - if (other.hasFNNEECKAFKK()) { - setFNNEECKAFKK(other.fNNEECKAFKK); - } - if (other.hasCMJFDLMBIOK()) { - setCMJFDLMBIOK(other.cMJFDLMBIOK); - } - return this; - } - - @Override - public KDHBAHABJMP clear() { - if (isEmpty()) { - return this; - } - cachedSize = -1; - bitField0_ = 0; - hFCDDCPJGAK = 0; - kAKJHOEBIOA = 0; - lIHAFMAOKMG = 0; - fNNEECKAFKK = 0; - cMJFDLMBIOK = false; - return this; - } - - @Override - public KDHBAHABJMP clearQuick() { - if (isEmpty()) { - return this; - } - cachedSize = -1; - bitField0_ = 0; - return this; - } - - @Override - public boolean equals(Object o) { - if (o == this) { - return true; - } - if (!(o instanceof KDHBAHABJMP)) { - return false; - } - KDHBAHABJMP other = (KDHBAHABJMP) o; - return bitField0_ == other.bitField0_ - && (!hasHFCDDCPJGAK() || hFCDDCPJGAK == other.hFCDDCPJGAK) - && (!hasKAKJHOEBIOA() || kAKJHOEBIOA == other.kAKJHOEBIOA) - && (!hasLIHAFMAOKMG() || lIHAFMAOKMG == other.lIHAFMAOKMG) - && (!hasFNNEECKAFKK() || fNNEECKAFKK == other.fNNEECKAFKK) - && (!hasCMJFDLMBIOK() || cMJFDLMBIOK == other.cMJFDLMBIOK); - } - - @Override - public void writeTo(final ProtoSink output) throws IOException { - if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); - output.writeUInt32NoTag(hFCDDCPJGAK); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 40); - output.writeUInt32NoTag(kAKJHOEBIOA); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 56); - output.writeUInt32NoTag(lIHAFMAOKMG); - } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 64); - output.writeUInt32NoTag(fNNEECKAFKK); - } - if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 112); - output.writeBoolNoTag(cMJFDLMBIOK); - } - } - - @Override - protected int computeSerializedSize() { - int size = 0; - if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(hFCDDCPJGAK); - } - if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(kAKJHOEBIOA); - } - if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(lIHAFMAOKMG); - } - if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(fNNEECKAFKK); - } - if ((bitField0_ & 0x00000010) != 0) { - size += 2; - } - return size; - } - - @Override - @SuppressWarnings("fallthrough") - public KDHBAHABJMP mergeFrom(final ProtoSource input) throws IOException { - // Enabled Fall-Through Optimization (QuickBuffers) - int tag = input.readTag(); - while (true) { - switch (tag) { - case 16: { - // hFCDDCPJGAK - hFCDDCPJGAK = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 40) { - break; - } - } - case 40: { - // kAKJHOEBIOA - kAKJHOEBIOA = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 56) { - break; - } - } - case 56: { - // lIHAFMAOKMG - lIHAFMAOKMG = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 64) { - break; - } - } - case 64: { - // fNNEECKAFKK - fNNEECKAFKK = input.readUInt32(); - bitField0_ |= 0x00000008; - tag = input.readTag(); - if (tag != 112) { - break; - } - } - case 112: { - // cMJFDLMBIOK - cMJFDLMBIOK = input.readBool(); - bitField0_ |= 0x00000010; - tag = input.readTag(); - if (tag != 0) { - break; - } - } - case 0: { - return this; - } - default: { - if (!input.skipField(tag)) { - return this; - } - tag = input.readTag(); - break; - } - } - } - } - - @Override - public void writeTo(final JsonSink output) throws IOException { - output.beginObject(); - if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.hFCDDCPJGAK, hFCDDCPJGAK); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.kAKJHOEBIOA, kAKJHOEBIOA); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.lIHAFMAOKMG, lIHAFMAOKMG); - } - if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.fNNEECKAFKK, fNNEECKAFKK); - } - if ((bitField0_ & 0x00000010) != 0) { - output.writeBool(FieldNames.cMJFDLMBIOK, cMJFDLMBIOK); - } - output.endObject(); - } - - @Override - public KDHBAHABJMP mergeFrom(final JsonSource input) throws IOException { - if (!input.beginObject()) { - return this; - } - while (!input.isAtEnd()) { - switch (input.readFieldHash()) { - case -1775850855: { - if (input.isAtField(FieldNames.hFCDDCPJGAK)) { - if (!input.trySkipNullValue()) { - hFCDDCPJGAK = input.readUInt32(); - bitField0_ |= 0x00000001; - } - } else { - input.skipUnknownField(); - } - break; - } - case -2008773982: { - if (input.isAtField(FieldNames.kAKJHOEBIOA)) { - if (!input.trySkipNullValue()) { - kAKJHOEBIOA = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } - case -296464422: { - if (input.isAtField(FieldNames.lIHAFMAOKMG)) { - if (!input.trySkipNullValue()) { - lIHAFMAOKMG = input.readUInt32(); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } - case 169241555: { - if (input.isAtField(FieldNames.fNNEECKAFKK)) { - if (!input.trySkipNullValue()) { - fNNEECKAFKK = input.readUInt32(); - bitField0_ |= 0x00000008; - } - } else { - input.skipUnknownField(); - } - break; - } - case 1216373954: { - if (input.isAtField(FieldNames.cMJFDLMBIOK)) { - if (!input.trySkipNullValue()) { - cMJFDLMBIOK = input.readBool(); - bitField0_ |= 0x00000010; - } - } else { - input.skipUnknownField(); - } - break; - } - default: { - input.skipUnknownField(); - break; - } - } - } - input.endObject(); - return this; - } - - @Override - public KDHBAHABJMP clone() { - return new KDHBAHABJMP().copyFrom(this); - } - - @Override - public boolean isEmpty() { - return ((bitField0_) == 0); - } - - public static KDHBAHABJMP parseFrom(final byte[] data) throws InvalidProtocolBufferException { - return ProtoMessage.mergeFrom(new KDHBAHABJMP(), data).checkInitialized(); - } - - public static KDHBAHABJMP parseFrom(final ProtoSource input) throws IOException { - return ProtoMessage.mergeFrom(new KDHBAHABJMP(), input).checkInitialized(); - } - - public static KDHBAHABJMP parseFrom(final JsonSource input) throws IOException { - return ProtoMessage.mergeFrom(new KDHBAHABJMP(), input).checkInitialized(); - } - - /** - * @return factory for creating KDHBAHABJMP messages - */ - public static MessageFactory getFactory() { - return KDHBAHABJMPFactory.INSTANCE; - } - - private enum KDHBAHABJMPFactory implements MessageFactory { - INSTANCE; - - @Override - public KDHBAHABJMP create() { - return KDHBAHABJMP.newInstance(); - } - } - - /** - * Contains name constants used for serializing JSON - */ - static class FieldNames { - static final FieldName hFCDDCPJGAK = FieldName.forField("HFCDDCPJGAK"); - - static final FieldName kAKJHOEBIOA = FieldName.forField("KAKJHOEBIOA"); - - static final FieldName lIHAFMAOKMG = FieldName.forField("LIHAFMAOKMG"); - - static final FieldName fNNEECKAFKK = FieldName.forField("FNNEECKAFKK"); - - static final FieldName cMJFDLMBIOK = FieldName.forField("CMJFDLMBIOK"); - } - } -} diff --git a/src/generated/main/emu/lunarcore/proto/LineupAvatarOuterClass.java b/src/generated/main/emu/lunarcore/proto/LineupAvatarOuterClass.java index b3235619c..db290ebd0 100644 --- a/src/generated/main/emu/lunarcore/proto/LineupAvatarOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/LineupAvatarOuterClass.java @@ -19,32 +19,32 @@ public static final class LineupAvatar extends ProtoMessage implem private static final long serialVersionUID = 0L; /** - * optional uint32 slot = 1; + * optional uint32 id = 3; */ - private int slot; + private int id; /** - * optional uint32 hp = 4; + * optional uint32 slot = 6; */ - private int hp; + private int slot; /** - * optional uint32 satiety = 9; + * optional uint32 satiety = 7; */ private int satiety; /** - * optional uint32 id = 11; + * optional uint32 hp = 15; */ - private int id; + private int hp; /** - * optional .AvatarType avatar_type = 5; + * optional .AvatarType avatar_type = 12; */ private int avatarType; /** - * optional .SpBarInfo sp_bar = 13; + * optional .SpBarInfo sp_bar = 9; */ private final SpBarInfoOuterClass.SpBarInfo spBar = SpBarInfoOuterClass.SpBarInfo.newInstance(); @@ -59,81 +59,81 @@ public static LineupAvatar newInstance() { } /** - * optional uint32 slot = 1; - * @return whether the slot field is set + * optional uint32 id = 3; + * @return whether the id field is set */ - public boolean hasSlot() { + public boolean hasId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 slot = 1; + * optional uint32 id = 3; * @return this */ - public LineupAvatar clearSlot() { + public LineupAvatar clearId() { bitField0_ &= ~0x00000001; - slot = 0; + id = 0; return this; } /** - * optional uint32 slot = 1; - * @return the slot + * optional uint32 id = 3; + * @return the id */ - public int getSlot() { - return slot; + public int getId() { + return id; } /** - * optional uint32 slot = 1; - * @param value the slot to set + * optional uint32 id = 3; + * @param value the id to set * @return this */ - public LineupAvatar setSlot(final int value) { + public LineupAvatar setId(final int value) { bitField0_ |= 0x00000001; - slot = value; + id = value; return this; } /** - * optional uint32 hp = 4; - * @return whether the hp field is set + * optional uint32 slot = 6; + * @return whether the slot field is set */ - public boolean hasHp() { + public boolean hasSlot() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 hp = 4; + * optional uint32 slot = 6; * @return this */ - public LineupAvatar clearHp() { + public LineupAvatar clearSlot() { bitField0_ &= ~0x00000002; - hp = 0; + slot = 0; return this; } /** - * optional uint32 hp = 4; - * @return the hp + * optional uint32 slot = 6; + * @return the slot */ - public int getHp() { - return hp; + public int getSlot() { + return slot; } /** - * optional uint32 hp = 4; - * @param value the hp to set + * optional uint32 slot = 6; + * @param value the slot to set * @return this */ - public LineupAvatar setHp(final int value) { + public LineupAvatar setSlot(final int value) { bitField0_ |= 0x00000002; - hp = value; + slot = value; return this; } /** - * optional uint32 satiety = 9; + * optional uint32 satiety = 7; * @return whether the satiety field is set */ public boolean hasSatiety() { @@ -141,7 +141,7 @@ public boolean hasSatiety() { } /** - * optional uint32 satiety = 9; + * optional uint32 satiety = 7; * @return this */ public LineupAvatar clearSatiety() { @@ -151,7 +151,7 @@ public LineupAvatar clearSatiety() { } /** - * optional uint32 satiety = 9; + * optional uint32 satiety = 7; * @return the satiety */ public int getSatiety() { @@ -159,7 +159,7 @@ public int getSatiety() { } /** - * optional uint32 satiety = 9; + * optional uint32 satiety = 7; * @param value the satiety to set * @return this */ @@ -170,44 +170,44 @@ public LineupAvatar setSatiety(final int value) { } /** - * optional uint32 id = 11; - * @return whether the id field is set + * optional uint32 hp = 15; + * @return whether the hp field is set */ - public boolean hasId() { + public boolean hasHp() { return (bitField0_ & 0x00000008) != 0; } /** - * optional uint32 id = 11; + * optional uint32 hp = 15; * @return this */ - public LineupAvatar clearId() { + public LineupAvatar clearHp() { bitField0_ &= ~0x00000008; - id = 0; + hp = 0; return this; } /** - * optional uint32 id = 11; - * @return the id + * optional uint32 hp = 15; + * @return the hp */ - public int getId() { - return id; + public int getHp() { + return hp; } /** - * optional uint32 id = 11; - * @param value the id to set + * optional uint32 hp = 15; + * @param value the hp to set * @return this */ - public LineupAvatar setId(final int value) { + public LineupAvatar setHp(final int value) { bitField0_ |= 0x00000008; - id = value; + hp = value; return this; } /** - * optional .AvatarType avatar_type = 5; + * optional .AvatarType avatar_type = 12; * @return whether the avatarType field is set */ public boolean hasAvatarType() { @@ -215,7 +215,7 @@ public boolean hasAvatarType() { } /** - * optional .AvatarType avatar_type = 5; + * optional .AvatarType avatar_type = 12; * @return this */ public LineupAvatar clearAvatarType() { @@ -225,7 +225,7 @@ public LineupAvatar clearAvatarType() { } /** - * optional .AvatarType avatar_type = 5; + * optional .AvatarType avatar_type = 12; * @return the avatarType */ public AvatarTypeOuterClass.AvatarType getAvatarType() { @@ -258,7 +258,7 @@ public LineupAvatar setAvatarTypeValue(final int value) { } /** - * optional .AvatarType avatar_type = 5; + * optional .AvatarType avatar_type = 12; * @param value the avatarType to set * @return this */ @@ -269,7 +269,7 @@ public LineupAvatar setAvatarType(final AvatarTypeOuterClass.AvatarType value) { } /** - * optional .SpBarInfo sp_bar = 13; + * optional .SpBarInfo sp_bar = 9; * @return whether the spBar field is set */ public boolean hasSpBar() { @@ -277,7 +277,7 @@ public boolean hasSpBar() { } /** - * optional .SpBarInfo sp_bar = 13; + * optional .SpBarInfo sp_bar = 9; * @return this */ public LineupAvatar clearSpBar() { @@ -287,7 +287,7 @@ public LineupAvatar clearSpBar() { } /** - * optional .SpBarInfo sp_bar = 13; + * optional .SpBarInfo sp_bar = 9; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -301,7 +301,7 @@ public SpBarInfoOuterClass.SpBarInfo getSpBar() { } /** - * optional .SpBarInfo sp_bar = 13; + * optional .SpBarInfo sp_bar = 9; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -315,7 +315,7 @@ public SpBarInfoOuterClass.SpBarInfo getMutableSpBar() { } /** - * optional .SpBarInfo sp_bar = 13; + * optional .SpBarInfo sp_bar = 9; * @param value the spBar to set * @return this */ @@ -330,10 +330,10 @@ public LineupAvatar copyFrom(final LineupAvatar other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; + id = other.id; slot = other.slot; - hp = other.hp; satiety = other.satiety; - id = other.id; + hp = other.hp; avatarType = other.avatarType; spBar.copyFrom(other.spBar); } @@ -346,17 +346,17 @@ public LineupAvatar mergeFrom(final LineupAvatar other) { return this; } cachedSize = -1; + if (other.hasId()) { + setId(other.id); + } if (other.hasSlot()) { setSlot(other.slot); } - if (other.hasHp()) { - setHp(other.hp); - } if (other.hasSatiety()) { setSatiety(other.satiety); } - if (other.hasId()) { - setId(other.id); + if (other.hasHp()) { + setHp(other.hp); } if (other.hasAvatarType()) { setAvatarTypeValue(other.avatarType); @@ -374,10 +374,10 @@ public LineupAvatar clear() { } cachedSize = -1; bitField0_ = 0; + id = 0; slot = 0; - hp = 0; satiety = 0; - id = 0; + hp = 0; avatarType = 0; spBar.clear(); return this; @@ -404,10 +404,10 @@ public boolean equals(Object o) { } LineupAvatar other = (LineupAvatar) o; return bitField0_ == other.bitField0_ + && (!hasId() || id == other.id) && (!hasSlot() || slot == other.slot) - && (!hasHp() || hp == other.hp) && (!hasSatiety() || satiety == other.satiety) - && (!hasId() || id == other.id) + && (!hasHp() || hp == other.hp) && (!hasAvatarType() || avatarType == other.avatarType) && (!hasSpBar() || spBar.equals(other.spBar)); } @@ -415,27 +415,27 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); - output.writeUInt32NoTag(slot); + output.writeRawByte((byte) 24); + output.writeUInt32NoTag(id); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 32); - output.writeUInt32NoTag(hp); + output.writeRawByte((byte) 48); + output.writeUInt32NoTag(slot); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(satiety); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 88); - output.writeUInt32NoTag(id); + output.writeRawByte((byte) 120); + output.writeUInt32NoTag(hp); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 96); output.writeEnumNoTag(avatarType); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 106); + output.writeRawByte((byte) 74); output.writeMessageNoTag(spBar); } } @@ -444,16 +444,16 @@ public void writeTo(final ProtoSink output) throws IOException { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(slot); + size += 1 + ProtoSink.computeUInt32SizeNoTag(id); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(hp); + size += 1 + ProtoSink.computeUInt32SizeNoTag(slot); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(satiety); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(id); + size += 1 + ProtoSink.computeUInt32SizeNoTag(hp); } if ((bitField0_ & 0x00000010) != 0) { size += 1 + ProtoSink.computeEnumSizeNoTag(avatarType); @@ -471,43 +471,43 @@ public LineupAvatar mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { - // slot - slot = input.readUInt32(); + case 24: { + // id + id = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 32) { + if (tag != 48) { break; } } - case 32: { - // hp - hp = input.readUInt32(); + case 48: { + // slot + slot = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 72) { + if (tag != 56) { break; } } - case 72: { + case 56: { // satiety satiety = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 88) { + if (tag != 120) { break; } } - case 88: { - // id - id = input.readUInt32(); + case 120: { + // hp + hp = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 40) { + if (tag != 96) { break; } } - case 40: { + case 96: { // avatarType final int value = input.readInt32(); if (AvatarTypeOuterClass.AvatarType.forNumber(value) != null) { @@ -515,11 +515,11 @@ public LineupAvatar mergeFrom(final ProtoSource input) throws IOException { bitField0_ |= 0x00000010; } tag = input.readTag(); - if (tag != 106) { + if (tag != 74) { break; } } - case 106: { + case 74: { // spBar input.readMessage(spBar); bitField0_ |= 0x00000020; @@ -546,16 +546,16 @@ public LineupAvatar mergeFrom(final ProtoSource input) throws IOException { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.slot, slot); + output.writeUInt32(FieldNames.id, id); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.hp, hp); + output.writeUInt32(FieldNames.slot, slot); } if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.satiety, satiety); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.id, id); + output.writeUInt32(FieldNames.hp, hp); } if ((bitField0_ & 0x00000010) != 0) { output.writeEnum(FieldNames.avatarType, avatarType, AvatarTypeOuterClass.AvatarType.converter()); @@ -573,10 +573,10 @@ public LineupAvatar mergeFrom(final JsonSource input) throws IOException { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 3533310: { - if (input.isAtField(FieldNames.slot)) { + case 3355: { + if (input.isAtField(FieldNames.id)) { if (!input.trySkipNullValue()) { - slot = input.readUInt32(); + id = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -584,10 +584,10 @@ public LineupAvatar mergeFrom(final JsonSource input) throws IOException { } break; } - case 3336: { - if (input.isAtField(FieldNames.hp)) { + case 3533310: { + if (input.isAtField(FieldNames.slot)) { if (!input.trySkipNullValue()) { - hp = input.readUInt32(); + slot = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -606,10 +606,10 @@ public LineupAvatar mergeFrom(final JsonSource input) throws IOException { } break; } - case 3355: { - if (input.isAtField(FieldNames.id)) { + case 3336: { + if (input.isAtField(FieldNames.hp)) { if (!input.trySkipNullValue()) { - id = input.readUInt32(); + hp = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -698,13 +698,13 @@ public LineupAvatar create() { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName slot = FieldName.forField("slot"); + static final FieldName id = FieldName.forField("id"); - static final FieldName hp = FieldName.forField("hp"); + static final FieldName slot = FieldName.forField("slot"); static final FieldName satiety = FieldName.forField("satiety"); - static final FieldName id = FieldName.forField("id"); + static final FieldName hp = FieldName.forField("hp"); static final FieldName avatarType = FieldName.forField("avatarType", "avatar_type"); diff --git a/src/generated/main/emu/lunarcore/proto/LineupInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/LineupInfoOuterClass.java index befbeadf8..9f2eb186b 100644 --- a/src/generated/main/emu/lunarcore/proto/LineupInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/LineupInfoOuterClass.java @@ -21,47 +21,47 @@ public static final class LineupInfo extends ProtoMessage implements private static final long serialVersionUID = 0L; /** - * optional uint32 mp = 3; + * optional uint32 mp = 7; */ private int mp; /** - * optional uint32 plane_id = 4; + * optional uint32 max_mp = 8; */ - private int planeId; + private int maxMp; /** - * optional uint32 leader_slot = 5; + * optional uint32 plane_id = 10; */ - private int leaderSlot; + private int planeId; /** - * optional uint32 index = 7; + * optional uint32 index = 12; */ private int index; /** - * optional uint32 max_mp = 10; + * optional uint32 leader_slot = 13; */ - private int maxMp; + private int leaderSlot; /** - * optional .ExtraLineupType extra_lineup_type = 15; + * optional .ExtraLineupType extra_lineup_type = 6; */ private int extraLineupType; /** - * optional bool is_virtual = 8; + * optional bool is_virtual = 2; */ private boolean isVirtual; /** - * optional string name = 6; + * optional string name = 5; */ private final Utf8String name = Utf8String.newEmptyInstance(); /** - * repeated .LineupAvatar avatar_list = 2; + * repeated .LineupAvatar avatar_list = 15; */ private final RepeatedMessage avatarList = RepeatedMessage.newEmptyInstance(LineupAvatarOuterClass.LineupAvatar.getFactory()); @@ -76,7 +76,7 @@ public static LineupInfo newInstance() { } /** - * optional uint32 mp = 3; + * optional uint32 mp = 7; * @return whether the mp field is set */ public boolean hasMp() { @@ -84,7 +84,7 @@ public boolean hasMp() { } /** - * optional uint32 mp = 3; + * optional uint32 mp = 7; * @return this */ public LineupInfo clearMp() { @@ -94,7 +94,7 @@ public LineupInfo clearMp() { } /** - * optional uint32 mp = 3; + * optional uint32 mp = 7; * @return the mp */ public int getMp() { @@ -102,7 +102,7 @@ public int getMp() { } /** - * optional uint32 mp = 3; + * optional uint32 mp = 7; * @param value the mp to set * @return this */ @@ -113,81 +113,81 @@ public LineupInfo setMp(final int value) { } /** - * optional uint32 plane_id = 4; - * @return whether the planeId field is set + * optional uint32 max_mp = 8; + * @return whether the maxMp field is set */ - public boolean hasPlaneId() { + public boolean hasMaxMp() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 plane_id = 4; + * optional uint32 max_mp = 8; * @return this */ - public LineupInfo clearPlaneId() { + public LineupInfo clearMaxMp() { bitField0_ &= ~0x00000002; - planeId = 0; + maxMp = 0; return this; } /** - * optional uint32 plane_id = 4; - * @return the planeId + * optional uint32 max_mp = 8; + * @return the maxMp */ - public int getPlaneId() { - return planeId; + public int getMaxMp() { + return maxMp; } /** - * optional uint32 plane_id = 4; - * @param value the planeId to set + * optional uint32 max_mp = 8; + * @param value the maxMp to set * @return this */ - public LineupInfo setPlaneId(final int value) { + public LineupInfo setMaxMp(final int value) { bitField0_ |= 0x00000002; - planeId = value; + maxMp = value; return this; } /** - * optional uint32 leader_slot = 5; - * @return whether the leaderSlot field is set + * optional uint32 plane_id = 10; + * @return whether the planeId field is set */ - public boolean hasLeaderSlot() { + public boolean hasPlaneId() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 leader_slot = 5; + * optional uint32 plane_id = 10; * @return this */ - public LineupInfo clearLeaderSlot() { + public LineupInfo clearPlaneId() { bitField0_ &= ~0x00000004; - leaderSlot = 0; + planeId = 0; return this; } /** - * optional uint32 leader_slot = 5; - * @return the leaderSlot + * optional uint32 plane_id = 10; + * @return the planeId */ - public int getLeaderSlot() { - return leaderSlot; + public int getPlaneId() { + return planeId; } /** - * optional uint32 leader_slot = 5; - * @param value the leaderSlot to set + * optional uint32 plane_id = 10; + * @param value the planeId to set * @return this */ - public LineupInfo setLeaderSlot(final int value) { + public LineupInfo setPlaneId(final int value) { bitField0_ |= 0x00000004; - leaderSlot = value; + planeId = value; return this; } /** - * optional uint32 index = 7; + * optional uint32 index = 12; * @return whether the index field is set */ public boolean hasIndex() { @@ -195,7 +195,7 @@ public boolean hasIndex() { } /** - * optional uint32 index = 7; + * optional uint32 index = 12; * @return this */ public LineupInfo clearIndex() { @@ -205,7 +205,7 @@ public LineupInfo clearIndex() { } /** - * optional uint32 index = 7; + * optional uint32 index = 12; * @return the index */ public int getIndex() { @@ -213,7 +213,7 @@ public int getIndex() { } /** - * optional uint32 index = 7; + * optional uint32 index = 12; * @param value the index to set * @return this */ @@ -224,44 +224,44 @@ public LineupInfo setIndex(final int value) { } /** - * optional uint32 max_mp = 10; - * @return whether the maxMp field is set + * optional uint32 leader_slot = 13; + * @return whether the leaderSlot field is set */ - public boolean hasMaxMp() { + public boolean hasLeaderSlot() { return (bitField0_ & 0x00000010) != 0; } /** - * optional uint32 max_mp = 10; + * optional uint32 leader_slot = 13; * @return this */ - public LineupInfo clearMaxMp() { + public LineupInfo clearLeaderSlot() { bitField0_ &= ~0x00000010; - maxMp = 0; + leaderSlot = 0; return this; } /** - * optional uint32 max_mp = 10; - * @return the maxMp + * optional uint32 leader_slot = 13; + * @return the leaderSlot */ - public int getMaxMp() { - return maxMp; + public int getLeaderSlot() { + return leaderSlot; } /** - * optional uint32 max_mp = 10; - * @param value the maxMp to set + * optional uint32 leader_slot = 13; + * @param value the leaderSlot to set * @return this */ - public LineupInfo setMaxMp(final int value) { + public LineupInfo setLeaderSlot(final int value) { bitField0_ |= 0x00000010; - maxMp = value; + leaderSlot = value; return this; } /** - * optional .ExtraLineupType extra_lineup_type = 15; + * optional .ExtraLineupType extra_lineup_type = 6; * @return whether the extraLineupType field is set */ public boolean hasExtraLineupType() { @@ -269,7 +269,7 @@ public boolean hasExtraLineupType() { } /** - * optional .ExtraLineupType extra_lineup_type = 15; + * optional .ExtraLineupType extra_lineup_type = 6; * @return this */ public LineupInfo clearExtraLineupType() { @@ -279,7 +279,7 @@ public LineupInfo clearExtraLineupType() { } /** - * optional .ExtraLineupType extra_lineup_type = 15; + * optional .ExtraLineupType extra_lineup_type = 6; * @return the extraLineupType */ public ExtraLineupTypeOuterClass.ExtraLineupType getExtraLineupType() { @@ -312,7 +312,7 @@ public LineupInfo setExtraLineupTypeValue(final int value) { } /** - * optional .ExtraLineupType extra_lineup_type = 15; + * optional .ExtraLineupType extra_lineup_type = 6; * @param value the extraLineupType to set * @return this */ @@ -323,7 +323,7 @@ public LineupInfo setExtraLineupType(final ExtraLineupTypeOuterClass.ExtraLineup } /** - * optional bool is_virtual = 8; + * optional bool is_virtual = 2; * @return whether the isVirtual field is set */ public boolean hasIsVirtual() { @@ -331,7 +331,7 @@ public boolean hasIsVirtual() { } /** - * optional bool is_virtual = 8; + * optional bool is_virtual = 2; * @return this */ public LineupInfo clearIsVirtual() { @@ -341,7 +341,7 @@ public LineupInfo clearIsVirtual() { } /** - * optional bool is_virtual = 8; + * optional bool is_virtual = 2; * @return the isVirtual */ public boolean getIsVirtual() { @@ -349,7 +349,7 @@ public boolean getIsVirtual() { } /** - * optional bool is_virtual = 8; + * optional bool is_virtual = 2; * @param value the isVirtual to set * @return this */ @@ -360,7 +360,7 @@ public LineupInfo setIsVirtual(final boolean value) { } /** - * optional string name = 6; + * optional string name = 5; * @return whether the name field is set */ public boolean hasName() { @@ -368,7 +368,7 @@ public boolean hasName() { } /** - * optional string name = 6; + * optional string name = 5; * @return this */ public LineupInfo clearName() { @@ -378,7 +378,7 @@ public LineupInfo clearName() { } /** - * optional string name = 6; + * optional string name = 5; * @return the name */ public String getName() { @@ -386,7 +386,7 @@ public String getName() { } /** - * optional string name = 6; + * optional string name = 5; * @return internal {@code Utf8String} representation of name for reading */ public Utf8String getNameBytes() { @@ -394,7 +394,7 @@ public Utf8String getNameBytes() { } /** - * optional string name = 6; + * optional string name = 5; * @return internal {@code Utf8String} representation of name for modifications */ public Utf8String getMutableNameBytes() { @@ -403,7 +403,7 @@ public Utf8String getMutableNameBytes() { } /** - * optional string name = 6; + * optional string name = 5; * @param value the name to set * @return this */ @@ -414,7 +414,7 @@ public LineupInfo setName(final CharSequence value) { } /** - * optional string name = 6; + * optional string name = 5; * @param value the name to set * @return this */ @@ -425,7 +425,7 @@ public LineupInfo setName(final Utf8String value) { } /** - * repeated .LineupAvatar avatar_list = 2; + * repeated .LineupAvatar avatar_list = 15; * @return whether the avatarList field is set */ public boolean hasAvatarList() { @@ -433,7 +433,7 @@ public boolean hasAvatarList() { } /** - * repeated .LineupAvatar avatar_list = 2; + * repeated .LineupAvatar avatar_list = 15; * @return this */ public LineupInfo clearAvatarList() { @@ -443,7 +443,7 @@ public LineupInfo clearAvatarList() { } /** - * repeated .LineupAvatar avatar_list = 2; + * repeated .LineupAvatar avatar_list = 15; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -457,7 +457,7 @@ public RepeatedMessage getAvatarList() { } /** - * repeated .LineupAvatar avatar_list = 2; + * repeated .LineupAvatar avatar_list = 15; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -471,7 +471,7 @@ public RepeatedMessage getMutableAvatarList } /** - * repeated .LineupAvatar avatar_list = 2; + * repeated .LineupAvatar avatar_list = 15; * @param value the avatarList to add * @return this */ @@ -482,7 +482,7 @@ public LineupInfo addAvatarList(final LineupAvatarOuterClass.LineupAvatar value) } /** - * repeated .LineupAvatar avatar_list = 2; + * repeated .LineupAvatar avatar_list = 15; * @param values the avatarList to add * @return this */ @@ -498,10 +498,10 @@ public LineupInfo copyFrom(final LineupInfo other) { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; mp = other.mp; + maxMp = other.maxMp; planeId = other.planeId; - leaderSlot = other.leaderSlot; index = other.index; - maxMp = other.maxMp; + leaderSlot = other.leaderSlot; extraLineupType = other.extraLineupType; isVirtual = other.isVirtual; name.copyFrom(other.name); @@ -519,17 +519,17 @@ public LineupInfo mergeFrom(final LineupInfo other) { if (other.hasMp()) { setMp(other.mp); } + if (other.hasMaxMp()) { + setMaxMp(other.maxMp); + } if (other.hasPlaneId()) { setPlaneId(other.planeId); } - if (other.hasLeaderSlot()) { - setLeaderSlot(other.leaderSlot); - } if (other.hasIndex()) { setIndex(other.index); } - if (other.hasMaxMp()) { - setMaxMp(other.maxMp); + if (other.hasLeaderSlot()) { + setLeaderSlot(other.leaderSlot); } if (other.hasExtraLineupType()) { setExtraLineupTypeValue(other.extraLineupType); @@ -554,10 +554,10 @@ public LineupInfo clear() { cachedSize = -1; bitField0_ = 0; mp = 0; + maxMp = 0; planeId = 0; - leaderSlot = 0; index = 0; - maxMp = 0; + leaderSlot = 0; extraLineupType = 0; isVirtual = false; name.clear(); @@ -588,10 +588,10 @@ public boolean equals(Object o) { LineupInfo other = (LineupInfo) o; return bitField0_ == other.bitField0_ && (!hasMp() || mp == other.mp) + && (!hasMaxMp() || maxMp == other.maxMp) && (!hasPlaneId() || planeId == other.planeId) - && (!hasLeaderSlot() || leaderSlot == other.leaderSlot) && (!hasIndex() || index == other.index) - && (!hasMaxMp() || maxMp == other.maxMp) + && (!hasLeaderSlot() || leaderSlot == other.leaderSlot) && (!hasExtraLineupType() || extraLineupType == other.extraLineupType) && (!hasIsVirtual() || isVirtual == other.isVirtual) && (!hasName() || name.equals(other.name)) @@ -601,40 +601,40 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(mp); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 32); - output.writeUInt32NoTag(planeId); + output.writeRawByte((byte) 64); + output.writeUInt32NoTag(maxMp); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 40); - output.writeUInt32NoTag(leaderSlot); + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(planeId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(index); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 80); - output.writeUInt32NoTag(maxMp); + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(leaderSlot); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 48); output.writeEnumNoTag(extraLineupType); } if ((bitField0_ & 0x00000040) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 16); output.writeBoolNoTag(isVirtual); } if ((bitField0_ & 0x00000080) != 0) { - output.writeRawByte((byte) 50); + output.writeRawByte((byte) 42); output.writeStringNoTag(name); } if ((bitField0_ & 0x00000100) != 0) { for (int i = 0; i < avatarList.length(); i++) { - output.writeRawByte((byte) 18); + output.writeRawByte((byte) 122); output.writeMessageNoTag(avatarList.get(i)); } } @@ -647,16 +647,16 @@ protected int computeSerializedSize() { size += 1 + ProtoSink.computeUInt32SizeNoTag(mp); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(planeId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(maxMp); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(leaderSlot); + size += 1 + ProtoSink.computeUInt32SizeNoTag(planeId); } if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(index); } if ((bitField0_ & 0x00000010) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(maxMp); + size += 1 + ProtoSink.computeUInt32SizeNoTag(leaderSlot); } if ((bitField0_ & 0x00000020) != 0) { size += 1 + ProtoSink.computeEnumSizeNoTag(extraLineupType); @@ -680,52 +680,52 @@ public LineupInfo mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { + case 56: { // mp mp = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 32) { + if (tag != 64) { break; } } - case 32: { - // planeId - planeId = input.readUInt32(); + case 64: { + // maxMp + maxMp = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 40) { + if (tag != 80) { break; } } - case 40: { - // leaderSlot - leaderSlot = input.readUInt32(); + case 80: { + // planeId + planeId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 56) { + if (tag != 96) { break; } } - case 56: { + case 96: { // index index = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 80) { + if (tag != 104) { break; } } - case 80: { - // maxMp - maxMp = input.readUInt32(); + case 104: { + // leaderSlot + leaderSlot = input.readUInt32(); bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 120) { + if (tag != 48) { break; } } - case 120: { + case 48: { // extraLineupType final int value = input.readInt32(); if (ExtraLineupTypeOuterClass.ExtraLineupType.forNumber(value) != null) { @@ -733,29 +733,29 @@ public LineupInfo mergeFrom(final ProtoSource input) throws IOException { bitField0_ |= 0x00000020; } tag = input.readTag(); - if (tag != 64) { + if (tag != 16) { break; } } - case 64: { + case 16: { // isVirtual isVirtual = input.readBool(); bitField0_ |= 0x00000040; tag = input.readTag(); - if (tag != 50) { + if (tag != 42) { break; } } - case 50: { + case 42: { // name input.readString(name); bitField0_ |= 0x00000080; tag = input.readTag(); - if (tag != 18) { + if (tag != 122) { break; } } - case 18: { + case 122: { // avatarList tag = input.readRepeatedMessage(avatarList, tag); bitField0_ |= 0x00000100; @@ -784,16 +784,16 @@ public void writeTo(final JsonSink output) throws IOException { output.writeUInt32(FieldNames.mp, mp); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.planeId, planeId); + output.writeUInt32(FieldNames.maxMp, maxMp); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.leaderSlot, leaderSlot); + output.writeUInt32(FieldNames.planeId, planeId); } if ((bitField0_ & 0x00000008) != 0) { output.writeUInt32(FieldNames.index, index); } if ((bitField0_ & 0x00000010) != 0) { - output.writeUInt32(FieldNames.maxMp, maxMp); + output.writeUInt32(FieldNames.leaderSlot, leaderSlot); } if ((bitField0_ & 0x00000020) != 0) { output.writeEnum(FieldNames.extraLineupType, extraLineupType, ExtraLineupTypeOuterClass.ExtraLineupType.converter()); @@ -828,11 +828,11 @@ public LineupInfo mergeFrom(final JsonSource input) throws IOException { } break; } - case -493896553: - case 1869097438: { - if (input.isAtField(FieldNames.planeId)) { + case 103671335: + case -1081138594: { + if (input.isAtField(FieldNames.maxMp)) { if (!input.trySkipNullValue()) { - planeId = input.readUInt32(); + maxMp = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -840,11 +840,11 @@ public LineupInfo mergeFrom(final JsonSource input) throws IOException { } break; } - case 1191442087: - case -1708713100: { - if (input.isAtField(FieldNames.leaderSlot)) { + case -493896553: + case 1869097438: { + if (input.isAtField(FieldNames.planeId)) { if (!input.trySkipNullValue()) { - leaderSlot = input.readUInt32(); + planeId = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -863,11 +863,11 @@ public LineupInfo mergeFrom(final JsonSource input) throws IOException { } break; } - case 103671335: - case -1081138594: { - if (input.isAtField(FieldNames.maxMp)) { + case 1191442087: + case -1708713100: { + if (input.isAtField(FieldNames.leaderSlot)) { if (!input.trySkipNullValue()) { - maxMp = input.readUInt32(); + leaderSlot = input.readUInt32(); bitField0_ |= 0x00000010; } } else { @@ -981,13 +981,13 @@ public LineupInfo create() { static class FieldNames { static final FieldName mp = FieldName.forField("mp"); - static final FieldName planeId = FieldName.forField("planeId", "plane_id"); + static final FieldName maxMp = FieldName.forField("maxMp", "max_mp"); - static final FieldName leaderSlot = FieldName.forField("leaderSlot", "leader_slot"); + static final FieldName planeId = FieldName.forField("planeId", "plane_id"); static final FieldName index = FieldName.forField("index"); - static final FieldName maxMp = FieldName.forField("maxMp", "max_mp"); + static final FieldName leaderSlot = FieldName.forField("leaderSlot", "leader_slot"); static final FieldName extraLineupType = FieldName.forField("extraLineupType", "extra_lineup_type"); diff --git a/src/generated/main/emu/lunarcore/proto/LineupSlotDataOuterClass.java b/src/generated/main/emu/lunarcore/proto/LineupSlotDataOuterClass.java index fa553b30a..e981ccaf3 100644 --- a/src/generated/main/emu/lunarcore/proto/LineupSlotDataOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/LineupSlotDataOuterClass.java @@ -19,7 +19,7 @@ public static final class LineupSlotData extends ProtoMessage im private static final long serialVersionUID = 0L; /** - * optional uint32 id = 3; + * optional uint32 id = 6; */ private int id; @@ -29,7 +29,7 @@ public static final class LineupSlotData extends ProtoMessage im private int slot; /** - * optional .AvatarType avatar_type = 2; + * optional .AvatarType avatar_type = 15; */ private int avatarType; @@ -44,7 +44,7 @@ public static LineupSlotData newInstance() { } /** - * optional uint32 id = 3; + * optional uint32 id = 6; * @return whether the id field is set */ public boolean hasId() { @@ -52,7 +52,7 @@ public boolean hasId() { } /** - * optional uint32 id = 3; + * optional uint32 id = 6; * @return this */ public LineupSlotData clearId() { @@ -62,7 +62,7 @@ public LineupSlotData clearId() { } /** - * optional uint32 id = 3; + * optional uint32 id = 6; * @return the id */ public int getId() { @@ -70,7 +70,7 @@ public int getId() { } /** - * optional uint32 id = 3; + * optional uint32 id = 6; * @param value the id to set * @return this */ @@ -118,7 +118,7 @@ public LineupSlotData setSlot(final int value) { } /** - * optional .AvatarType avatar_type = 2; + * optional .AvatarType avatar_type = 15; * @return whether the avatarType field is set */ public boolean hasAvatarType() { @@ -126,7 +126,7 @@ public boolean hasAvatarType() { } /** - * optional .AvatarType avatar_type = 2; + * optional .AvatarType avatar_type = 15; * @return this */ public LineupSlotData clearAvatarType() { @@ -136,7 +136,7 @@ public LineupSlotData clearAvatarType() { } /** - * optional .AvatarType avatar_type = 2; + * optional .AvatarType avatar_type = 15; * @return the avatarType */ public AvatarTypeOuterClass.AvatarType getAvatarType() { @@ -169,7 +169,7 @@ public LineupSlotData setAvatarTypeValue(final int value) { } /** - * optional .AvatarType avatar_type = 2; + * optional .AvatarType avatar_type = 15; * @param value the avatarType to set * @return this */ @@ -250,7 +250,7 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(id); } if ((bitField0_ & 0x00000002) != 0) { @@ -258,7 +258,7 @@ public void writeTo(final ProtoSink output) throws IOException { output.writeUInt32NoTag(slot); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 120); output.writeEnumNoTag(avatarType); } } @@ -285,7 +285,7 @@ public LineupSlotData mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { + case 48: { // id id = input.readUInt32(); bitField0_ |= 0x00000001; @@ -299,11 +299,11 @@ public LineupSlotData mergeFrom(final ProtoSource input) throws IOException { slot = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 16) { + if (tag != 120) { break; } } - case 16: { + case 120: { // avatarType final int value = input.readInt32(); if (AvatarTypeOuterClass.AvatarType.forNumber(value) != null) { diff --git a/src/generated/main/emu/lunarcore/proto/LockEquipmentCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/LockEquipmentCsReqOuterClass.java index 8d8519b4e..ce771b0bd 100644 --- a/src/generated/main/emu/lunarcore/proto/LockEquipmentCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/LockEquipmentCsReqOuterClass.java @@ -19,12 +19,12 @@ public static final class LockEquipmentCsReq extends ProtoMessageoptional uint32 equipment_unique_id = 15; + * optional uint32 equipment_unique_id = 4; */ private int equipmentUniqueId; /** - * optional bool is_protected = 8; + * optional bool is_protected = 11; */ private boolean isProtected; @@ -39,7 +39,7 @@ public static LockEquipmentCsReq newInstance() { } /** - * optional uint32 equipment_unique_id = 15; + * optional uint32 equipment_unique_id = 4; * @return whether the equipmentUniqueId field is set */ public boolean hasEquipmentUniqueId() { @@ -47,7 +47,7 @@ public boolean hasEquipmentUniqueId() { } /** - * optional uint32 equipment_unique_id = 15; + * optional uint32 equipment_unique_id = 4; * @return this */ public LockEquipmentCsReq clearEquipmentUniqueId() { @@ -57,7 +57,7 @@ public LockEquipmentCsReq clearEquipmentUniqueId() { } /** - * optional uint32 equipment_unique_id = 15; + * optional uint32 equipment_unique_id = 4; * @return the equipmentUniqueId */ public int getEquipmentUniqueId() { @@ -65,7 +65,7 @@ public int getEquipmentUniqueId() { } /** - * optional uint32 equipment_unique_id = 15; + * optional uint32 equipment_unique_id = 4; * @param value the equipmentUniqueId to set * @return this */ @@ -76,7 +76,7 @@ public LockEquipmentCsReq setEquipmentUniqueId(final int value) { } /** - * optional bool is_protected = 8; + * optional bool is_protected = 11; * @return whether the isProtected field is set */ public boolean hasIsProtected() { @@ -84,7 +84,7 @@ public boolean hasIsProtected() { } /** - * optional bool is_protected = 8; + * optional bool is_protected = 11; * @return this */ public LockEquipmentCsReq clearIsProtected() { @@ -94,7 +94,7 @@ public LockEquipmentCsReq clearIsProtected() { } /** - * optional bool is_protected = 8; + * optional bool is_protected = 11; * @return the isProtected */ public boolean getIsProtected() { @@ -102,7 +102,7 @@ public boolean getIsProtected() { } /** - * optional bool is_protected = 8; + * optional bool is_protected = 11; * @param value the isProtected to set * @return this */ @@ -177,11 +177,11 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(equipmentUniqueId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 88); output.writeBoolNoTag(isProtected); } } @@ -205,16 +205,16 @@ public LockEquipmentCsReq mergeFrom(final ProtoSource input) throws IOException int tag = input.readTag(); while (true) { switch (tag) { - case 120: { + case 32: { // equipmentUniqueId equipmentUniqueId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 64) { + if (tag != 88) { break; } } - case 64: { + case 88: { // isProtected isProtected = input.readBool(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/LockEquipmentScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/LockEquipmentScRspOuterClass.java index da7397503..7be68e100 100644 --- a/src/generated/main/emu/lunarcore/proto/LockEquipmentScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/LockEquipmentScRspOuterClass.java @@ -19,14 +19,14 @@ public static final class LockEquipmentScRsp extends ProtoMessageoptional uint32 retcode = 6; + * optional uint32 equipment_unique_id = 3; */ - private int retcode; + private int equipmentUniqueId; /** - * optional uint32 equipment_unique_id = 13; + * optional uint32 retcode = 13; */ - private int equipmentUniqueId; + private int retcode; private LockEquipmentScRsp() { } @@ -39,76 +39,76 @@ public static LockEquipmentScRsp newInstance() { } /** - * optional uint32 retcode = 6; - * @return whether the retcode field is set + * optional uint32 equipment_unique_id = 3; + * @return whether the equipmentUniqueId field is set */ - public boolean hasRetcode() { + public boolean hasEquipmentUniqueId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 retcode = 6; + * optional uint32 equipment_unique_id = 3; * @return this */ - public LockEquipmentScRsp clearRetcode() { + public LockEquipmentScRsp clearEquipmentUniqueId() { bitField0_ &= ~0x00000001; - retcode = 0; + equipmentUniqueId = 0; return this; } /** - * optional uint32 retcode = 6; - * @return the retcode + * optional uint32 equipment_unique_id = 3; + * @return the equipmentUniqueId */ - public int getRetcode() { - return retcode; + public int getEquipmentUniqueId() { + return equipmentUniqueId; } /** - * optional uint32 retcode = 6; - * @param value the retcode to set + * optional uint32 equipment_unique_id = 3; + * @param value the equipmentUniqueId to set * @return this */ - public LockEquipmentScRsp setRetcode(final int value) { + public LockEquipmentScRsp setEquipmentUniqueId(final int value) { bitField0_ |= 0x00000001; - retcode = value; + equipmentUniqueId = value; return this; } /** - * optional uint32 equipment_unique_id = 13; - * @return whether the equipmentUniqueId field is set + * optional uint32 retcode = 13; + * @return whether the retcode field is set */ - public boolean hasEquipmentUniqueId() { + public boolean hasRetcode() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 equipment_unique_id = 13; + * optional uint32 retcode = 13; * @return this */ - public LockEquipmentScRsp clearEquipmentUniqueId() { + public LockEquipmentScRsp clearRetcode() { bitField0_ &= ~0x00000002; - equipmentUniqueId = 0; + retcode = 0; return this; } /** - * optional uint32 equipment_unique_id = 13; - * @return the equipmentUniqueId + * optional uint32 retcode = 13; + * @return the retcode */ - public int getEquipmentUniqueId() { - return equipmentUniqueId; + public int getRetcode() { + return retcode; } /** - * optional uint32 equipment_unique_id = 13; - * @param value the equipmentUniqueId to set + * optional uint32 retcode = 13; + * @param value the retcode to set * @return this */ - public LockEquipmentScRsp setEquipmentUniqueId(final int value) { + public LockEquipmentScRsp setRetcode(final int value) { bitField0_ |= 0x00000002; - equipmentUniqueId = value; + retcode = value; return this; } @@ -117,8 +117,8 @@ public LockEquipmentScRsp copyFrom(final LockEquipmentScRsp other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - retcode = other.retcode; equipmentUniqueId = other.equipmentUniqueId; + retcode = other.retcode; } return this; } @@ -129,12 +129,12 @@ public LockEquipmentScRsp mergeFrom(final LockEquipmentScRsp other) { return this; } cachedSize = -1; - if (other.hasRetcode()) { - setRetcode(other.retcode); - } if (other.hasEquipmentUniqueId()) { setEquipmentUniqueId(other.equipmentUniqueId); } + if (other.hasRetcode()) { + setRetcode(other.retcode); + } return this; } @@ -145,8 +145,8 @@ public LockEquipmentScRsp clear() { } cachedSize = -1; bitField0_ = 0; - retcode = 0; equipmentUniqueId = 0; + retcode = 0; return this; } @@ -170,19 +170,19 @@ public boolean equals(Object o) { } LockEquipmentScRsp other = (LockEquipmentScRsp) o; return bitField0_ == other.bitField0_ - && (!hasRetcode() || retcode == other.retcode) - && (!hasEquipmentUniqueId() || equipmentUniqueId == other.equipmentUniqueId); + && (!hasEquipmentUniqueId() || equipmentUniqueId == other.equipmentUniqueId) + && (!hasRetcode() || retcode == other.retcode); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 48); - output.writeUInt32NoTag(retcode); + output.writeRawByte((byte) 24); + output.writeUInt32NoTag(equipmentUniqueId); } if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 104); - output.writeUInt32NoTag(equipmentUniqueId); + output.writeUInt32NoTag(retcode); } } @@ -190,10 +190,10 @@ public void writeTo(final ProtoSink output) throws IOException { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(equipmentUniqueId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(equipmentUniqueId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } return size; } @@ -205,9 +205,9 @@ public LockEquipmentScRsp mergeFrom(final ProtoSource input) throws IOException int tag = input.readTag(); while (true) { switch (tag) { - case 48: { - // retcode - retcode = input.readUInt32(); + case 24: { + // equipmentUniqueId + equipmentUniqueId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 104) { @@ -215,8 +215,8 @@ public LockEquipmentScRsp mergeFrom(final ProtoSource input) throws IOException } } case 104: { - // equipmentUniqueId - equipmentUniqueId = input.readUInt32(); + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -241,10 +241,10 @@ public LockEquipmentScRsp mergeFrom(final ProtoSource input) throws IOException public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.equipmentUniqueId, equipmentUniqueId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.equipmentUniqueId, equipmentUniqueId); + output.writeUInt32(FieldNames.retcode, retcode); } output.endObject(); } @@ -256,10 +256,11 @@ public LockEquipmentScRsp mergeFrom(final JsonSource input) throws IOException { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case -1867136902: + case 760467160: { + if (input.isAtField(FieldNames.equipmentUniqueId)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + equipmentUniqueId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -267,11 +268,10 @@ public LockEquipmentScRsp mergeFrom(final JsonSource input) throws IOException { } break; } - case -1867136902: - case 760467160: { - if (input.isAtField(FieldNames.equipmentUniqueId)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - equipmentUniqueId = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -332,9 +332,9 @@ public LockEquipmentScRsp create() { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName equipmentUniqueId = FieldName.forField("equipmentUniqueId", "equipment_unique_id"); + + static final FieldName retcode = FieldName.forField("retcode"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/LockRelicCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/LockRelicCsReqOuterClass.java index b64419c24..599477883 100644 --- a/src/generated/main/emu/lunarcore/proto/LockRelicCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/LockRelicCsReqOuterClass.java @@ -19,12 +19,12 @@ public static final class LockRelicCsReq extends ProtoMessage im private static final long serialVersionUID = 0L; /** - * optional uint32 relic_unique_id = 14; + * optional uint32 relic_unique_id = 1; */ private int relicUniqueId; /** - * optional bool is_protected = 1; + * optional bool is_protected = 10; */ private boolean isProtected; @@ -39,7 +39,7 @@ public static LockRelicCsReq newInstance() { } /** - * optional uint32 relic_unique_id = 14; + * optional uint32 relic_unique_id = 1; * @return whether the relicUniqueId field is set */ public boolean hasRelicUniqueId() { @@ -47,7 +47,7 @@ public boolean hasRelicUniqueId() { } /** - * optional uint32 relic_unique_id = 14; + * optional uint32 relic_unique_id = 1; * @return this */ public LockRelicCsReq clearRelicUniqueId() { @@ -57,7 +57,7 @@ public LockRelicCsReq clearRelicUniqueId() { } /** - * optional uint32 relic_unique_id = 14; + * optional uint32 relic_unique_id = 1; * @return the relicUniqueId */ public int getRelicUniqueId() { @@ -65,7 +65,7 @@ public int getRelicUniqueId() { } /** - * optional uint32 relic_unique_id = 14; + * optional uint32 relic_unique_id = 1; * @param value the relicUniqueId to set * @return this */ @@ -76,7 +76,7 @@ public LockRelicCsReq setRelicUniqueId(final int value) { } /** - * optional bool is_protected = 1; + * optional bool is_protected = 10; * @return whether the isProtected field is set */ public boolean hasIsProtected() { @@ -84,7 +84,7 @@ public boolean hasIsProtected() { } /** - * optional bool is_protected = 1; + * optional bool is_protected = 10; * @return this */ public LockRelicCsReq clearIsProtected() { @@ -94,7 +94,7 @@ public LockRelicCsReq clearIsProtected() { } /** - * optional bool is_protected = 1; + * optional bool is_protected = 10; * @return the isProtected */ public boolean getIsProtected() { @@ -102,7 +102,7 @@ public boolean getIsProtected() { } /** - * optional bool is_protected = 1; + * optional bool is_protected = 10; * @param value the isProtected to set * @return this */ @@ -177,11 +177,11 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(relicUniqueId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 80); output.writeBoolNoTag(isProtected); } } @@ -205,16 +205,16 @@ public LockRelicCsReq mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 112: { + case 8: { // relicUniqueId relicUniqueId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 8) { + if (tag != 80) { break; } } - case 8: { + case 80: { // isProtected isProtected = input.readBool(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/LockRelicScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/LockRelicScRspOuterClass.java index db43e7e85..8b168ea5f 100644 --- a/src/generated/main/emu/lunarcore/proto/LockRelicScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/LockRelicScRspOuterClass.java @@ -19,14 +19,14 @@ public static final class LockRelicScRsp extends ProtoMessage im private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 2; + * optional uint32 relic_unique_id = 4; */ - private int retcode; + private int relicUniqueId; /** - * optional uint32 relic_unique_id = 3; + * optional uint32 retcode = 7; */ - private int relicUniqueId; + private int retcode; private LockRelicScRsp() { } @@ -39,76 +39,76 @@ public static LockRelicScRsp newInstance() { } /** - * optional uint32 retcode = 2; - * @return whether the retcode field is set + * optional uint32 relic_unique_id = 4; + * @return whether the relicUniqueId field is set */ - public boolean hasRetcode() { + public boolean hasRelicUniqueId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 retcode = 2; + * optional uint32 relic_unique_id = 4; * @return this */ - public LockRelicScRsp clearRetcode() { + public LockRelicScRsp clearRelicUniqueId() { bitField0_ &= ~0x00000001; - retcode = 0; + relicUniqueId = 0; return this; } /** - * optional uint32 retcode = 2; - * @return the retcode + * optional uint32 relic_unique_id = 4; + * @return the relicUniqueId */ - public int getRetcode() { - return retcode; + public int getRelicUniqueId() { + return relicUniqueId; } /** - * optional uint32 retcode = 2; - * @param value the retcode to set + * optional uint32 relic_unique_id = 4; + * @param value the relicUniqueId to set * @return this */ - public LockRelicScRsp setRetcode(final int value) { + public LockRelicScRsp setRelicUniqueId(final int value) { bitField0_ |= 0x00000001; - retcode = value; + relicUniqueId = value; return this; } /** - * optional uint32 relic_unique_id = 3; - * @return whether the relicUniqueId field is set + * optional uint32 retcode = 7; + * @return whether the retcode field is set */ - public boolean hasRelicUniqueId() { + public boolean hasRetcode() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 relic_unique_id = 3; + * optional uint32 retcode = 7; * @return this */ - public LockRelicScRsp clearRelicUniqueId() { + public LockRelicScRsp clearRetcode() { bitField0_ &= ~0x00000002; - relicUniqueId = 0; + retcode = 0; return this; } /** - * optional uint32 relic_unique_id = 3; - * @return the relicUniqueId + * optional uint32 retcode = 7; + * @return the retcode */ - public int getRelicUniqueId() { - return relicUniqueId; + public int getRetcode() { + return retcode; } /** - * optional uint32 relic_unique_id = 3; - * @param value the relicUniqueId to set + * optional uint32 retcode = 7; + * @param value the retcode to set * @return this */ - public LockRelicScRsp setRelicUniqueId(final int value) { + public LockRelicScRsp setRetcode(final int value) { bitField0_ |= 0x00000002; - relicUniqueId = value; + retcode = value; return this; } @@ -117,8 +117,8 @@ public LockRelicScRsp copyFrom(final LockRelicScRsp other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - retcode = other.retcode; relicUniqueId = other.relicUniqueId; + retcode = other.retcode; } return this; } @@ -129,12 +129,12 @@ public LockRelicScRsp mergeFrom(final LockRelicScRsp other) { return this; } cachedSize = -1; - if (other.hasRetcode()) { - setRetcode(other.retcode); - } if (other.hasRelicUniqueId()) { setRelicUniqueId(other.relicUniqueId); } + if (other.hasRetcode()) { + setRetcode(other.retcode); + } return this; } @@ -145,8 +145,8 @@ public LockRelicScRsp clear() { } cachedSize = -1; bitField0_ = 0; - retcode = 0; relicUniqueId = 0; + retcode = 0; return this; } @@ -170,19 +170,19 @@ public boolean equals(Object o) { } LockRelicScRsp other = (LockRelicScRsp) o; return bitField0_ == other.bitField0_ - && (!hasRetcode() || retcode == other.retcode) - && (!hasRelicUniqueId() || relicUniqueId == other.relicUniqueId); + && (!hasRelicUniqueId() || relicUniqueId == other.relicUniqueId) + && (!hasRetcode() || retcode == other.retcode); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); - output.writeUInt32NoTag(retcode); + output.writeRawByte((byte) 32); + output.writeUInt32NoTag(relicUniqueId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 24); - output.writeUInt32NoTag(relicUniqueId); + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(retcode); } } @@ -190,10 +190,10 @@ public void writeTo(final ProtoSink output) throws IOException { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(relicUniqueId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(relicUniqueId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } return size; } @@ -205,18 +205,18 @@ public LockRelicScRsp mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { - // retcode - retcode = input.readUInt32(); + case 32: { + // relicUniqueId + relicUniqueId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 24) { + if (tag != 56) { break; } } - case 24: { - // relicUniqueId - relicUniqueId = input.readUInt32(); + case 56: { + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -241,10 +241,10 @@ public LockRelicScRsp mergeFrom(final ProtoSource input) throws IOException { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.relicUniqueId, relicUniqueId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.relicUniqueId, relicUniqueId); + output.writeUInt32(FieldNames.retcode, retcode); } output.endObject(); } @@ -256,10 +256,11 @@ public LockRelicScRsp mergeFrom(final JsonSource input) throws IOException { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case -1966200481: + case 49648253: { + if (input.isAtField(FieldNames.relicUniqueId)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + relicUniqueId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -267,11 +268,10 @@ public LockRelicScRsp mergeFrom(final JsonSource input) throws IOException { } break; } - case -1966200481: - case 49648253: { - if (input.isAtField(FieldNames.relicUniqueId)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - relicUniqueId = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -332,9 +332,9 @@ public LockRelicScRsp create() { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName relicUniqueId = FieldName.forField("relicUniqueId", "relic_unique_id"); + + static final FieldName retcode = FieldName.forField("retcode"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/MECNPEEJJDEOuterClass.java b/src/generated/main/emu/lunarcore/proto/MECNPEEJJDEOuterClass.java index 424019bcf..5a4b7c564 100644 --- a/src/generated/main/emu/lunarcore/proto/MECNPEEJJDEOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/MECNPEEJJDEOuterClass.java @@ -20,7 +20,7 @@ public static final class MECNPEEJJDE extends ProtoMessage implemen /** * 
-     * LJABGHIILFI DHJPHJOBLLB = 7;
+     *  idk
      *
* * optional uint32 GLFDHAJPJDF = 3; @@ -39,7 +39,7 @@ public static MECNPEEJJDE newInstance() { /** * 
-     * LJABGHIILFI DHJPHJOBLLB = 7;
+     *  idk
      *
* * optional uint32 GLFDHAJPJDF = 3; @@ -51,7 +51,7 @@ public boolean hasGLFDHAJPJDF() { /** * 
-     * LJABGHIILFI DHJPHJOBLLB = 7;
+     *  idk
      *
* * optional uint32 GLFDHAJPJDF = 3; @@ -65,7 +65,7 @@ public MECNPEEJJDE clearGLFDHAJPJDF() { /** * 
-     * LJABGHIILFI DHJPHJOBLLB = 7;
+     *  idk
      *
* * optional uint32 GLFDHAJPJDF = 3; @@ -77,7 +77,7 @@ public int getGLFDHAJPJDF() { /** * 
-     * LJABGHIILFI DHJPHJOBLLB = 7;
+     *  idk
      *
* * optional uint32 GLFDHAJPJDF = 3; diff --git a/src/generated/main/emu/lunarcore/proto/MEMPJPLINCNOuterClass.java b/src/generated/main/emu/lunarcore/proto/MEMPJPLINCNOuterClass.java deleted file mode 100644 index 7bcaed2b7..000000000 --- a/src/generated/main/emu/lunarcore/proto/MEMPJPLINCNOuterClass.java +++ /dev/null @@ -1,480 +0,0 @@ -// Code generated by protocol buffer compiler. Do not edit! -package emu.lunarcore.proto; - -import java.io.IOException; -import us.hebi.quickbuf.FieldName; -import us.hebi.quickbuf.InvalidProtocolBufferException; -import us.hebi.quickbuf.JsonSink; -import us.hebi.quickbuf.JsonSource; -import us.hebi.quickbuf.MessageFactory; -import us.hebi.quickbuf.ProtoMessage; -import us.hebi.quickbuf.ProtoSink; -import us.hebi.quickbuf.ProtoSource; -import us.hebi.quickbuf.RepeatedInt; - -public final class MEMPJPLINCNOuterClass { - /** - * Protobuf type {@code MEMPJPLINCN} - */ - public static final class MEMPJPLINCN extends ProtoMessage implements Cloneable { - private static final long serialVersionUID = 0L; - - /** - * optional uint32 HFHKBMGBJAN = 15; - */ - private int hFHKBMGBJAN; - - /** - * optional .ItemList NHCHCBBLKBK = 6; - */ - private final ItemListOuterClass.ItemList nHCHCBBLKBK = ItemListOuterClass.ItemList.newInstance(); - - /** - * repeated uint32 BLGIMDCNDHJ = 5; - */ - private final RepeatedInt bLGIMDCNDHJ = RepeatedInt.newEmptyInstance(); - - private MEMPJPLINCN() { - } - - /** - * @return a new empty instance of {@code MEMPJPLINCN} - */ - public static MEMPJPLINCN newInstance() { - return new MEMPJPLINCN(); - } - - /** - * optional uint32 HFHKBMGBJAN = 15; - * @return whether the hFHKBMGBJAN field is set - */ - public boolean hasHFHKBMGBJAN() { - return (bitField0_ & 0x00000001) != 0; - } - - /** - * optional uint32 HFHKBMGBJAN = 15; - * @return this - */ - public MEMPJPLINCN clearHFHKBMGBJAN() { - bitField0_ &= ~0x00000001; - hFHKBMGBJAN = 0; - return this; - } - - /** - * optional uint32 HFHKBMGBJAN = 15; - * @return the hFHKBMGBJAN - */ - public int getHFHKBMGBJAN() { - return hFHKBMGBJAN; - } - - /** - * optional uint32 HFHKBMGBJAN = 15; - * @param value the hFHKBMGBJAN to set - * @return this - */ - public MEMPJPLINCN setHFHKBMGBJAN(final int value) { - bitField0_ |= 0x00000001; - hFHKBMGBJAN = value; - return this; - } - - /** - * optional .ItemList NHCHCBBLKBK = 6; - * @return whether the nHCHCBBLKBK field is set - */ - public boolean hasNHCHCBBLKBK() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional .ItemList NHCHCBBLKBK = 6; - * @return this - */ - public MEMPJPLINCN clearNHCHCBBLKBK() { - bitField0_ &= ~0x00000002; - nHCHCBBLKBK.clear(); - return this; - } - - /** - * optional .ItemList NHCHCBBLKBK = 6; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * Use {@link #getMutableNHCHCBBLKBK()} if you want to modify it. - * - * @return internal storage object for reading - */ - public ItemListOuterClass.ItemList getNHCHCBBLKBK() { - return nHCHCBBLKBK; - } - - /** - * optional .ItemList NHCHCBBLKBK = 6; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public ItemListOuterClass.ItemList getMutableNHCHCBBLKBK() { - bitField0_ |= 0x00000002; - return nHCHCBBLKBK; - } - - /** - * optional .ItemList NHCHCBBLKBK = 6; - * @param value the nHCHCBBLKBK to set - * @return this - */ - public MEMPJPLINCN setNHCHCBBLKBK(final ItemListOuterClass.ItemList value) { - bitField0_ |= 0x00000002; - nHCHCBBLKBK.copyFrom(value); - return this; - } - - /** - * repeated uint32 BLGIMDCNDHJ = 5; - * @return whether the bLGIMDCNDHJ field is set - */ - public boolean hasBLGIMDCNDHJ() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * repeated uint32 BLGIMDCNDHJ = 5; - * @return this - */ - public MEMPJPLINCN clearBLGIMDCNDHJ() { - bitField0_ &= ~0x00000004; - bLGIMDCNDHJ.clear(); - return this; - } - - /** - * repeated uint32 BLGIMDCNDHJ = 5; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * Use {@link #getMutableBLGIMDCNDHJ()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedInt getBLGIMDCNDHJ() { - return bLGIMDCNDHJ; - } - - /** - * repeated uint32 BLGIMDCNDHJ = 5; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public RepeatedInt getMutableBLGIMDCNDHJ() { - bitField0_ |= 0x00000004; - return bLGIMDCNDHJ; - } - - /** - * repeated uint32 BLGIMDCNDHJ = 5; - * @param value the bLGIMDCNDHJ to add - * @return this - */ - public MEMPJPLINCN addBLGIMDCNDHJ(final int value) { - bitField0_ |= 0x00000004; - bLGIMDCNDHJ.add(value); - return this; - } - - /** - * repeated uint32 BLGIMDCNDHJ = 5; - * @param values the bLGIMDCNDHJ to add - * @return this - */ - public MEMPJPLINCN addAllBLGIMDCNDHJ(final int... values) { - bitField0_ |= 0x00000004; - bLGIMDCNDHJ.addAll(values); - return this; - } - - @Override - public MEMPJPLINCN copyFrom(final MEMPJPLINCN other) { - cachedSize = other.cachedSize; - if ((bitField0_ | other.bitField0_) != 0) { - bitField0_ = other.bitField0_; - hFHKBMGBJAN = other.hFHKBMGBJAN; - nHCHCBBLKBK.copyFrom(other.nHCHCBBLKBK); - bLGIMDCNDHJ.copyFrom(other.bLGIMDCNDHJ); - } - return this; - } - - @Override - public MEMPJPLINCN mergeFrom(final MEMPJPLINCN other) { - if (other.isEmpty()) { - return this; - } - cachedSize = -1; - if (other.hasHFHKBMGBJAN()) { - setHFHKBMGBJAN(other.hFHKBMGBJAN); - } - if (other.hasNHCHCBBLKBK()) { - getMutableNHCHCBBLKBK().mergeFrom(other.nHCHCBBLKBK); - } - if (other.hasBLGIMDCNDHJ()) { - getMutableBLGIMDCNDHJ().addAll(other.bLGIMDCNDHJ); - } - return this; - } - - @Override - public MEMPJPLINCN clear() { - if (isEmpty()) { - return this; - } - cachedSize = -1; - bitField0_ = 0; - hFHKBMGBJAN = 0; - nHCHCBBLKBK.clear(); - bLGIMDCNDHJ.clear(); - return this; - } - - @Override - public MEMPJPLINCN clearQuick() { - if (isEmpty()) { - return this; - } - cachedSize = -1; - bitField0_ = 0; - nHCHCBBLKBK.clearQuick(); - bLGIMDCNDHJ.clear(); - return this; - } - - @Override - public boolean equals(Object o) { - if (o == this) { - return true; - } - if (!(o instanceof MEMPJPLINCN)) { - return false; - } - MEMPJPLINCN other = (MEMPJPLINCN) o; - return bitField0_ == other.bitField0_ - && (!hasHFHKBMGBJAN() || hFHKBMGBJAN == other.hFHKBMGBJAN) - && (!hasNHCHCBBLKBK() || nHCHCBBLKBK.equals(other.nHCHCBBLKBK)) - && (!hasBLGIMDCNDHJ() || bLGIMDCNDHJ.equals(other.bLGIMDCNDHJ)); - } - - @Override - public void writeTo(final ProtoSink output) throws IOException { - if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 120); - output.writeUInt32NoTag(hFHKBMGBJAN); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 50); - output.writeMessageNoTag(nHCHCBBLKBK); - } - if ((bitField0_ & 0x00000004) != 0) { - for (int i = 0; i < bLGIMDCNDHJ.length(); i++) { - output.writeRawByte((byte) 40); - output.writeUInt32NoTag(bLGIMDCNDHJ.array()[i]); - } - } - } - - @Override - protected int computeSerializedSize() { - int size = 0; - if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(hFHKBMGBJAN); - } - if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(nHCHCBBLKBK); - } - if ((bitField0_ & 0x00000004) != 0) { - size += (1 * bLGIMDCNDHJ.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(bLGIMDCNDHJ); - } - return size; - } - - @Override - @SuppressWarnings("fallthrough") - public MEMPJPLINCN mergeFrom(final ProtoSource input) throws IOException { - // Enabled Fall-Through Optimization (QuickBuffers) - int tag = input.readTag(); - while (true) { - switch (tag) { - case 120: { - // hFHKBMGBJAN - hFHKBMGBJAN = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 50) { - break; - } - } - case 50: { - // nHCHCBBLKBK - input.readMessage(nHCHCBBLKBK); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 42) { - break; - } - } - case 42: { - // bLGIMDCNDHJ [packed=true] - input.readPackedUInt32(bLGIMDCNDHJ, tag); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 0) { - break; - } - } - case 0: { - return this; - } - default: { - if (!input.skipField(tag)) { - return this; - } - tag = input.readTag(); - break; - } - case 40: { - // bLGIMDCNDHJ [packed=false] - tag = input.readRepeatedUInt32(bLGIMDCNDHJ, tag); - bitField0_ |= 0x00000004; - break; - } - } - } - } - - @Override - public void writeTo(final JsonSink output) throws IOException { - output.beginObject(); - if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.hFHKBMGBJAN, hFHKBMGBJAN); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeMessage(FieldNames.nHCHCBBLKBK, nHCHCBBLKBK); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRepeatedUInt32(FieldNames.bLGIMDCNDHJ, bLGIMDCNDHJ); - } - output.endObject(); - } - - @Override - public MEMPJPLINCN mergeFrom(final JsonSource input) throws IOException { - if (!input.beginObject()) { - return this; - } - while (!input.isAtEnd()) { - switch (input.readFieldHash()) { - case -110713808: { - if (input.isAtField(FieldNames.hFHKBMGBJAN)) { - if (!input.trySkipNullValue()) { - hFHKBMGBJAN = input.readUInt32(); - bitField0_ |= 0x00000001; - } - } else { - input.skipUnknownField(); - } - break; - } - case 1681591244: { - if (input.isAtField(FieldNames.nHCHCBBLKBK)) { - if (!input.trySkipNullValue()) { - input.readMessage(nHCHCBBLKBK); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } - case 135413912: { - if (input.isAtField(FieldNames.bLGIMDCNDHJ)) { - if (!input.trySkipNullValue()) { - input.readRepeatedUInt32(bLGIMDCNDHJ); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } - default: { - input.skipUnknownField(); - break; - } - } - } - input.endObject(); - return this; - } - - @Override - public MEMPJPLINCN clone() { - return new MEMPJPLINCN().copyFrom(this); - } - - @Override - public boolean isEmpty() { - return ((bitField0_) == 0); - } - - public static MEMPJPLINCN parseFrom(final byte[] data) throws InvalidProtocolBufferException { - return ProtoMessage.mergeFrom(new MEMPJPLINCN(), data).checkInitialized(); - } - - public static MEMPJPLINCN parseFrom(final ProtoSource input) throws IOException { - return ProtoMessage.mergeFrom(new MEMPJPLINCN(), input).checkInitialized(); - } - - public static MEMPJPLINCN parseFrom(final JsonSource input) throws IOException { - return ProtoMessage.mergeFrom(new MEMPJPLINCN(), input).checkInitialized(); - } - - /** - * @return factory for creating MEMPJPLINCN messages - */ - public static MessageFactory getFactory() { - return MEMPJPLINCNFactory.INSTANCE; - } - - private enum MEMPJPLINCNFactory implements MessageFactory { - INSTANCE; - - @Override - public MEMPJPLINCN create() { - return MEMPJPLINCN.newInstance(); - } - } - - /** - * Contains name constants used for serializing JSON - */ - static class FieldNames { - static final FieldName hFHKBMGBJAN = FieldName.forField("HFHKBMGBJAN"); - - static final FieldName nHCHCBBLKBK = FieldName.forField("NHCHCBBLKBK"); - - static final FieldName bLGIMDCNDHJ = FieldName.forField("BLGIMDCNDHJ"); - } - } -} diff --git a/src/generated/main/emu/lunarcore/proto/MarkReadMailCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/MarkReadMailCsReqOuterClass.java index f5061bbf4..2cb1cf399 100644 --- a/src/generated/main/emu/lunarcore/proto/MarkReadMailCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/MarkReadMailCsReqOuterClass.java @@ -19,7 +19,7 @@ public static final class MarkReadMailCsReq extends ProtoMessageoptional uint32 id = 14; + * optional uint32 id = 6; */ private int id; @@ -34,7 +34,7 @@ public static MarkReadMailCsReq newInstance() { } /** - * optional uint32 id = 14; + * optional uint32 id = 6; * @return whether the id field is set */ public boolean hasId() { @@ -42,7 +42,7 @@ public boolean hasId() { } /** - * optional uint32 id = 14; + * optional uint32 id = 6; * @return this */ public MarkReadMailCsReq clearId() { @@ -52,7 +52,7 @@ public MarkReadMailCsReq clearId() { } /** - * optional uint32 id = 14; + * optional uint32 id = 6; * @return the id */ public int getId() { @@ -60,7 +60,7 @@ public int getId() { } /** - * optional uint32 id = 14; + * optional uint32 id = 6; * @param value the id to set * @return this */ @@ -129,7 +129,7 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(id); } } @@ -150,7 +150,7 @@ public MarkReadMailCsReq mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 112: { + case 48: { // id id = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/MarkReadMailScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/MarkReadMailScRspOuterClass.java index 896b7376c..db6c884ff 100644 --- a/src/generated/main/emu/lunarcore/proto/MarkReadMailScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/MarkReadMailScRspOuterClass.java @@ -19,7 +19,7 @@ public static final class MarkReadMailScRsp extends ProtoMessageoptional uint32 retcode = 1; + * optional uint32 retcode = 3; */ private int retcode; @@ -39,7 +39,7 @@ public static MarkReadMailScRsp newInstance() { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 3; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public boolean hasRetcode() { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 3; * @return this */ public MarkReadMailScRsp clearRetcode() { @@ -57,7 +57,7 @@ public MarkReadMailScRsp clearRetcode() { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 3; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public int getRetcode() { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 3; * @param value the retcode to set * @return this */ @@ -177,7 +177,7 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { @@ -205,7 +205,7 @@ public MarkReadMailScRsp mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { + case 24: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/MaterialOuterClass.java b/src/generated/main/emu/lunarcore/proto/MaterialOuterClass.java index 2be004405..653c231b6 100644 --- a/src/generated/main/emu/lunarcore/proto/MaterialOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/MaterialOuterClass.java @@ -19,14 +19,14 @@ public static final class Material extends ProtoMessage implements Clo private static final long serialVersionUID = 0L; /** - * optional uint32 tid = 8; + * optional uint32 num = 4; */ - private int tid; + private int num; /** - * optional uint32 num = 15; + * optional uint32 tid = 10; */ - private int num; + private int tid; private Material() { } @@ -39,76 +39,76 @@ public static Material newInstance() { } /** - * optional uint32 tid = 8; - * @return whether the tid field is set + * optional uint32 num = 4; + * @return whether the num field is set */ - public boolean hasTid() { + public boolean hasNum() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 tid = 8; + * optional uint32 num = 4; * @return this */ - public Material clearTid() { + public Material clearNum() { bitField0_ &= ~0x00000001; - tid = 0; + num = 0; return this; } /** - * optional uint32 tid = 8; - * @return the tid + * optional uint32 num = 4; + * @return the num */ - public int getTid() { - return tid; + public int getNum() { + return num; } /** - * optional uint32 tid = 8; - * @param value the tid to set + * optional uint32 num = 4; + * @param value the num to set * @return this */ - public Material setTid(final int value) { + public Material setNum(final int value) { bitField0_ |= 0x00000001; - tid = value; + num = value; return this; } /** - * optional uint32 num = 15; - * @return whether the num field is set + * optional uint32 tid = 10; + * @return whether the tid field is set */ - public boolean hasNum() { + public boolean hasTid() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 num = 15; + * optional uint32 tid = 10; * @return this */ - public Material clearNum() { + public Material clearTid() { bitField0_ &= ~0x00000002; - num = 0; + tid = 0; return this; } /** - * optional uint32 num = 15; - * @return the num + * optional uint32 tid = 10; + * @return the tid */ - public int getNum() { - return num; + public int getTid() { + return tid; } /** - * optional uint32 num = 15; - * @param value the num to set + * optional uint32 tid = 10; + * @param value the tid to set * @return this */ - public Material setNum(final int value) { + public Material setTid(final int value) { bitField0_ |= 0x00000002; - num = value; + tid = value; return this; } @@ -117,8 +117,8 @@ public Material copyFrom(final Material other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - tid = other.tid; num = other.num; + tid = other.tid; } return this; } @@ -129,12 +129,12 @@ public Material mergeFrom(final Material other) { return this; } cachedSize = -1; - if (other.hasTid()) { - setTid(other.tid); - } if (other.hasNum()) { setNum(other.num); } + if (other.hasTid()) { + setTid(other.tid); + } return this; } @@ -145,8 +145,8 @@ public Material clear() { } cachedSize = -1; bitField0_ = 0; - tid = 0; num = 0; + tid = 0; return this; } @@ -170,19 +170,19 @@ public boolean equals(Object o) { } Material other = (Material) o; return bitField0_ == other.bitField0_ - && (!hasTid() || tid == other.tid) - && (!hasNum() || num == other.num); + && (!hasNum() || num == other.num) + && (!hasTid() || tid == other.tid); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 64); - output.writeUInt32NoTag(tid); + output.writeRawByte((byte) 32); + output.writeUInt32NoTag(num); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 120); - output.writeUInt32NoTag(num); + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(tid); } } @@ -190,10 +190,10 @@ public void writeTo(final ProtoSink output) throws IOException { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(tid); + size += 1 + ProtoSink.computeUInt32SizeNoTag(num); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(num); + size += 1 + ProtoSink.computeUInt32SizeNoTag(tid); } return size; } @@ -205,18 +205,18 @@ public Material mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { - // tid - tid = input.readUInt32(); + case 32: { + // num + num = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 120) { + if (tag != 80) { break; } } - case 120: { - // num - num = input.readUInt32(); + case 80: { + // tid + tid = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -241,10 +241,10 @@ public Material mergeFrom(final ProtoSource input) throws IOException { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.tid, tid); + output.writeUInt32(FieldNames.num, num); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.num, num); + output.writeUInt32(FieldNames.tid, tid); } output.endObject(); } @@ -256,10 +256,10 @@ public Material mergeFrom(final JsonSource input) throws IOException { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 114831: { - if (input.isAtField(FieldNames.tid)) { + case 109446: { + if (input.isAtField(FieldNames.num)) { if (!input.trySkipNullValue()) { - tid = input.readUInt32(); + num = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -267,10 +267,10 @@ public Material mergeFrom(final JsonSource input) throws IOException { } break; } - case 109446: { - if (input.isAtField(FieldNames.num)) { + case 114831: { + if (input.isAtField(FieldNames.tid)) { if (!input.trySkipNullValue()) { - num = input.readUInt32(); + tid = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -330,9 +330,9 @@ public Material create() { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName tid = FieldName.forField("tid"); - static final FieldName num = FieldName.forField("num"); + + static final FieldName tid = FieldName.forField("tid"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/MazeMapDataOuterClass.java b/src/generated/main/emu/lunarcore/proto/MazeMapDataOuterClass.java index 00ad7a82f..72b4d2e52 100644 --- a/src/generated/main/emu/lunarcore/proto/MazeMapDataOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/MazeMapDataOuterClass.java @@ -21,45 +21,45 @@ public static final class MazeMapData extends ProtoMessage implemen private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 1; */ private int retcode; /** - * optional uint32 cur_map_entry_id = 10; + * optional uint32 entry_id = 7; + */ + private int entryId; + + /** + * optional uint32 cur_map_entry_id = 8; */ private int curMapEntryId; /** - * optional uint32 entry_id = 13; + * repeated uint32 unlocked_teleport_list = 5; */ - private int entryId; + private final RepeatedInt unlockedTeleportList = RepeatedInt.newEmptyInstance(); /** - * repeated uint32 lighten_section_list = 2; + * repeated uint32 lighten_section_list = 9; */ private final RepeatedInt lightenSectionList = RepeatedInt.newEmptyInstance(); /** - * repeated uint32 unlocked_teleport_list = 7; + * repeated .MazeChest unlocked_chest_list = 2; */ - private final RepeatedInt unlockedTeleportList = RepeatedInt.newEmptyInstance(); + private final RepeatedMessage unlockedChestList = RepeatedMessage.newEmptyInstance(MazeChestOuterClass.MazeChest.getFactory()); /** - * repeated .MazeGroup maze_group_list = 1; + * repeated .MazeGroup maze_group_list = 12; */ private final RepeatedMessage mazeGroupList = RepeatedMessage.newEmptyInstance(MazeGroupOuterClass.MazeGroup.getFactory()); /** - * repeated .MazeProp maze_prop_list = 4; + * repeated .MazeProp maze_prop_list = 14; */ private final RepeatedMessage mazePropList = RepeatedMessage.newEmptyInstance(MazePropOuterClass.MazeProp.getFactory()); - /** - * repeated .MazeChest unlocked_chest_list = 11; - */ - private final RepeatedMessage unlockedChestList = RepeatedMessage.newEmptyInstance(MazeChestOuterClass.MazeChest.getFactory()); - private MazeMapData() { } @@ -71,7 +71,7 @@ public static MazeMapData newInstance() { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 1; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -79,7 +79,7 @@ public boolean hasRetcode() { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 1; * @return this */ public MazeMapData clearRetcode() { @@ -89,7 +89,7 @@ public MazeMapData clearRetcode() { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 1; * @return the retcode */ public int getRetcode() { @@ -97,7 +97,7 @@ public int getRetcode() { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 1; * @param value the retcode to set * @return this */ @@ -108,113 +108,113 @@ public MazeMapData setRetcode(final int value) { } /** - * optional uint32 cur_map_entry_id = 10; - * @return whether the curMapEntryId field is set + * optional uint32 entry_id = 7; + * @return whether the entryId field is set */ - public boolean hasCurMapEntryId() { + public boolean hasEntryId() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 cur_map_entry_id = 10; + * optional uint32 entry_id = 7; * @return this */ - public MazeMapData clearCurMapEntryId() { + public MazeMapData clearEntryId() { bitField0_ &= ~0x00000002; - curMapEntryId = 0; + entryId = 0; return this; } /** - * optional uint32 cur_map_entry_id = 10; - * @return the curMapEntryId + * optional uint32 entry_id = 7; + * @return the entryId */ - public int getCurMapEntryId() { - return curMapEntryId; + public int getEntryId() { + return entryId; } /** - * optional uint32 cur_map_entry_id = 10; - * @param value the curMapEntryId to set + * optional uint32 entry_id = 7; + * @param value the entryId to set * @return this */ - public MazeMapData setCurMapEntryId(final int value) { + public MazeMapData setEntryId(final int value) { bitField0_ |= 0x00000002; - curMapEntryId = value; + entryId = value; return this; } /** - * optional uint32 entry_id = 13; - * @return whether the entryId field is set + * optional uint32 cur_map_entry_id = 8; + * @return whether the curMapEntryId field is set */ - public boolean hasEntryId() { + public boolean hasCurMapEntryId() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 entry_id = 13; + * optional uint32 cur_map_entry_id = 8; * @return this */ - public MazeMapData clearEntryId() { + public MazeMapData clearCurMapEntryId() { bitField0_ &= ~0x00000004; - entryId = 0; + curMapEntryId = 0; return this; } /** - * optional uint32 entry_id = 13; - * @return the entryId + * optional uint32 cur_map_entry_id = 8; + * @return the curMapEntryId */ - public int getEntryId() { - return entryId; + public int getCurMapEntryId() { + return curMapEntryId; } /** - * optional uint32 entry_id = 13; - * @param value the entryId to set + * optional uint32 cur_map_entry_id = 8; + * @param value the curMapEntryId to set * @return this */ - public MazeMapData setEntryId(final int value) { + public MazeMapData setCurMapEntryId(final int value) { bitField0_ |= 0x00000004; - entryId = value; + curMapEntryId = value; return this; } /** - * repeated uint32 lighten_section_list = 2; - * @return whether the lightenSectionList field is set + * repeated uint32 unlocked_teleport_list = 5; + * @return whether the unlockedTeleportList field is set */ - public boolean hasLightenSectionList() { + public boolean hasUnlockedTeleportList() { return (bitField0_ & 0x00000008) != 0; } /** - * repeated uint32 lighten_section_list = 2; + * repeated uint32 unlocked_teleport_list = 5; * @return this */ - public MazeMapData clearLightenSectionList() { + public MazeMapData clearUnlockedTeleportList() { bitField0_ &= ~0x00000008; - lightenSectionList.clear(); + unlockedTeleportList.clear(); return this; } /** - * repeated uint32 lighten_section_list = 2; + * repeated uint32 unlocked_teleport_list = 5; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. * - * Use {@link #getMutableLightenSectionList()} if you want to modify it. + * Use {@link #getMutableUnlockedTeleportList()} if you want to modify it. * * @return internal storage object for reading */ - public RepeatedInt getLightenSectionList() { - return lightenSectionList; + public RepeatedInt getUnlockedTeleportList() { + return unlockedTeleportList; } /** - * repeated uint32 lighten_section_list = 2; + * repeated uint32 unlocked_teleport_list = 5; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -222,67 +222,67 @@ public RepeatedInt getLightenSectionList() { * * @return internal storage object for modifications */ - public RepeatedInt getMutableLightenSectionList() { + public RepeatedInt getMutableUnlockedTeleportList() { bitField0_ |= 0x00000008; - return lightenSectionList; + return unlockedTeleportList; } /** - * repeated uint32 lighten_section_list = 2; - * @param value the lightenSectionList to add + * repeated uint32 unlocked_teleport_list = 5; + * @param value the unlockedTeleportList to add * @return this */ - public MazeMapData addLightenSectionList(final int value) { + public MazeMapData addUnlockedTeleportList(final int value) { bitField0_ |= 0x00000008; - lightenSectionList.add(value); + unlockedTeleportList.add(value); return this; } /** - * repeated uint32 lighten_section_list = 2; - * @param values the lightenSectionList to add + * repeated uint32 unlocked_teleport_list = 5; + * @param values the unlockedTeleportList to add * @return this */ - public MazeMapData addAllLightenSectionList(final int... values) { + public MazeMapData addAllUnlockedTeleportList(final int... values) { bitField0_ |= 0x00000008; - lightenSectionList.addAll(values); + unlockedTeleportList.addAll(values); return this; } /** - * repeated uint32 unlocked_teleport_list = 7; - * @return whether the unlockedTeleportList field is set + * repeated uint32 lighten_section_list = 9; + * @return whether the lightenSectionList field is set */ - public boolean hasUnlockedTeleportList() { + public boolean hasLightenSectionList() { return (bitField0_ & 0x00000010) != 0; } /** - * repeated uint32 unlocked_teleport_list = 7; + * repeated uint32 lighten_section_list = 9; * @return this */ - public MazeMapData clearUnlockedTeleportList() { + public MazeMapData clearLightenSectionList() { bitField0_ &= ~0x00000010; - unlockedTeleportList.clear(); + lightenSectionList.clear(); return this; } /** - * repeated uint32 unlocked_teleport_list = 7; + * repeated uint32 lighten_section_list = 9; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. * - * Use {@link #getMutableUnlockedTeleportList()} if you want to modify it. + * Use {@link #getMutableLightenSectionList()} if you want to modify it. * * @return internal storage object for reading */ - public RepeatedInt getUnlockedTeleportList() { - return unlockedTeleportList; + public RepeatedInt getLightenSectionList() { + return lightenSectionList; } /** - * repeated uint32 unlocked_teleport_list = 7; + * repeated uint32 lighten_section_list = 9; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -290,67 +290,67 @@ public RepeatedInt getUnlockedTeleportList() { * * @return internal storage object for modifications */ - public RepeatedInt getMutableUnlockedTeleportList() { + public RepeatedInt getMutableLightenSectionList() { bitField0_ |= 0x00000010; - return unlockedTeleportList; + return lightenSectionList; } /** - * repeated uint32 unlocked_teleport_list = 7; - * @param value the unlockedTeleportList to add + * repeated uint32 lighten_section_list = 9; + * @param value the lightenSectionList to add * @return this */ - public MazeMapData addUnlockedTeleportList(final int value) { + public MazeMapData addLightenSectionList(final int value) { bitField0_ |= 0x00000010; - unlockedTeleportList.add(value); + lightenSectionList.add(value); return this; } /** - * repeated uint32 unlocked_teleport_list = 7; - * @param values the unlockedTeleportList to add + * repeated uint32 lighten_section_list = 9; + * @param values the lightenSectionList to add * @return this */ - public MazeMapData addAllUnlockedTeleportList(final int... values) { + public MazeMapData addAllLightenSectionList(final int... values) { bitField0_ |= 0x00000010; - unlockedTeleportList.addAll(values); + lightenSectionList.addAll(values); return this; } /** - * repeated .MazeGroup maze_group_list = 1; - * @return whether the mazeGroupList field is set + * repeated .MazeChest unlocked_chest_list = 2; + * @return whether the unlockedChestList field is set */ - public boolean hasMazeGroupList() { + public boolean hasUnlockedChestList() { return (bitField0_ & 0x00000020) != 0; } /** - * repeated .MazeGroup maze_group_list = 1; + * repeated .MazeChest unlocked_chest_list = 2; * @return this */ - public MazeMapData clearMazeGroupList() { + public MazeMapData clearUnlockedChestList() { bitField0_ &= ~0x00000020; - mazeGroupList.clear(); + unlockedChestList.clear(); return this; } /** - * repeated .MazeGroup maze_group_list = 1; + * repeated .MazeChest unlocked_chest_list = 2; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. * - * Use {@link #getMutableMazeGroupList()} if you want to modify it. + * Use {@link #getMutableUnlockedChestList()} if you want to modify it. * * @return internal storage object for reading */ - public RepeatedMessage getMazeGroupList() { - return mazeGroupList; + public RepeatedMessage getUnlockedChestList() { + return unlockedChestList; } /** - * repeated .MazeGroup maze_group_list = 1; + * repeated .MazeChest unlocked_chest_list = 2; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -358,67 +358,67 @@ public RepeatedMessage getMazeGroupList() { * * @return internal storage object for modifications */ - public RepeatedMessage getMutableMazeGroupList() { + public RepeatedMessage getMutableUnlockedChestList() { bitField0_ |= 0x00000020; - return mazeGroupList; + return unlockedChestList; } /** - * repeated .MazeGroup maze_group_list = 1; - * @param value the mazeGroupList to add + * repeated .MazeChest unlocked_chest_list = 2; + * @param value the unlockedChestList to add * @return this */ - public MazeMapData addMazeGroupList(final MazeGroupOuterClass.MazeGroup value) { + public MazeMapData addUnlockedChestList(final MazeChestOuterClass.MazeChest value) { bitField0_ |= 0x00000020; - mazeGroupList.add(value); + unlockedChestList.add(value); return this; } /** - * repeated .MazeGroup maze_group_list = 1; - * @param values the mazeGroupList to add + * repeated .MazeChest unlocked_chest_list = 2; + * @param values the unlockedChestList to add * @return this */ - public MazeMapData addAllMazeGroupList(final MazeGroupOuterClass.MazeGroup... values) { + public MazeMapData addAllUnlockedChestList(final MazeChestOuterClass.MazeChest... values) { bitField0_ |= 0x00000020; - mazeGroupList.addAll(values); + unlockedChestList.addAll(values); return this; } /** - * repeated .MazeProp maze_prop_list = 4; - * @return whether the mazePropList field is set + * repeated .MazeGroup maze_group_list = 12; + * @return whether the mazeGroupList field is set */ - public boolean hasMazePropList() { + public boolean hasMazeGroupList() { return (bitField0_ & 0x00000040) != 0; } /** - * repeated .MazeProp maze_prop_list = 4; + * repeated .MazeGroup maze_group_list = 12; * @return this */ - public MazeMapData clearMazePropList() { + public MazeMapData clearMazeGroupList() { bitField0_ &= ~0x00000040; - mazePropList.clear(); + mazeGroupList.clear(); return this; } /** - * repeated .MazeProp maze_prop_list = 4; + * repeated .MazeGroup maze_group_list = 12; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. * - * Use {@link #getMutableMazePropList()} if you want to modify it. + * Use {@link #getMutableMazeGroupList()} if you want to modify it. * * @return internal storage object for reading */ - public RepeatedMessage getMazePropList() { - return mazePropList; + public RepeatedMessage getMazeGroupList() { + return mazeGroupList; } /** - * repeated .MazeProp maze_prop_list = 4; + * repeated .MazeGroup maze_group_list = 12; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -426,67 +426,67 @@ public RepeatedMessage getMazePropList() { * * @return internal storage object for modifications */ - public RepeatedMessage getMutableMazePropList() { + public RepeatedMessage getMutableMazeGroupList() { bitField0_ |= 0x00000040; - return mazePropList; + return mazeGroupList; } /** - * repeated .MazeProp maze_prop_list = 4; - * @param value the mazePropList to add + * repeated .MazeGroup maze_group_list = 12; + * @param value the mazeGroupList to add * @return this */ - public MazeMapData addMazePropList(final MazePropOuterClass.MazeProp value) { + public MazeMapData addMazeGroupList(final MazeGroupOuterClass.MazeGroup value) { bitField0_ |= 0x00000040; - mazePropList.add(value); + mazeGroupList.add(value); return this; } /** - * repeated .MazeProp maze_prop_list = 4; - * @param values the mazePropList to add + * repeated .MazeGroup maze_group_list = 12; + * @param values the mazeGroupList to add * @return this */ - public MazeMapData addAllMazePropList(final MazePropOuterClass.MazeProp... values) { + public MazeMapData addAllMazeGroupList(final MazeGroupOuterClass.MazeGroup... values) { bitField0_ |= 0x00000040; - mazePropList.addAll(values); + mazeGroupList.addAll(values); return this; } /** - * repeated .MazeChest unlocked_chest_list = 11; - * @return whether the unlockedChestList field is set + * repeated .MazeProp maze_prop_list = 14; + * @return whether the mazePropList field is set */ - public boolean hasUnlockedChestList() { + public boolean hasMazePropList() { return (bitField0_ & 0x00000080) != 0; } /** - * repeated .MazeChest unlocked_chest_list = 11; + * repeated .MazeProp maze_prop_list = 14; * @return this */ - public MazeMapData clearUnlockedChestList() { + public MazeMapData clearMazePropList() { bitField0_ &= ~0x00000080; - unlockedChestList.clear(); + mazePropList.clear(); return this; } /** - * repeated .MazeChest unlocked_chest_list = 11; + * repeated .MazeProp maze_prop_list = 14; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. * - * Use {@link #getMutableUnlockedChestList()} if you want to modify it. + * Use {@link #getMutableMazePropList()} if you want to modify it. * * @return internal storage object for reading */ - public RepeatedMessage getUnlockedChestList() { - return unlockedChestList; + public RepeatedMessage getMazePropList() { + return mazePropList; } /** - * repeated .MazeChest unlocked_chest_list = 11; + * repeated .MazeProp maze_prop_list = 14; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -494,30 +494,30 @@ public RepeatedMessage getUnlockedChestList() { * * @return internal storage object for modifications */ - public RepeatedMessage getMutableUnlockedChestList() { + public RepeatedMessage getMutableMazePropList() { bitField0_ |= 0x00000080; - return unlockedChestList; + return mazePropList; } /** - * repeated .MazeChest unlocked_chest_list = 11; - * @param value the unlockedChestList to add + * repeated .MazeProp maze_prop_list = 14; + * @param value the mazePropList to add * @return this */ - public MazeMapData addUnlockedChestList(final MazeChestOuterClass.MazeChest value) { + public MazeMapData addMazePropList(final MazePropOuterClass.MazeProp value) { bitField0_ |= 0x00000080; - unlockedChestList.add(value); + mazePropList.add(value); return this; } /** - * repeated .MazeChest unlocked_chest_list = 11; - * @param values the unlockedChestList to add + * repeated .MazeProp maze_prop_list = 14; + * @param values the mazePropList to add * @return this */ - public MazeMapData addAllUnlockedChestList(final MazeChestOuterClass.MazeChest... values) { + public MazeMapData addAllMazePropList(final MazePropOuterClass.MazeProp... values) { bitField0_ |= 0x00000080; - unlockedChestList.addAll(values); + mazePropList.addAll(values); return this; } @@ -527,13 +527,13 @@ public MazeMapData copyFrom(final MazeMapData other) { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; retcode = other.retcode; - curMapEntryId = other.curMapEntryId; entryId = other.entryId; - lightenSectionList.copyFrom(other.lightenSectionList); + curMapEntryId = other.curMapEntryId; unlockedTeleportList.copyFrom(other.unlockedTeleportList); + lightenSectionList.copyFrom(other.lightenSectionList); + unlockedChestList.copyFrom(other.unlockedChestList); mazeGroupList.copyFrom(other.mazeGroupList); mazePropList.copyFrom(other.mazePropList); - unlockedChestList.copyFrom(other.unlockedChestList); } return this; } @@ -547,17 +547,20 @@ public MazeMapData mergeFrom(final MazeMapData other) { if (other.hasRetcode()) { setRetcode(other.retcode); } + if (other.hasEntryId()) { + setEntryId(other.entryId); + } if (other.hasCurMapEntryId()) { setCurMapEntryId(other.curMapEntryId); } - if (other.hasEntryId()) { - setEntryId(other.entryId); + if (other.hasUnlockedTeleportList()) { + getMutableUnlockedTeleportList().addAll(other.unlockedTeleportList); } if (other.hasLightenSectionList()) { getMutableLightenSectionList().addAll(other.lightenSectionList); } - if (other.hasUnlockedTeleportList()) { - getMutableUnlockedTeleportList().addAll(other.unlockedTeleportList); + if (other.hasUnlockedChestList()) { + getMutableUnlockedChestList().addAll(other.unlockedChestList); } if (other.hasMazeGroupList()) { getMutableMazeGroupList().addAll(other.mazeGroupList); @@ -565,9 +568,6 @@ public MazeMapData mergeFrom(final MazeMapData other) { if (other.hasMazePropList()) { getMutableMazePropList().addAll(other.mazePropList); } - if (other.hasUnlockedChestList()) { - getMutableUnlockedChestList().addAll(other.unlockedChestList); - } return this; } @@ -579,13 +579,13 @@ public MazeMapData clear() { cachedSize = -1; bitField0_ = 0; retcode = 0; - curMapEntryId = 0; entryId = 0; - lightenSectionList.clear(); + curMapEntryId = 0; unlockedTeleportList.clear(); + lightenSectionList.clear(); + unlockedChestList.clear(); mazeGroupList.clear(); mazePropList.clear(); - unlockedChestList.clear(); return this; } @@ -596,11 +596,11 @@ public MazeMapData clearQuick() { } cachedSize = -1; bitField0_ = 0; - lightenSectionList.clear(); unlockedTeleportList.clear(); + lightenSectionList.clear(); + unlockedChestList.clearQuick(); mazeGroupList.clearQuick(); mazePropList.clearQuick(); - unlockedChestList.clearQuick(); return this; } @@ -615,57 +615,57 @@ public boolean equals(Object o) { MazeMapData other = (MazeMapData) o; return bitField0_ == other.bitField0_ && (!hasRetcode() || retcode == other.retcode) - && (!hasCurMapEntryId() || curMapEntryId == other.curMapEntryId) && (!hasEntryId() || entryId == other.entryId) - && (!hasLightenSectionList() || lightenSectionList.equals(other.lightenSectionList)) + && (!hasCurMapEntryId() || curMapEntryId == other.curMapEntryId) && (!hasUnlockedTeleportList() || unlockedTeleportList.equals(other.unlockedTeleportList)) + && (!hasLightenSectionList() || lightenSectionList.equals(other.lightenSectionList)) + && (!hasUnlockedChestList() || unlockedChestList.equals(other.unlockedChestList)) && (!hasMazeGroupList() || mazeGroupList.equals(other.mazeGroupList)) - && (!hasMazePropList() || mazePropList.equals(other.mazePropList)) - && (!hasUnlockedChestList() || unlockedChestList.equals(other.unlockedChestList)); + && (!hasMazePropList() || mazePropList.equals(other.mazePropList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 80); - output.writeUInt32NoTag(curMapEntryId); + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(entryId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 104); - output.writeUInt32NoTag(entryId); + output.writeRawByte((byte) 64); + output.writeUInt32NoTag(curMapEntryId); } if ((bitField0_ & 0x00000008) != 0) { - for (int i = 0; i < lightenSectionList.length(); i++) { - output.writeRawByte((byte) 16); - output.writeUInt32NoTag(lightenSectionList.array()[i]); + for (int i = 0; i < unlockedTeleportList.length(); i++) { + output.writeRawByte((byte) 40); + output.writeUInt32NoTag(unlockedTeleportList.array()[i]); } } if ((bitField0_ & 0x00000010) != 0) { - for (int i = 0; i < unlockedTeleportList.length(); i++) { - output.writeRawByte((byte) 56); - output.writeUInt32NoTag(unlockedTeleportList.array()[i]); + for (int i = 0; i < lightenSectionList.length(); i++) { + output.writeRawByte((byte) 72); + output.writeUInt32NoTag(lightenSectionList.array()[i]); } } if ((bitField0_ & 0x00000020) != 0) { - for (int i = 0; i < mazeGroupList.length(); i++) { - output.writeRawByte((byte) 10); - output.writeMessageNoTag(mazeGroupList.get(i)); + for (int i = 0; i < unlockedChestList.length(); i++) { + output.writeRawByte((byte) 18); + output.writeMessageNoTag(unlockedChestList.get(i)); } } if ((bitField0_ & 0x00000040) != 0) { - for (int i = 0; i < mazePropList.length(); i++) { - output.writeRawByte((byte) 34); - output.writeMessageNoTag(mazePropList.get(i)); + for (int i = 0; i < mazeGroupList.length(); i++) { + output.writeRawByte((byte) 98); + output.writeMessageNoTag(mazeGroupList.get(i)); } } if ((bitField0_ & 0x00000080) != 0) { - for (int i = 0; i < unlockedChestList.length(); i++) { - output.writeRawByte((byte) 90); - output.writeMessageNoTag(unlockedChestList.get(i)); + for (int i = 0; i < mazePropList.length(); i++) { + output.writeRawByte((byte) 114); + output.writeMessageNoTag(mazePropList.get(i)); } } } @@ -677,25 +677,25 @@ protected int computeSerializedSize() { size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(curMapEntryId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(entryId); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(entryId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(curMapEntryId); } if ((bitField0_ & 0x00000008) != 0) { - size += (1 * lightenSectionList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(lightenSectionList); + size += (1 * unlockedTeleportList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(unlockedTeleportList); } if ((bitField0_ & 0x00000010) != 0) { - size += (1 * unlockedTeleportList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(unlockedTeleportList); + size += (1 * lightenSectionList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(lightenSectionList); } if ((bitField0_ & 0x00000020) != 0) { - size += (1 * mazeGroupList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(mazeGroupList); + size += (1 * unlockedChestList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(unlockedChestList); } if ((bitField0_ & 0x00000040) != 0) { - size += (1 * mazePropList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(mazePropList); + size += (1 * mazeGroupList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(mazeGroupList); } if ((bitField0_ & 0x00000080) != 0) { - size += (1 * unlockedChestList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(unlockedChestList); + size += (1 * mazePropList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(mazePropList); } return size; } @@ -707,70 +707,70 @@ public MazeMapData mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { + case 8: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 80) { + if (tag != 56) { break; } } - case 80: { - // curMapEntryId - curMapEntryId = input.readUInt32(); + case 56: { + // entryId + entryId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 104) { + if (tag != 64) { break; } } - case 104: { - // entryId - entryId = input.readUInt32(); + case 64: { + // curMapEntryId + curMapEntryId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 18) { + if (tag != 42) { break; } } - case 18: { - // lightenSectionList [packed=true] - input.readPackedUInt32(lightenSectionList, tag); + case 42: { + // unlockedTeleportList [packed=true] + input.readPackedUInt32(unlockedTeleportList, tag); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 58) { + if (tag != 74) { break; } } - case 58: { - // unlockedTeleportList [packed=true] - input.readPackedUInt32(unlockedTeleportList, tag); + case 74: { + // lightenSectionList [packed=true] + input.readPackedUInt32(lightenSectionList, tag); bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 10) { + if (tag != 18) { break; } } - case 10: { - // mazeGroupList - tag = input.readRepeatedMessage(mazeGroupList, tag); + case 18: { + // unlockedChestList + tag = input.readRepeatedMessage(unlockedChestList, tag); bitField0_ |= 0x00000020; - if (tag != 34) { + if (tag != 98) { break; } } - case 34: { - // mazePropList - tag = input.readRepeatedMessage(mazePropList, tag); + case 98: { + // mazeGroupList + tag = input.readRepeatedMessage(mazeGroupList, tag); bitField0_ |= 0x00000040; - if (tag != 90) { + if (tag != 114) { break; } } - case 90: { - // unlockedChestList - tag = input.readRepeatedMessage(unlockedChestList, tag); + case 114: { + // mazePropList + tag = input.readRepeatedMessage(mazePropList, tag); bitField0_ |= 0x00000080; if (tag != 0) { break; @@ -786,15 +786,15 @@ public MazeMapData mergeFrom(final ProtoSource input) throws IOException { tag = input.readTag(); break; } - case 16: { - // lightenSectionList [packed=false] - tag = input.readRepeatedUInt32(lightenSectionList, tag); + case 40: { + // unlockedTeleportList [packed=false] + tag = input.readRepeatedUInt32(unlockedTeleportList, tag); bitField0_ |= 0x00000008; break; } - case 56: { - // unlockedTeleportList [packed=false] - tag = input.readRepeatedUInt32(unlockedTeleportList, tag); + case 72: { + // lightenSectionList [packed=false] + tag = input.readRepeatedUInt32(lightenSectionList, tag); bitField0_ |= 0x00000010; break; } @@ -809,25 +809,25 @@ public void writeTo(final JsonSink output) throws IOException { output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.curMapEntryId, curMapEntryId); + output.writeUInt32(FieldNames.entryId, entryId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.entryId, entryId); + output.writeUInt32(FieldNames.curMapEntryId, curMapEntryId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRepeatedUInt32(FieldNames.lightenSectionList, lightenSectionList); + output.writeRepeatedUInt32(FieldNames.unlockedTeleportList, unlockedTeleportList); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRepeatedUInt32(FieldNames.unlockedTeleportList, unlockedTeleportList); + output.writeRepeatedUInt32(FieldNames.lightenSectionList, lightenSectionList); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRepeatedMessage(FieldNames.mazeGroupList, mazeGroupList); + output.writeRepeatedMessage(FieldNames.unlockedChestList, unlockedChestList); } if ((bitField0_ & 0x00000040) != 0) { - output.writeRepeatedMessage(FieldNames.mazePropList, mazePropList); + output.writeRepeatedMessage(FieldNames.mazeGroupList, mazeGroupList); } if ((bitField0_ & 0x00000080) != 0) { - output.writeRepeatedMessage(FieldNames.unlockedChestList, unlockedChestList); + output.writeRepeatedMessage(FieldNames.mazePropList, mazePropList); } output.endObject(); } @@ -850,24 +850,36 @@ public MazeMapData mergeFrom(final JsonSource input) throws IOException { } break; } + case -1591558867: + case -2093663224: { + if (input.isAtField(FieldNames.entryId)) { + if (!input.trySkipNullValue()) { + entryId = input.readUInt32(); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } case 764919441: case 2115673898: { if (input.isAtField(FieldNames.curMapEntryId)) { if (!input.trySkipNullValue()) { curMapEntryId = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; } } else { input.skipUnknownField(); } break; } - case -1591558867: - case -2093663224: { - if (input.isAtField(FieldNames.entryId)) { + case 856936684: + case -10753834: { + if (input.isAtField(FieldNames.unlockedTeleportList)) { if (!input.trySkipNullValue()) { - entryId = input.readUInt32(); - bitField0_ |= 0x00000004; + input.readRepeatedUInt32(unlockedTeleportList); + bitField0_ |= 0x00000008; } } else { input.skipUnknownField(); @@ -879,19 +891,19 @@ public MazeMapData mergeFrom(final JsonSource input) throws IOException { if (input.isAtField(FieldNames.lightenSectionList)) { if (!input.trySkipNullValue()) { input.readRepeatedUInt32(lightenSectionList); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000010; } } else { input.skipUnknownField(); } break; } - case 856936684: - case -10753834: { - if (input.isAtField(FieldNames.unlockedTeleportList)) { + case -337762404: + case 231688696: { + if (input.isAtField(FieldNames.unlockedChestList)) { if (!input.trySkipNullValue()) { - input.readRepeatedUInt32(unlockedTeleportList); - bitField0_ |= 0x00000010; + input.readRepeatedMessage(unlockedChestList); + bitField0_ |= 0x00000020; } } else { input.skipUnknownField(); @@ -903,7 +915,7 @@ public MazeMapData mergeFrom(final JsonSource input) throws IOException { if (input.isAtField(FieldNames.mazeGroupList)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(mazeGroupList); - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000040; } } else { input.skipUnknownField(); @@ -915,18 +927,6 @@ public MazeMapData mergeFrom(final JsonSource input) throws IOException { if (input.isAtField(FieldNames.mazePropList)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(mazePropList); - bitField0_ |= 0x00000040; - } - } else { - input.skipUnknownField(); - } - break; - } - case -337762404: - case 231688696: { - if (input.isAtField(FieldNames.unlockedChestList)) { - if (!input.trySkipNullValue()) { - input.readRepeatedMessage(unlockedChestList); bitField0_ |= 0x00000080; } } else { @@ -988,19 +988,19 @@ public MazeMapData create() { static class FieldNames { static final FieldName retcode = FieldName.forField("retcode"); + static final FieldName entryId = FieldName.forField("entryId", "entry_id"); + static final FieldName curMapEntryId = FieldName.forField("curMapEntryId", "cur_map_entry_id"); - static final FieldName entryId = FieldName.forField("entryId", "entry_id"); + static final FieldName unlockedTeleportList = FieldName.forField("unlockedTeleportList", "unlocked_teleport_list"); static final FieldName lightenSectionList = FieldName.forField("lightenSectionList", "lighten_section_list"); - static final FieldName unlockedTeleportList = FieldName.forField("unlockedTeleportList", "unlocked_teleport_list"); + static final FieldName unlockedChestList = FieldName.forField("unlockedChestList", "unlocked_chest_list"); static final FieldName mazeGroupList = FieldName.forField("mazeGroupList", "maze_group_list"); static final FieldName mazePropList = FieldName.forField("mazePropList", "maze_prop_list"); - - static final FieldName unlockedChestList = FieldName.forField("unlockedChestList", "unlocked_chest_list"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/MazePropOuterClass.java b/src/generated/main/emu/lunarcore/proto/MazePropOuterClass.java index 214bacdfd..2672e70ae 100644 --- a/src/generated/main/emu/lunarcore/proto/MazePropOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/MazePropOuterClass.java @@ -18,21 +18,21 @@ public final class MazePropOuterClass { public static final class MazeProp extends ProtoMessage implements Cloneable { private static final long serialVersionUID = 0L; - /** - * optional uint32 group_id = 1; - */ - private int groupId; - /** * optional uint32 config_id = 8; */ private int configId; /** - * optional uint32 state = 11; + * optional uint32 state = 14; */ private int state; + /** + * optional uint32 group_id = 15; + */ + private int groupId; + private MazeProp() { } @@ -44,113 +44,113 @@ public static MazeProp newInstance() { } /** - * optional uint32 group_id = 1; - * @return whether the groupId field is set + * optional uint32 config_id = 8; + * @return whether the configId field is set */ - public boolean hasGroupId() { + public boolean hasConfigId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 group_id = 1; + * optional uint32 config_id = 8; * @return this */ - public MazeProp clearGroupId() { + public MazeProp clearConfigId() { bitField0_ &= ~0x00000001; - groupId = 0; + configId = 0; return this; } /** - * optional uint32 group_id = 1; - * @return the groupId + * optional uint32 config_id = 8; + * @return the configId */ - public int getGroupId() { - return groupId; + public int getConfigId() { + return configId; } /** - * optional uint32 group_id = 1; - * @param value the groupId to set + * optional uint32 config_id = 8; + * @param value the configId to set * @return this */ - public MazeProp setGroupId(final int value) { + public MazeProp setConfigId(final int value) { bitField0_ |= 0x00000001; - groupId = value; + configId = value; return this; } /** - * optional uint32 config_id = 8; - * @return whether the configId field is set + * optional uint32 state = 14; + * @return whether the state field is set */ - public boolean hasConfigId() { + public boolean hasState() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 config_id = 8; + * optional uint32 state = 14; * @return this */ - public MazeProp clearConfigId() { + public MazeProp clearState() { bitField0_ &= ~0x00000002; - configId = 0; + state = 0; return this; } /** - * optional uint32 config_id = 8; - * @return the configId + * optional uint32 state = 14; + * @return the state */ - public int getConfigId() { - return configId; + public int getState() { + return state; } /** - * optional uint32 config_id = 8; - * @param value the configId to set + * optional uint32 state = 14; + * @param value the state to set * @return this */ - public MazeProp setConfigId(final int value) { + public MazeProp setState(final int value) { bitField0_ |= 0x00000002; - configId = value; + state = value; return this; } /** - * optional uint32 state = 11; - * @return whether the state field is set + * optional uint32 group_id = 15; + * @return whether the groupId field is set */ - public boolean hasState() { + public boolean hasGroupId() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 state = 11; + * optional uint32 group_id = 15; * @return this */ - public MazeProp clearState() { + public MazeProp clearGroupId() { bitField0_ &= ~0x00000004; - state = 0; + groupId = 0; return this; } /** - * optional uint32 state = 11; - * @return the state + * optional uint32 group_id = 15; + * @return the groupId */ - public int getState() { - return state; + public int getGroupId() { + return groupId; } /** - * optional uint32 state = 11; - * @param value the state to set + * optional uint32 group_id = 15; + * @param value the groupId to set * @return this */ - public MazeProp setState(final int value) { + public MazeProp setGroupId(final int value) { bitField0_ |= 0x00000004; - state = value; + groupId = value; return this; } @@ -159,9 +159,9 @@ public MazeProp copyFrom(final MazeProp other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - groupId = other.groupId; configId = other.configId; state = other.state; + groupId = other.groupId; } return this; } @@ -172,15 +172,15 @@ public MazeProp mergeFrom(final MazeProp other) { return this; } cachedSize = -1; - if (other.hasGroupId()) { - setGroupId(other.groupId); - } if (other.hasConfigId()) { setConfigId(other.configId); } if (other.hasState()) { setState(other.state); } + if (other.hasGroupId()) { + setGroupId(other.groupId); + } return this; } @@ -191,9 +191,9 @@ public MazeProp clear() { } cachedSize = -1; bitField0_ = 0; - groupId = 0; configId = 0; state = 0; + groupId = 0; return this; } @@ -217,38 +217,38 @@ public boolean equals(Object o) { } MazeProp other = (MazeProp) o; return bitField0_ == other.bitField0_ - && (!hasGroupId() || groupId == other.groupId) && (!hasConfigId() || configId == other.configId) - && (!hasState() || state == other.state); + && (!hasState() || state == other.state) + && (!hasGroupId() || groupId == other.groupId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); - output.writeUInt32NoTag(groupId); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 64); output.writeUInt32NoTag(configId); } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 88); + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 112); output.writeUInt32NoTag(state); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 120); + output.writeUInt32NoTag(groupId); + } } @Override protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(groupId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(configId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(configId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(state); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(state); + size += 1 + ProtoSink.computeUInt32SizeNoTag(groupId); } return size; } @@ -260,27 +260,27 @@ public MazeProp mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { - // groupId - groupId = input.readUInt32(); + case 64: { + // configId + configId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 64) { + if (tag != 112) { break; } } - case 64: { - // configId - configId = input.readUInt32(); + case 112: { + // state + state = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 88) { + if (tag != 120) { break; } } - case 88: { - // state - state = input.readUInt32(); + case 120: { + // groupId + groupId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 0) { @@ -305,13 +305,13 @@ public MazeProp mergeFrom(final ProtoSource input) throws IOException { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.groupId, groupId); + output.writeUInt32(FieldNames.configId, configId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.configId, configId); + output.writeUInt32(FieldNames.state, state); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.state, state); + output.writeUInt32(FieldNames.groupId, groupId); } output.endObject(); } @@ -323,11 +323,11 @@ public MazeProp mergeFrom(final JsonSource input) throws IOException { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 293428218: - case 506361563: { - if (input.isAtField(FieldNames.groupId)) { + case -580140035: + case -804450504: { + if (input.isAtField(FieldNames.configId)) { if (!input.trySkipNullValue()) { - groupId = input.readUInt32(); + configId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -335,11 +335,10 @@ public MazeProp mergeFrom(final JsonSource input) throws IOException { } break; } - case -580140035: - case -804450504: { - if (input.isAtField(FieldNames.configId)) { + case 109757585: { + if (input.isAtField(FieldNames.state)) { if (!input.trySkipNullValue()) { - configId = input.readUInt32(); + state = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -347,10 +346,11 @@ public MazeProp mergeFrom(final JsonSource input) throws IOException { } break; } - case 109757585: { - if (input.isAtField(FieldNames.state)) { + case 293428218: + case 506361563: { + if (input.isAtField(FieldNames.groupId)) { if (!input.trySkipNullValue()) { - state = input.readUInt32(); + groupId = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -410,11 +410,11 @@ public MazeProp create() { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName groupId = FieldName.forField("groupId", "group_id"); - static final FieldName configId = FieldName.forField("configId", "config_id"); static final FieldName state = FieldName.forField("state"); + + static final FieldName groupId = FieldName.forField("groupId", "group_id"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/MissionOuterClass.java b/src/generated/main/emu/lunarcore/proto/MissionOuterClass.java index 2c55599b6..bcc45df62 100644 --- a/src/generated/main/emu/lunarcore/proto/MissionOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/MissionOuterClass.java @@ -19,17 +19,17 @@ public static final class Mission extends ProtoMessage implements Clone private static final long serialVersionUID = 0L; /** - * optional uint32 progress = 14; + * optional uint32 progress = 4; */ private int progress; /** - * optional uint32 id = 15; + * optional uint32 id = 14; */ private int id; /** - * optional .MissionStatus status = 11; + * optional .MissionStatus status = 8; */ private int status; @@ -44,7 +44,7 @@ public static Mission newInstance() { } /** - * optional uint32 progress = 14; + * optional uint32 progress = 4; * @return whether the progress field is set */ public boolean hasProgress() { @@ -52,7 +52,7 @@ public boolean hasProgress() { } /** - * optional uint32 progress = 14; + * optional uint32 progress = 4; * @return this */ public Mission clearProgress() { @@ -62,7 +62,7 @@ public Mission clearProgress() { } /** - * optional uint32 progress = 14; + * optional uint32 progress = 4; * @return the progress */ public int getProgress() { @@ -70,7 +70,7 @@ public int getProgress() { } /** - * optional uint32 progress = 14; + * optional uint32 progress = 4; * @param value the progress to set * @return this */ @@ -81,7 +81,7 @@ public Mission setProgress(final int value) { } /** - * optional uint32 id = 15; + * optional uint32 id = 14; * @return whether the id field is set */ public boolean hasId() { @@ -89,7 +89,7 @@ public boolean hasId() { } /** - * optional uint32 id = 15; + * optional uint32 id = 14; * @return this */ public Mission clearId() { @@ -99,7 +99,7 @@ public Mission clearId() { } /** - * optional uint32 id = 15; + * optional uint32 id = 14; * @return the id */ public int getId() { @@ -107,7 +107,7 @@ public int getId() { } /** - * optional uint32 id = 15; + * optional uint32 id = 14; * @param value the id to set * @return this */ @@ -118,7 +118,7 @@ public Mission setId(final int value) { } /** - * optional .MissionStatus status = 11; + * optional .MissionStatus status = 8; * @return whether the status field is set */ public boolean hasStatus() { @@ -126,7 +126,7 @@ public boolean hasStatus() { } /** - * optional .MissionStatus status = 11; + * optional .MissionStatus status = 8; * @return this */ public Mission clearStatus() { @@ -136,7 +136,7 @@ public Mission clearStatus() { } /** - * optional .MissionStatus status = 11; + * optional .MissionStatus status = 8; * @return the status */ public MissionStatusOuterClass.MissionStatus getStatus() { @@ -169,7 +169,7 @@ public Mission setStatusValue(final int value) { } /** - * optional .MissionStatus status = 11; + * optional .MissionStatus status = 8; * @param value the status to set * @return this */ @@ -250,15 +250,15 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(progress); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(id); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 64); output.writeEnumNoTag(status); } } @@ -285,25 +285,25 @@ public Mission mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 112: { + case 32: { // progress progress = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 120) { + if (tag != 112) { break; } } - case 120: { + case 112: { // id id = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 88) { + if (tag != 64) { break; } } - case 88: { + case 64: { // status final int value = input.readInt32(); if (MissionStatusOuterClass.MissionStatus.forNumber(value) != null) { diff --git a/src/generated/main/emu/lunarcore/proto/MonsterArchiveOuterClass.java b/src/generated/main/emu/lunarcore/proto/MonsterArchiveOuterClass.java index 6f9dea1fa..960da9f55 100644 --- a/src/generated/main/emu/lunarcore/proto/MonsterArchiveOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/MonsterArchiveOuterClass.java @@ -19,12 +19,12 @@ public static final class MonsterArchive extends ProtoMessage im private static final long serialVersionUID = 0L; /** - * optional uint32 monster_id = 8; + * optional uint32 monster_id = 1; */ private int monsterId; /** - * optional uint32 num = 14; + * optional uint32 num = 13; */ private int num; @@ -39,7 +39,7 @@ public static MonsterArchive newInstance() { } /** - * optional uint32 monster_id = 8; + * optional uint32 monster_id = 1; * @return whether the monsterId field is set */ public boolean hasMonsterId() { @@ -47,7 +47,7 @@ public boolean hasMonsterId() { } /** - * optional uint32 monster_id = 8; + * optional uint32 monster_id = 1; * @return this */ public MonsterArchive clearMonsterId() { @@ -57,7 +57,7 @@ public MonsterArchive clearMonsterId() { } /** - * optional uint32 monster_id = 8; + * optional uint32 monster_id = 1; * @return the monsterId */ public int getMonsterId() { @@ -65,7 +65,7 @@ public int getMonsterId() { } /** - * optional uint32 monster_id = 8; + * optional uint32 monster_id = 1; * @param value the monsterId to set * @return this */ @@ -76,7 +76,7 @@ public MonsterArchive setMonsterId(final int value) { } /** - * optional uint32 num = 14; + * optional uint32 num = 13; * @return whether the num field is set */ public boolean hasNum() { @@ -84,7 +84,7 @@ public boolean hasNum() { } /** - * optional uint32 num = 14; + * optional uint32 num = 13; * @return this */ public MonsterArchive clearNum() { @@ -94,7 +94,7 @@ public MonsterArchive clearNum() { } /** - * optional uint32 num = 14; + * optional uint32 num = 13; * @return the num */ public int getNum() { @@ -102,7 +102,7 @@ public int getNum() { } /** - * optional uint32 num = 14; + * optional uint32 num = 13; * @param value the num to set * @return this */ @@ -177,11 +177,11 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(monsterId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(num); } } @@ -205,16 +205,16 @@ public MonsterArchive mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { + case 8: { // monsterId monsterId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 112) { + if (tag != 104) { break; } } - case 112: { + case 104: { // num num = input.readUInt32(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/MotionInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/MotionInfoOuterClass.java index 115aa8cd7..0cff53a5d 100644 --- a/src/generated/main/emu/lunarcore/proto/MotionInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/MotionInfoOuterClass.java @@ -24,7 +24,7 @@ public static final class MotionInfo extends ProtoMessage implements private final VectorOuterClass.Vector rot = VectorOuterClass.Vector.newInstance(); /** - * optional .Vector pos = 12; + * optional .Vector pos = 13; */ private final VectorOuterClass.Vector pos = VectorOuterClass.Vector.newInstance(); @@ -96,7 +96,7 @@ public MotionInfo setRot(final VectorOuterClass.Vector value) { } /** - * optional .Vector pos = 12; + * optional .Vector pos = 13; * @return whether the pos field is set */ public boolean hasPos() { @@ -104,7 +104,7 @@ public boolean hasPos() { } /** - * optional .Vector pos = 12; + * optional .Vector pos = 13; * @return this */ public MotionInfo clearPos() { @@ -114,7 +114,7 @@ public MotionInfo clearPos() { } /** - * optional .Vector pos = 12; + * optional .Vector pos = 13; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -128,7 +128,7 @@ public VectorOuterClass.Vector getPos() { } /** - * optional .Vector pos = 12; + * optional .Vector pos = 13; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -142,7 +142,7 @@ public VectorOuterClass.Vector getMutablePos() { } /** - * optional .Vector pos = 12; + * optional .Vector pos = 13; * @param value the pos to set * @return this */ @@ -223,7 +223,7 @@ public void writeTo(final ProtoSink output) throws IOException { output.writeMessageNoTag(rot); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 98); + output.writeRawByte((byte) 106); output.writeMessageNoTag(pos); } } @@ -252,11 +252,11 @@ public MotionInfo mergeFrom(final ProtoSource input) throws IOException { input.readMessage(rot); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 98) { + if (tag != 106) { break; } } - case 98: { + case 106: { // pos input.readMessage(pos); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/NewMailScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/NewMailScNotifyOuterClass.java index a577993ec..d8888d051 100644 --- a/src/generated/main/emu/lunarcore/proto/NewMailScNotifyOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/NewMailScNotifyOuterClass.java @@ -20,7 +20,7 @@ public static final class NewMailScNotify extends ProtoMessage private static final long serialVersionUID = 0L; /** - * repeated uint32 mail_id_list = 10; + * repeated uint32 mail_id_list = 1; */ private final RepeatedInt mailIdList = RepeatedInt.newEmptyInstance(); @@ -35,7 +35,7 @@ public static NewMailScNotify newInstance() { } /** - * repeated uint32 mail_id_list = 10; + * repeated uint32 mail_id_list = 1; * @return whether the mailIdList field is set */ public boolean hasMailIdList() { @@ -43,7 +43,7 @@ public boolean hasMailIdList() { } /** - * repeated uint32 mail_id_list = 10; + * repeated uint32 mail_id_list = 1; * @return this */ public NewMailScNotify clearMailIdList() { @@ -53,7 +53,7 @@ public NewMailScNotify clearMailIdList() { } /** - * repeated uint32 mail_id_list = 10; + * repeated uint32 mail_id_list = 1; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -67,7 +67,7 @@ public RepeatedInt getMailIdList() { } /** - * repeated uint32 mail_id_list = 10; + * repeated uint32 mail_id_list = 1; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -81,7 +81,7 @@ public RepeatedInt getMutableMailIdList() { } /** - * repeated uint32 mail_id_list = 10; + * repeated uint32 mail_id_list = 1; * @param value the mailIdList to add * @return this */ @@ -92,7 +92,7 @@ public NewMailScNotify addMailIdList(final int value) { } /** - * repeated uint32 mail_id_list = 10; + * repeated uint32 mail_id_list = 1; * @param values the mailIdList to add * @return this */ @@ -163,7 +163,7 @@ public boolean equals(Object o) { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { for (int i = 0; i < mailIdList.length(); i++) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(mailIdList.array()[i]); } } @@ -185,7 +185,7 @@ public NewMailScNotify mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 82: { + case 10: { // mailIdList [packed=true] input.readPackedUInt32(mailIdList, tag); bitField0_ |= 0x00000001; @@ -204,7 +204,7 @@ public NewMailScNotify mergeFrom(final ProtoSource input) throws IOException { tag = input.readTag(); break; } - case 80: { + case 8: { // mailIdList [packed=false] tag = input.readRepeatedUInt32(mailIdList, tag); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/NpcExtraInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/NpcExtraInfoOuterClass.java index 23c057674..047ab3a77 100644 --- a/src/generated/main/emu/lunarcore/proto/NpcExtraInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/NpcExtraInfoOuterClass.java @@ -19,7 +19,7 @@ public static final class NpcExtraInfo extends ProtoMessage implem private static final long serialVersionUID = 0L; /** - * optional .NpcRogueInfo rogue_info = 14; + * optional .NpcRogueInfo rogue_info = 8; */ private final NpcRogueInfoOuterClass.NpcRogueInfo rogueInfo = NpcRogueInfoOuterClass.NpcRogueInfo.newInstance(); @@ -34,7 +34,7 @@ public static NpcExtraInfo newInstance() { } /** - * optional .NpcRogueInfo rogue_info = 14; + * optional .NpcRogueInfo rogue_info = 8; * @return whether the rogueInfo field is set */ public boolean hasRogueInfo() { @@ -42,7 +42,7 @@ public boolean hasRogueInfo() { } /** - * optional .NpcRogueInfo rogue_info = 14; + * optional .NpcRogueInfo rogue_info = 8; * @return this */ public NpcExtraInfo clearRogueInfo() { @@ -52,7 +52,7 @@ public NpcExtraInfo clearRogueInfo() { } /** - * optional .NpcRogueInfo rogue_info = 14; + * optional .NpcRogueInfo rogue_info = 8; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -66,7 +66,7 @@ public NpcRogueInfoOuterClass.NpcRogueInfo getRogueInfo() { } /** - * optional .NpcRogueInfo rogue_info = 14; + * optional .NpcRogueInfo rogue_info = 8; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -80,7 +80,7 @@ public NpcRogueInfoOuterClass.NpcRogueInfo getMutableRogueInfo() { } /** - * optional .NpcRogueInfo rogue_info = 14; + * optional .NpcRogueInfo rogue_info = 8; * @param value the rogueInfo to set * @return this */ @@ -150,7 +150,7 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 114); + output.writeRawByte((byte) 66); output.writeMessageNoTag(rogueInfo); } } @@ -171,7 +171,7 @@ public NpcExtraInfo mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 114: { + case 66: { // rogueInfo input.readMessage(rogueInfo); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/NpcTalkInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/NpcTalkInfoOuterClass.java index f51305990..cc2db5a6c 100644 --- a/src/generated/main/emu/lunarcore/proto/NpcTalkInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/NpcTalkInfoOuterClass.java @@ -19,7 +19,7 @@ public static final class NpcTalkInfo extends ProtoMessage implemen private static final long serialVersionUID = 0L; /** - * optional uint32 npc_talk_id = 4; + * optional uint32 npc_talk_id = 3; */ private int npcTalkId; @@ -34,7 +34,7 @@ public static NpcTalkInfo newInstance() { } /** - * optional uint32 npc_talk_id = 4; + * optional uint32 npc_talk_id = 3; * @return whether the npcTalkId field is set */ public boolean hasNpcTalkId() { @@ -42,7 +42,7 @@ public boolean hasNpcTalkId() { } /** - * optional uint32 npc_talk_id = 4; + * optional uint32 npc_talk_id = 3; * @return this */ public NpcTalkInfo clearNpcTalkId() { @@ -52,7 +52,7 @@ public NpcTalkInfo clearNpcTalkId() { } /** - * optional uint32 npc_talk_id = 4; + * optional uint32 npc_talk_id = 3; * @return the npcTalkId */ public int getNpcTalkId() { @@ -60,7 +60,7 @@ public int getNpcTalkId() { } /** - * optional uint32 npc_talk_id = 4; + * optional uint32 npc_talk_id = 3; * @param value the npcTalkId to set * @return this */ @@ -129,7 +129,7 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(npcTalkId); } } @@ -150,7 +150,7 @@ public NpcTalkInfo mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { + case 24: { // npcTalkId npcTalkId = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/OONJMMOMFHLOuterClass.java b/src/generated/main/emu/lunarcore/proto/OONJMMOMFHLOuterClass.java deleted file mode 100644 index e5c1a1812..000000000 --- a/src/generated/main/emu/lunarcore/proto/OONJMMOMFHLOuterClass.java +++ /dev/null @@ -1,292 +0,0 @@ -// Code generated by protocol buffer compiler. Do not edit! -package emu.lunarcore.proto; - -import java.io.IOException; -import us.hebi.quickbuf.FieldName; -import us.hebi.quickbuf.InvalidProtocolBufferException; -import us.hebi.quickbuf.JsonSink; -import us.hebi.quickbuf.JsonSource; -import us.hebi.quickbuf.MessageFactory; -import us.hebi.quickbuf.ProtoMessage; -import us.hebi.quickbuf.ProtoSink; -import us.hebi.quickbuf.ProtoSource; -import us.hebi.quickbuf.RepeatedMessage; - -public final class OONJMMOMFHLOuterClass { - /** - * Protobuf type {@code OONJMMOMFHL} - */ - public static final class OONJMMOMFHL extends ProtoMessage implements Cloneable { - private static final long serialVersionUID = 0L; - - /** - * repeated .KDHBAHABJMP AMEONEDBMDL = 7; - */ - private final RepeatedMessage aMEONEDBMDL = RepeatedMessage.newEmptyInstance(KDHBAHABJMPOuterClass.KDHBAHABJMP.getFactory()); - - private OONJMMOMFHL() { - } - - /** - * @return a new empty instance of {@code OONJMMOMFHL} - */ - public static OONJMMOMFHL newInstance() { - return new OONJMMOMFHL(); - } - - /** - * repeated .KDHBAHABJMP AMEONEDBMDL = 7; - * @return whether the aMEONEDBMDL field is set - */ - public boolean hasAMEONEDBMDL() { - return (bitField0_ & 0x00000001) != 0; - } - - /** - * repeated .KDHBAHABJMP AMEONEDBMDL = 7; - * @return this - */ - public OONJMMOMFHL clearAMEONEDBMDL() { - bitField0_ &= ~0x00000001; - aMEONEDBMDL.clear(); - return this; - } - - /** - * repeated .KDHBAHABJMP AMEONEDBMDL = 7; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * Use {@link #getMutableAMEONEDBMDL()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedMessage getAMEONEDBMDL() { - return aMEONEDBMDL; - } - - /** - * repeated .KDHBAHABJMP AMEONEDBMDL = 7; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public RepeatedMessage getMutableAMEONEDBMDL() { - bitField0_ |= 0x00000001; - return aMEONEDBMDL; - } - - /** - * repeated .KDHBAHABJMP AMEONEDBMDL = 7; - * @param value the aMEONEDBMDL to add - * @return this - */ - public OONJMMOMFHL addAMEONEDBMDL(final KDHBAHABJMPOuterClass.KDHBAHABJMP value) { - bitField0_ |= 0x00000001; - aMEONEDBMDL.add(value); - return this; - } - - /** - * repeated .KDHBAHABJMP AMEONEDBMDL = 7; - * @param values the aMEONEDBMDL to add - * @return this - */ - public OONJMMOMFHL addAllAMEONEDBMDL(final KDHBAHABJMPOuterClass.KDHBAHABJMP... values) { - bitField0_ |= 0x00000001; - aMEONEDBMDL.addAll(values); - return this; - } - - @Override - public OONJMMOMFHL copyFrom(final OONJMMOMFHL other) { - cachedSize = other.cachedSize; - if ((bitField0_ | other.bitField0_) != 0) { - bitField0_ = other.bitField0_; - aMEONEDBMDL.copyFrom(other.aMEONEDBMDL); - } - return this; - } - - @Override - public OONJMMOMFHL mergeFrom(final OONJMMOMFHL other) { - if (other.isEmpty()) { - return this; - } - cachedSize = -1; - if (other.hasAMEONEDBMDL()) { - getMutableAMEONEDBMDL().addAll(other.aMEONEDBMDL); - } - return this; - } - - @Override - public OONJMMOMFHL clear() { - if (isEmpty()) { - return this; - } - cachedSize = -1; - bitField0_ = 0; - aMEONEDBMDL.clear(); - return this; - } - - @Override - public OONJMMOMFHL clearQuick() { - if (isEmpty()) { - return this; - } - cachedSize = -1; - bitField0_ = 0; - aMEONEDBMDL.clearQuick(); - return this; - } - - @Override - public boolean equals(Object o) { - if (o == this) { - return true; - } - if (!(o instanceof OONJMMOMFHL)) { - return false; - } - OONJMMOMFHL other = (OONJMMOMFHL) o; - return bitField0_ == other.bitField0_ - && (!hasAMEONEDBMDL() || aMEONEDBMDL.equals(other.aMEONEDBMDL)); - } - - @Override - public void writeTo(final ProtoSink output) throws IOException { - if ((bitField0_ & 0x00000001) != 0) { - for (int i = 0; i < aMEONEDBMDL.length(); i++) { - output.writeRawByte((byte) 58); - output.writeMessageNoTag(aMEONEDBMDL.get(i)); - } - } - } - - @Override - protected int computeSerializedSize() { - int size = 0; - if ((bitField0_ & 0x00000001) != 0) { - size += (1 * aMEONEDBMDL.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(aMEONEDBMDL); - } - return size; - } - - @Override - @SuppressWarnings("fallthrough") - public OONJMMOMFHL mergeFrom(final ProtoSource input) throws IOException { - // Enabled Fall-Through Optimization (QuickBuffers) - int tag = input.readTag(); - while (true) { - switch (tag) { - case 58: { - // aMEONEDBMDL - tag = input.readRepeatedMessage(aMEONEDBMDL, tag); - bitField0_ |= 0x00000001; - if (tag != 0) { - break; - } - } - case 0: { - return this; - } - default: { - if (!input.skipField(tag)) { - return this; - } - tag = input.readTag(); - break; - } - } - } - } - - @Override - public void writeTo(final JsonSink output) throws IOException { - output.beginObject(); - if ((bitField0_ & 0x00000001) != 0) { - output.writeRepeatedMessage(FieldNames.aMEONEDBMDL, aMEONEDBMDL); - } - output.endObject(); - } - - @Override - public OONJMMOMFHL mergeFrom(final JsonSource input) throws IOException { - if (!input.beginObject()) { - return this; - } - while (!input.isAtEnd()) { - switch (input.readFieldHash()) { - case -455539094: { - if (input.isAtField(FieldNames.aMEONEDBMDL)) { - if (!input.trySkipNullValue()) { - input.readRepeatedMessage(aMEONEDBMDL); - bitField0_ |= 0x00000001; - } - } else { - input.skipUnknownField(); - } - break; - } - default: { - input.skipUnknownField(); - break; - } - } - } - input.endObject(); - return this; - } - - @Override - public OONJMMOMFHL clone() { - return new OONJMMOMFHL().copyFrom(this); - } - - @Override - public boolean isEmpty() { - return ((bitField0_) == 0); - } - - public static OONJMMOMFHL parseFrom(final byte[] data) throws InvalidProtocolBufferException { - return ProtoMessage.mergeFrom(new OONJMMOMFHL(), data).checkInitialized(); - } - - public static OONJMMOMFHL parseFrom(final ProtoSource input) throws IOException { - return ProtoMessage.mergeFrom(new OONJMMOMFHL(), input).checkInitialized(); - } - - public static OONJMMOMFHL parseFrom(final JsonSource input) throws IOException { - return ProtoMessage.mergeFrom(new OONJMMOMFHL(), input).checkInitialized(); - } - - /** - * @return factory for creating OONJMMOMFHL messages - */ - public static MessageFactory getFactory() { - return OONJMMOMFHLFactory.INSTANCE; - } - - private enum OONJMMOMFHLFactory implements MessageFactory { - INSTANCE; - - @Override - public OONJMMOMFHL create() { - return OONJMMOMFHL.newInstance(); - } - } - - /** - * Contains name constants used for serializing JSON - */ - static class FieldNames { - static final FieldName aMEONEDBMDL = FieldName.forField("AMEONEDBMDL"); - } - } -} diff --git a/src/generated/main/emu/lunarcore/proto/PVEBattleResultCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/PVEBattleResultCsReqOuterClass.java index 4da1fddc4..1e375b4d6 100644 --- a/src/generated/main/emu/lunarcore/proto/PVEBattleResultCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/PVEBattleResultCsReqOuterClass.java @@ -21,19 +21,19 @@ public static final class PVEBattleResultCsReq extends ProtoMessageoptional uint32 stage_id = 2; + * optional uint32 client_res_version = 2; */ - private int stageId; + private int clientResVersion; /** - * optional uint32 battle_id = 10; + * optional uint32 battle_id = 3; */ private int battleId; /** - * optional uint32 client_res_version = 12; + * optional uint32 stage_id = 11; */ - private int clientResVersion; + private int stageId; /** * optional uint32 cost_time = 14; @@ -41,27 +41,27 @@ public static final class PVEBattleResultCsReq extends ProtoMessageoptional .BattleEndStatus end_status = 11; + * optional .BattleEndStatus end_status = 12; */ private int endStatus; /** - * optional bool is_ai_consider_ultra_skill = 13; + * optional bool is_ai_consider_ultra_skill = 15; */ private boolean isAiConsiderUltraSkill; /** - * optional .BattleStatistics stt = 1; + * optional .BattleStatistics stt = 8; */ private final BattleStatisticsOuterClass.BattleStatistics stt = BattleStatisticsOuterClass.BattleStatistics.newInstance(); /** - * optional bytes turn_snapshot_hash = 3; + * optional bytes turn_snapshot_hash = 13; */ private final RepeatedByte turnSnapshotHash = RepeatedByte.newEmptyInstance(); /** - * repeated .BattleOp op_list = 4; + * repeated .BattleOp op_list = 1; */ private final RepeatedMessage opList = RepeatedMessage.newEmptyInstance(BattleOpOuterClass.BattleOp.getFactory()); @@ -76,44 +76,44 @@ public static PVEBattleResultCsReq newInstance() { } /** - * optional uint32 stage_id = 2; - * @return whether the stageId field is set + * optional uint32 client_res_version = 2; + * @return whether the clientResVersion field is set */ - public boolean hasStageId() { + public boolean hasClientResVersion() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 stage_id = 2; + * optional uint32 client_res_version = 2; * @return this */ - public PVEBattleResultCsReq clearStageId() { + public PVEBattleResultCsReq clearClientResVersion() { bitField0_ &= ~0x00000001; - stageId = 0; + clientResVersion = 0; return this; } /** - * optional uint32 stage_id = 2; - * @return the stageId + * optional uint32 client_res_version = 2; + * @return the clientResVersion */ - public int getStageId() { - return stageId; + public int getClientResVersion() { + return clientResVersion; } /** - * optional uint32 stage_id = 2; - * @param value the stageId to set + * optional uint32 client_res_version = 2; + * @param value the clientResVersion to set * @return this */ - public PVEBattleResultCsReq setStageId(final int value) { + public PVEBattleResultCsReq setClientResVersion(final int value) { bitField0_ |= 0x00000001; - stageId = value; + clientResVersion = value; return this; } /** - * optional uint32 battle_id = 10; + * optional uint32 battle_id = 3; * @return whether the battleId field is set */ public boolean hasBattleId() { @@ -121,7 +121,7 @@ public boolean hasBattleId() { } /** - * optional uint32 battle_id = 10; + * optional uint32 battle_id = 3; * @return this */ public PVEBattleResultCsReq clearBattleId() { @@ -131,7 +131,7 @@ public PVEBattleResultCsReq clearBattleId() { } /** - * optional uint32 battle_id = 10; + * optional uint32 battle_id = 3; * @return the battleId */ public int getBattleId() { @@ -139,7 +139,7 @@ public int getBattleId() { } /** - * optional uint32 battle_id = 10; + * optional uint32 battle_id = 3; * @param value the battleId to set * @return this */ @@ -150,39 +150,39 @@ public PVEBattleResultCsReq setBattleId(final int value) { } /** - * optional uint32 client_res_version = 12; - * @return whether the clientResVersion field is set + * optional uint32 stage_id = 11; + * @return whether the stageId field is set */ - public boolean hasClientResVersion() { + public boolean hasStageId() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 client_res_version = 12; + * optional uint32 stage_id = 11; * @return this */ - public PVEBattleResultCsReq clearClientResVersion() { + public PVEBattleResultCsReq clearStageId() { bitField0_ &= ~0x00000004; - clientResVersion = 0; + stageId = 0; return this; } /** - * optional uint32 client_res_version = 12; - * @return the clientResVersion + * optional uint32 stage_id = 11; + * @return the stageId */ - public int getClientResVersion() { - return clientResVersion; + public int getStageId() { + return stageId; } /** - * optional uint32 client_res_version = 12; - * @param value the clientResVersion to set + * optional uint32 stage_id = 11; + * @param value the stageId to set * @return this */ - public PVEBattleResultCsReq setClientResVersion(final int value) { + public PVEBattleResultCsReq setStageId(final int value) { bitField0_ |= 0x00000004; - clientResVersion = value; + stageId = value; return this; } @@ -224,7 +224,7 @@ public PVEBattleResultCsReq setCostTime(final int value) { } /** - * optional .BattleEndStatus end_status = 11; + * optional .BattleEndStatus end_status = 12; * @return whether the endStatus field is set */ public boolean hasEndStatus() { @@ -232,7 +232,7 @@ public boolean hasEndStatus() { } /** - * optional .BattleEndStatus end_status = 11; + * optional .BattleEndStatus end_status = 12; * @return this */ public PVEBattleResultCsReq clearEndStatus() { @@ -242,7 +242,7 @@ public PVEBattleResultCsReq clearEndStatus() { } /** - * optional .BattleEndStatus end_status = 11; + * optional .BattleEndStatus end_status = 12; * @return the endStatus */ public BattleEndStatusOuterClass.BattleEndStatus getEndStatus() { @@ -275,7 +275,7 @@ public PVEBattleResultCsReq setEndStatusValue(final int value) { } /** - * optional .BattleEndStatus end_status = 11; + * optional .BattleEndStatus end_status = 12; * @param value the endStatus to set * @return this */ @@ -287,7 +287,7 @@ public PVEBattleResultCsReq setEndStatus( } /** - * optional bool is_ai_consider_ultra_skill = 13; + * optional bool is_ai_consider_ultra_skill = 15; * @return whether the isAiConsiderUltraSkill field is set */ public boolean hasIsAiConsiderUltraSkill() { @@ -295,7 +295,7 @@ public boolean hasIsAiConsiderUltraSkill() { } /** - * optional bool is_ai_consider_ultra_skill = 13; + * optional bool is_ai_consider_ultra_skill = 15; * @return this */ public PVEBattleResultCsReq clearIsAiConsiderUltraSkill() { @@ -305,7 +305,7 @@ public PVEBattleResultCsReq clearIsAiConsiderUltraSkill() { } /** - * optional bool is_ai_consider_ultra_skill = 13; + * optional bool is_ai_consider_ultra_skill = 15; * @return the isAiConsiderUltraSkill */ public boolean getIsAiConsiderUltraSkill() { @@ -313,7 +313,7 @@ public boolean getIsAiConsiderUltraSkill() { } /** - * optional bool is_ai_consider_ultra_skill = 13; + * optional bool is_ai_consider_ultra_skill = 15; * @param value the isAiConsiderUltraSkill to set * @return this */ @@ -324,7 +324,7 @@ public PVEBattleResultCsReq setIsAiConsiderUltraSkill(final boolean value) { } /** - * optional .BattleStatistics stt = 1; + * optional .BattleStatistics stt = 8; * @return whether the stt field is set */ public boolean hasStt() { @@ -332,7 +332,7 @@ public boolean hasStt() { } /** - * optional .BattleStatistics stt = 1; + * optional .BattleStatistics stt = 8; * @return this */ public PVEBattleResultCsReq clearStt() { @@ -342,7 +342,7 @@ public PVEBattleResultCsReq clearStt() { } /** - * optional .BattleStatistics stt = 1; + * optional .BattleStatistics stt = 8; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -356,7 +356,7 @@ public BattleStatisticsOuterClass.BattleStatistics getStt() { } /** - * optional .BattleStatistics stt = 1; + * optional .BattleStatistics stt = 8; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -370,7 +370,7 @@ public BattleStatisticsOuterClass.BattleStatistics getMutableStt() { } /** - * optional .BattleStatistics stt = 1; + * optional .BattleStatistics stt = 8; * @param value the stt to set * @return this */ @@ -381,7 +381,7 @@ public PVEBattleResultCsReq setStt(final BattleStatisticsOuterClass.BattleStatis } /** - * optional bytes turn_snapshot_hash = 3; + * optional bytes turn_snapshot_hash = 13; * @return whether the turnSnapshotHash field is set */ public boolean hasTurnSnapshotHash() { @@ -389,7 +389,7 @@ public boolean hasTurnSnapshotHash() { } /** - * optional bytes turn_snapshot_hash = 3; + * optional bytes turn_snapshot_hash = 13; * @return this */ public PVEBattleResultCsReq clearTurnSnapshotHash() { @@ -399,7 +399,7 @@ public PVEBattleResultCsReq clearTurnSnapshotHash() { } /** - * optional bytes turn_snapshot_hash = 3; + * optional bytes turn_snapshot_hash = 13; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -413,7 +413,7 @@ public RepeatedByte getTurnSnapshotHash() { } /** - * optional bytes turn_snapshot_hash = 3; + * optional bytes turn_snapshot_hash = 13; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -427,7 +427,7 @@ public RepeatedByte getMutableTurnSnapshotHash() { } /** - * optional bytes turn_snapshot_hash = 3; + * optional bytes turn_snapshot_hash = 13; * @param value the turnSnapshotHash to add * @return this */ @@ -438,7 +438,7 @@ public PVEBattleResultCsReq addTurnSnapshotHash(final byte value) { } /** - * optional bytes turn_snapshot_hash = 3; + * optional bytes turn_snapshot_hash = 13; * @param values the turnSnapshotHash to add * @return this */ @@ -449,7 +449,7 @@ public PVEBattleResultCsReq addAllTurnSnapshotHash(final byte... values) { } /** - * optional bytes turn_snapshot_hash = 3; + * optional bytes turn_snapshot_hash = 13; * @param values the turnSnapshotHash to set * @return this */ @@ -460,7 +460,7 @@ public PVEBattleResultCsReq setTurnSnapshotHash(final byte... values) { } /** - * repeated .BattleOp op_list = 4; + * repeated .BattleOp op_list = 1; * @return whether the opList field is set */ public boolean hasOpList() { @@ -468,7 +468,7 @@ public boolean hasOpList() { } /** - * repeated .BattleOp op_list = 4; + * repeated .BattleOp op_list = 1; * @return this */ public PVEBattleResultCsReq clearOpList() { @@ -478,7 +478,7 @@ public PVEBattleResultCsReq clearOpList() { } /** - * repeated .BattleOp op_list = 4; + * repeated .BattleOp op_list = 1; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -492,7 +492,7 @@ public RepeatedMessage getOpList() { } /** - * repeated .BattleOp op_list = 4; + * repeated .BattleOp op_list = 1; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -506,7 +506,7 @@ public RepeatedMessage getMutableOpList() { } /** - * repeated .BattleOp op_list = 4; + * repeated .BattleOp op_list = 1; * @param value the opList to add * @return this */ @@ -517,7 +517,7 @@ public PVEBattleResultCsReq addOpList(final BattleOpOuterClass.BattleOp value) { } /** - * repeated .BattleOp op_list = 4; + * repeated .BattleOp op_list = 1; * @param values the opList to add * @return this */ @@ -532,9 +532,9 @@ public PVEBattleResultCsReq copyFrom(final PVEBattleResultCsReq other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - stageId = other.stageId; - battleId = other.battleId; clientResVersion = other.clientResVersion; + battleId = other.battleId; + stageId = other.stageId; costTime = other.costTime; endStatus = other.endStatus; isAiConsiderUltraSkill = other.isAiConsiderUltraSkill; @@ -551,14 +551,14 @@ public PVEBattleResultCsReq mergeFrom(final PVEBattleResultCsReq other) { return this; } cachedSize = -1; - if (other.hasStageId()) { - setStageId(other.stageId); + if (other.hasClientResVersion()) { + setClientResVersion(other.clientResVersion); } if (other.hasBattleId()) { setBattleId(other.battleId); } - if (other.hasClientResVersion()) { - setClientResVersion(other.clientResVersion); + if (other.hasStageId()) { + setStageId(other.stageId); } if (other.hasCostTime()) { setCostTime(other.costTime); @@ -588,9 +588,9 @@ public PVEBattleResultCsReq clear() { } cachedSize = -1; bitField0_ = 0; - stageId = 0; - battleId = 0; clientResVersion = 0; + battleId = 0; + stageId = 0; costTime = 0; endStatus = 0; isAiConsiderUltraSkill = false; @@ -623,9 +623,9 @@ public boolean equals(Object o) { } PVEBattleResultCsReq other = (PVEBattleResultCsReq) o; return bitField0_ == other.bitField0_ - && (!hasStageId() || stageId == other.stageId) - && (!hasBattleId() || battleId == other.battleId) && (!hasClientResVersion() || clientResVersion == other.clientResVersion) + && (!hasBattleId() || battleId == other.battleId) + && (!hasStageId() || stageId == other.stageId) && (!hasCostTime() || costTime == other.costTime) && (!hasEndStatus() || endStatus == other.endStatus) && (!hasIsAiConsiderUltraSkill() || isAiConsiderUltraSkill == other.isAiConsiderUltraSkill) @@ -638,39 +638,39 @@ public boolean equals(Object o) { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { output.writeRawByte((byte) 16); - output.writeUInt32NoTag(stageId); + output.writeUInt32NoTag(clientResVersion); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(battleId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 96); - output.writeUInt32NoTag(clientResVersion); + output.writeRawByte((byte) 88); + output.writeUInt32NoTag(stageId); } if ((bitField0_ & 0x00000008) != 0) { output.writeRawByte((byte) 112); output.writeUInt32NoTag(costTime); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 96); output.writeEnumNoTag(endStatus); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 120); output.writeBoolNoTag(isAiConsiderUltraSkill); } if ((bitField0_ & 0x00000040) != 0) { - output.writeRawByte((byte) 10); + output.writeRawByte((byte) 66); output.writeMessageNoTag(stt); } if ((bitField0_ & 0x00000080) != 0) { - output.writeRawByte((byte) 26); + output.writeRawByte((byte) 106); output.writeBytesNoTag(turnSnapshotHash); } if ((bitField0_ & 0x00000100) != 0) { for (int i = 0; i < opList.length(); i++) { - output.writeRawByte((byte) 34); + output.writeRawByte((byte) 10); output.writeMessageNoTag(opList.get(i)); } } @@ -680,13 +680,13 @@ public void writeTo(final ProtoSink output) throws IOException { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(stageId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(clientResVersion); } if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(battleId); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(clientResVersion); + size += 1 + ProtoSink.computeUInt32SizeNoTag(stageId); } if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(costTime); @@ -717,26 +717,26 @@ public PVEBattleResultCsReq mergeFrom(final ProtoSource input) throws IOExceptio while (true) { switch (tag) { case 16: { - // stageId - stageId = input.readUInt32(); + // clientResVersion + clientResVersion = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 80) { + if (tag != 24) { break; } } - case 80: { + case 24: { // battleId battleId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 96) { + if (tag != 88) { break; } } - case 96: { - // clientResVersion - clientResVersion = input.readUInt32(); + case 88: { + // stageId + stageId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 112) { @@ -748,11 +748,11 @@ public PVEBattleResultCsReq mergeFrom(final ProtoSource input) throws IOExceptio costTime = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 88) { + if (tag != 96) { break; } } - case 88: { + case 96: { // endStatus final int value = input.readInt32(); if (BattleEndStatusOuterClass.BattleEndStatus.forNumber(value) != null) { @@ -760,38 +760,38 @@ public PVEBattleResultCsReq mergeFrom(final ProtoSource input) throws IOExceptio bitField0_ |= 0x00000010; } tag = input.readTag(); - if (tag != 104) { + if (tag != 120) { break; } } - case 104: { + case 120: { // isAiConsiderUltraSkill isAiConsiderUltraSkill = input.readBool(); bitField0_ |= 0x00000020; tag = input.readTag(); - if (tag != 10) { + if (tag != 66) { break; } } - case 10: { + case 66: { // stt input.readMessage(stt); bitField0_ |= 0x00000040; tag = input.readTag(); - if (tag != 26) { + if (tag != 106) { break; } } - case 26: { + case 106: { // turnSnapshotHash input.readBytes(turnSnapshotHash); bitField0_ |= 0x00000080; tag = input.readTag(); - if (tag != 34) { + if (tag != 10) { break; } } - case 34: { + case 10: { // opList tag = input.readRepeatedMessage(opList, tag); bitField0_ |= 0x00000100; @@ -817,13 +817,13 @@ public PVEBattleResultCsReq mergeFrom(final ProtoSource input) throws IOExceptio public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.stageId, stageId); + output.writeUInt32(FieldNames.clientResVersion, clientResVersion); } if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.battleId, battleId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.clientResVersion, clientResVersion); + output.writeUInt32(FieldNames.stageId, stageId); } if ((bitField0_ & 0x00000008) != 0) { output.writeUInt32(FieldNames.costTime, costTime); @@ -853,11 +853,11 @@ public PVEBattleResultCsReq mergeFrom(final JsonSource input) throws IOException } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1897528135: - case 1306191356: { - if (input.isAtField(FieldNames.stageId)) { + case -2005674429: + case -349907515: { + if (input.isAtField(FieldNames.clientResVersion)) { if (!input.trySkipNullValue()) { - stageId = input.readUInt32(); + clientResVersion = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -877,11 +877,11 @@ public PVEBattleResultCsReq mergeFrom(final JsonSource input) throws IOException } break; } - case -2005674429: - case -349907515: { - if (input.isAtField(FieldNames.clientResVersion)) { + case -1897528135: + case 1306191356: { + if (input.isAtField(FieldNames.stageId)) { if (!input.trySkipNullValue()) { - clientResVersion = input.readUInt32(); + stageId = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -1018,11 +1018,11 @@ public PVEBattleResultCsReq create() { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName stageId = FieldName.forField("stageId", "stage_id"); + static final FieldName clientResVersion = FieldName.forField("clientResVersion", "client_res_version"); static final FieldName battleId = FieldName.forField("battleId", "battle_id"); - static final FieldName clientResVersion = FieldName.forField("clientResVersion", "client_res_version"); + static final FieldName stageId = FieldName.forField("stageId", "stage_id"); static final FieldName costTime = FieldName.forField("costTime", "cost_time"); diff --git a/src/generated/main/emu/lunarcore/proto/PVEBattleResultScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/PVEBattleResultScRspOuterClass.java index 9888a894f..7f95a8a1c 100644 --- a/src/generated/main/emu/lunarcore/proto/PVEBattleResultScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/PVEBattleResultScRspOuterClass.java @@ -21,42 +21,42 @@ public static final class PVEBattleResultScRsp extends ProtoMessageoptional uint32 mismatch_turn_count = 2; + * optional uint32 stage_id = 1; */ - private int mismatchTurnCount; + private int stageId; /** - * optional uint32 retcode = 3; + * optional uint32 event_id = 4; */ - private int retcode; + private int eventId; /** - * optional uint32 battle_id = 10; + * optional uint32 retcode = 5; */ - private int battleId; + private int retcode; /** - * optional uint32 event_id = 12; + * optional uint32 battle_id = 6; */ - private int eventId; + private int battleId; /** - * optional uint32 stage_id = 15; + * optional uint32 mismatch_turn_count = 15; */ - private int stageId; + private int mismatchTurnCount; /** - * optional .BattleEndStatus end_status = 5; + * optional .BattleEndStatus end_status = 7; */ private int endStatus; /** - * optional bool check_identical = 1; + * optional bool check_identical = 12; */ private boolean checkIdentical; /** - * optional .ItemList drop_data = 8; + * optional .ItemList drop_data = 2; */ private final ItemListOuterClass.ItemList dropData = ItemListOuterClass.ItemList.newInstance(); @@ -66,27 +66,27 @@ public static final class PVEBattleResultScRsp extends ProtoMessageoptional .ItemList unk2 = 14; + * optional .ItemList unk2 = 13; */ private final ItemListOuterClass.ItemList unk2 = ItemListOuterClass.ItemList.newInstance(); /** - * optional .ItemList unk3 = 743; + * optional .ItemList unk3 = 524; */ private final ItemListOuterClass.ItemList unk3 = ItemListOuterClass.ItemList.newInstance(); /** - * optional string bin_version = 11; + * optional string res_version = 3; */ - private final Utf8String binVersion = Utf8String.newEmptyInstance(); + private final Utf8String resVersion = Utf8String.newEmptyInstance(); /** - * optional string res_version = 13; + * optional string bin_version = 14; */ - private final Utf8String resVersion = Utf8String.newEmptyInstance(); + private final Utf8String binVersion = Utf8String.newEmptyInstance(); /** - * repeated .BattleAvatar battle_avatar_list = 4; + * repeated .BattleAvatar battle_avatar_list = 8; */ private final RepeatedMessage battleAvatarList = RepeatedMessage.newEmptyInstance(BattleAvatarOuterClass.BattleAvatar.getFactory()); @@ -101,192 +101,192 @@ public static PVEBattleResultScRsp newInstance() { } /** - * optional uint32 mismatch_turn_count = 2; - * @return whether the mismatchTurnCount field is set + * optional uint32 stage_id = 1; + * @return whether the stageId field is set */ - public boolean hasMismatchTurnCount() { + public boolean hasStageId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 mismatch_turn_count = 2; + * optional uint32 stage_id = 1; * @return this */ - public PVEBattleResultScRsp clearMismatchTurnCount() { + public PVEBattleResultScRsp clearStageId() { bitField0_ &= ~0x00000001; - mismatchTurnCount = 0; + stageId = 0; return this; } /** - * optional uint32 mismatch_turn_count = 2; - * @return the mismatchTurnCount + * optional uint32 stage_id = 1; + * @return the stageId */ - public int getMismatchTurnCount() { - return mismatchTurnCount; + public int getStageId() { + return stageId; } /** - * optional uint32 mismatch_turn_count = 2; - * @param value the mismatchTurnCount to set + * optional uint32 stage_id = 1; + * @param value the stageId to set * @return this */ - public PVEBattleResultScRsp setMismatchTurnCount(final int value) { + public PVEBattleResultScRsp setStageId(final int value) { bitField0_ |= 0x00000001; - mismatchTurnCount = value; + stageId = value; return this; } /** - * optional uint32 retcode = 3; - * @return whether the retcode field is set + * optional uint32 event_id = 4; + * @return whether the eventId field is set */ - public boolean hasRetcode() { + public boolean hasEventId() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 retcode = 3; + * optional uint32 event_id = 4; * @return this */ - public PVEBattleResultScRsp clearRetcode() { + public PVEBattleResultScRsp clearEventId() { bitField0_ &= ~0x00000002; - retcode = 0; + eventId = 0; return this; } /** - * optional uint32 retcode = 3; - * @return the retcode + * optional uint32 event_id = 4; + * @return the eventId */ - public int getRetcode() { - return retcode; + public int getEventId() { + return eventId; } /** - * optional uint32 retcode = 3; - * @param value the retcode to set + * optional uint32 event_id = 4; + * @param value the eventId to set * @return this */ - public PVEBattleResultScRsp setRetcode(final int value) { + public PVEBattleResultScRsp setEventId(final int value) { bitField0_ |= 0x00000002; - retcode = value; + eventId = value; return this; } /** - * optional uint32 battle_id = 10; - * @return whether the battleId field is set + * optional uint32 retcode = 5; + * @return whether the retcode field is set */ - public boolean hasBattleId() { + public boolean hasRetcode() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 battle_id = 10; + * optional uint32 retcode = 5; * @return this */ - public PVEBattleResultScRsp clearBattleId() { + public PVEBattleResultScRsp clearRetcode() { bitField0_ &= ~0x00000004; - battleId = 0; + retcode = 0; return this; } /** - * optional uint32 battle_id = 10; - * @return the battleId + * optional uint32 retcode = 5; + * @return the retcode */ - public int getBattleId() { - return battleId; + public int getRetcode() { + return retcode; } /** - * optional uint32 battle_id = 10; - * @param value the battleId to set + * optional uint32 retcode = 5; + * @param value the retcode to set * @return this */ - public PVEBattleResultScRsp setBattleId(final int value) { + public PVEBattleResultScRsp setRetcode(final int value) { bitField0_ |= 0x00000004; - battleId = value; + retcode = value; return this; } /** - * optional uint32 event_id = 12; - * @return whether the eventId field is set + * optional uint32 battle_id = 6; + * @return whether the battleId field is set */ - public boolean hasEventId() { + public boolean hasBattleId() { return (bitField0_ & 0x00000008) != 0; } /** - * optional uint32 event_id = 12; + * optional uint32 battle_id = 6; * @return this */ - public PVEBattleResultScRsp clearEventId() { + public PVEBattleResultScRsp clearBattleId() { bitField0_ &= ~0x00000008; - eventId = 0; + battleId = 0; return this; } /** - * optional uint32 event_id = 12; - * @return the eventId + * optional uint32 battle_id = 6; + * @return the battleId */ - public int getEventId() { - return eventId; + public int getBattleId() { + return battleId; } /** - * optional uint32 event_id = 12; - * @param value the eventId to set + * optional uint32 battle_id = 6; + * @param value the battleId to set * @return this */ - public PVEBattleResultScRsp setEventId(final int value) { + public PVEBattleResultScRsp setBattleId(final int value) { bitField0_ |= 0x00000008; - eventId = value; + battleId = value; return this; } /** - * optional uint32 stage_id = 15; - * @return whether the stageId field is set + * optional uint32 mismatch_turn_count = 15; + * @return whether the mismatchTurnCount field is set */ - public boolean hasStageId() { + public boolean hasMismatchTurnCount() { return (bitField0_ & 0x00000010) != 0; } /** - * optional uint32 stage_id = 15; + * optional uint32 mismatch_turn_count = 15; * @return this */ - public PVEBattleResultScRsp clearStageId() { + public PVEBattleResultScRsp clearMismatchTurnCount() { bitField0_ &= ~0x00000010; - stageId = 0; + mismatchTurnCount = 0; return this; } /** - * optional uint32 stage_id = 15; - * @return the stageId + * optional uint32 mismatch_turn_count = 15; + * @return the mismatchTurnCount */ - public int getStageId() { - return stageId; + public int getMismatchTurnCount() { + return mismatchTurnCount; } /** - * optional uint32 stage_id = 15; - * @param value the stageId to set + * optional uint32 mismatch_turn_count = 15; + * @param value the mismatchTurnCount to set * @return this */ - public PVEBattleResultScRsp setStageId(final int value) { + public PVEBattleResultScRsp setMismatchTurnCount(final int value) { bitField0_ |= 0x00000010; - stageId = value; + mismatchTurnCount = value; return this; } /** - * optional .BattleEndStatus end_status = 5; + * optional .BattleEndStatus end_status = 7; * @return whether the endStatus field is set */ public boolean hasEndStatus() { @@ -294,7 +294,7 @@ public boolean hasEndStatus() { } /** - * optional .BattleEndStatus end_status = 5; + * optional .BattleEndStatus end_status = 7; * @return this */ public PVEBattleResultScRsp clearEndStatus() { @@ -304,7 +304,7 @@ public PVEBattleResultScRsp clearEndStatus() { } /** - * optional .BattleEndStatus end_status = 5; + * optional .BattleEndStatus end_status = 7; * @return the endStatus */ public BattleEndStatusOuterClass.BattleEndStatus getEndStatus() { @@ -337,7 +337,7 @@ public PVEBattleResultScRsp setEndStatusValue(final int value) { } /** - * optional .BattleEndStatus end_status = 5; + * optional .BattleEndStatus end_status = 7; * @param value the endStatus to set * @return this */ @@ -349,7 +349,7 @@ public PVEBattleResultScRsp setEndStatus( } /** - * optional bool check_identical = 1; + * optional bool check_identical = 12; * @return whether the checkIdentical field is set */ public boolean hasCheckIdentical() { @@ -357,7 +357,7 @@ public boolean hasCheckIdentical() { } /** - * optional bool check_identical = 1; + * optional bool check_identical = 12; * @return this */ public PVEBattleResultScRsp clearCheckIdentical() { @@ -367,7 +367,7 @@ public PVEBattleResultScRsp clearCheckIdentical() { } /** - * optional bool check_identical = 1; + * optional bool check_identical = 12; * @return the checkIdentical */ public boolean getCheckIdentical() { @@ -375,7 +375,7 @@ public boolean getCheckIdentical() { } /** - * optional bool check_identical = 1; + * optional bool check_identical = 12; * @param value the checkIdentical to set * @return this */ @@ -386,7 +386,7 @@ public PVEBattleResultScRsp setCheckIdentical(final boolean value) { } /** - * optional .ItemList drop_data = 8; + * optional .ItemList drop_data = 2; * @return whether the dropData field is set */ public boolean hasDropData() { @@ -394,7 +394,7 @@ public boolean hasDropData() { } /** - * optional .ItemList drop_data = 8; + * optional .ItemList drop_data = 2; * @return this */ public PVEBattleResultScRsp clearDropData() { @@ -404,7 +404,7 @@ public PVEBattleResultScRsp clearDropData() { } /** - * optional .ItemList drop_data = 8; + * optional .ItemList drop_data = 2; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -418,7 +418,7 @@ public ItemListOuterClass.ItemList getDropData() { } /** - * optional .ItemList drop_data = 8; + * optional .ItemList drop_data = 2; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -432,7 +432,7 @@ public ItemListOuterClass.ItemList getMutableDropData() { } /** - * optional .ItemList drop_data = 8; + * optional .ItemList drop_data = 2; * @param value the dropData to set * @return this */ @@ -500,7 +500,7 @@ public PVEBattleResultScRsp setUnk1(final ItemListOuterClass.ItemList value) { } /** - * optional .ItemList unk2 = 14; + * optional .ItemList unk2 = 13; * @return whether the unk2 field is set */ public boolean hasUnk2() { @@ -508,7 +508,7 @@ public boolean hasUnk2() { } /** - * optional .ItemList unk2 = 14; + * optional .ItemList unk2 = 13; * @return this */ public PVEBattleResultScRsp clearUnk2() { @@ -518,7 +518,7 @@ public PVEBattleResultScRsp clearUnk2() { } /** - * optional .ItemList unk2 = 14; + * optional .ItemList unk2 = 13; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -532,7 +532,7 @@ public ItemListOuterClass.ItemList getUnk2() { } /** - * optional .ItemList unk2 = 14; + * optional .ItemList unk2 = 13; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -546,7 +546,7 @@ public ItemListOuterClass.ItemList getMutableUnk2() { } /** - * optional .ItemList unk2 = 14; + * optional .ItemList unk2 = 13; * @param value the unk2 to set * @return this */ @@ -557,7 +557,7 @@ public PVEBattleResultScRsp setUnk2(final ItemListOuterClass.ItemList value) { } /** - * optional .ItemList unk3 = 743; + * optional .ItemList unk3 = 524; * @return whether the unk3 field is set */ public boolean hasUnk3() { @@ -565,7 +565,7 @@ public boolean hasUnk3() { } /** - * optional .ItemList unk3 = 743; + * optional .ItemList unk3 = 524; * @return this */ public PVEBattleResultScRsp clearUnk3() { @@ -575,7 +575,7 @@ public PVEBattleResultScRsp clearUnk3() { } /** - * optional .ItemList unk3 = 743; + * optional .ItemList unk3 = 524; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -589,7 +589,7 @@ public ItemListOuterClass.ItemList getUnk3() { } /** - * optional .ItemList unk3 = 743; + * optional .ItemList unk3 = 524; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -603,7 +603,7 @@ public ItemListOuterClass.ItemList getMutableUnk3() { } /** - * optional .ItemList unk3 = 743; + * optional .ItemList unk3 = 524; * @param value the unk3 to set * @return this */ @@ -614,137 +614,137 @@ public PVEBattleResultScRsp setUnk3(final ItemListOuterClass.ItemList value) { } /** - * optional string bin_version = 11; - * @return whether the binVersion field is set + * optional string res_version = 3; + * @return whether the resVersion field is set */ - public boolean hasBinVersion() { + public boolean hasResVersion() { return (bitField0_ & 0x00000800) != 0; } /** - * optional string bin_version = 11; + * optional string res_version = 3; * @return this */ - public PVEBattleResultScRsp clearBinVersion() { + public PVEBattleResultScRsp clearResVersion() { bitField0_ &= ~0x00000800; - binVersion.clear(); + resVersion.clear(); return this; } /** - * optional string bin_version = 11; - * @return the binVersion + * optional string res_version = 3; + * @return the resVersion */ - public String getBinVersion() { - return binVersion.getString(); + public String getResVersion() { + return resVersion.getString(); } /** - * optional string bin_version = 11; - * @return internal {@code Utf8String} representation of binVersion for reading + * optional string res_version = 3; + * @return internal {@code Utf8String} representation of resVersion for reading */ - public Utf8String getBinVersionBytes() { - return this.binVersion; + public Utf8String getResVersionBytes() { + return this.resVersion; } /** - * optional string bin_version = 11; - * @return internal {@code Utf8String} representation of binVersion for modifications + * optional string res_version = 3; + * @return internal {@code Utf8String} representation of resVersion for modifications */ - public Utf8String getMutableBinVersionBytes() { + public Utf8String getMutableResVersionBytes() { bitField0_ |= 0x00000800; - return this.binVersion; + return this.resVersion; } /** - * optional string bin_version = 11; - * @param value the binVersion to set + * optional string res_version = 3; + * @param value the resVersion to set * @return this */ - public PVEBattleResultScRsp setBinVersion(final CharSequence value) { + public PVEBattleResultScRsp setResVersion(final CharSequence value) { bitField0_ |= 0x00000800; - binVersion.copyFrom(value); + resVersion.copyFrom(value); return this; } /** - * optional string bin_version = 11; - * @param value the binVersion to set + * optional string res_version = 3; + * @param value the resVersion to set * @return this */ - public PVEBattleResultScRsp setBinVersion(final Utf8String value) { + public PVEBattleResultScRsp setResVersion(final Utf8String value) { bitField0_ |= 0x00000800; - binVersion.copyFrom(value); + resVersion.copyFrom(value); return this; } /** - * optional string res_version = 13; - * @return whether the resVersion field is set + * optional string bin_version = 14; + * @return whether the binVersion field is set */ - public boolean hasResVersion() { + public boolean hasBinVersion() { return (bitField0_ & 0x00001000) != 0; } /** - * optional string res_version = 13; + * optional string bin_version = 14; * @return this */ - public PVEBattleResultScRsp clearResVersion() { + public PVEBattleResultScRsp clearBinVersion() { bitField0_ &= ~0x00001000; - resVersion.clear(); + binVersion.clear(); return this; } /** - * optional string res_version = 13; - * @return the resVersion + * optional string bin_version = 14; + * @return the binVersion */ - public String getResVersion() { - return resVersion.getString(); + public String getBinVersion() { + return binVersion.getString(); } /** - * optional string res_version = 13; - * @return internal {@code Utf8String} representation of resVersion for reading + * optional string bin_version = 14; + * @return internal {@code Utf8String} representation of binVersion for reading */ - public Utf8String getResVersionBytes() { - return this.resVersion; + public Utf8String getBinVersionBytes() { + return this.binVersion; } /** - * optional string res_version = 13; - * @return internal {@code Utf8String} representation of resVersion for modifications + * optional string bin_version = 14; + * @return internal {@code Utf8String} representation of binVersion for modifications */ - public Utf8String getMutableResVersionBytes() { + public Utf8String getMutableBinVersionBytes() { bitField0_ |= 0x00001000; - return this.resVersion; + return this.binVersion; } /** - * optional string res_version = 13; - * @param value the resVersion to set + * optional string bin_version = 14; + * @param value the binVersion to set * @return this */ - public PVEBattleResultScRsp setResVersion(final CharSequence value) { + public PVEBattleResultScRsp setBinVersion(final CharSequence value) { bitField0_ |= 0x00001000; - resVersion.copyFrom(value); + binVersion.copyFrom(value); return this; } /** - * optional string res_version = 13; - * @param value the resVersion to set + * optional string bin_version = 14; + * @param value the binVersion to set * @return this */ - public PVEBattleResultScRsp setResVersion(final Utf8String value) { + public PVEBattleResultScRsp setBinVersion(final Utf8String value) { bitField0_ |= 0x00001000; - resVersion.copyFrom(value); + binVersion.copyFrom(value); return this; } /** - * repeated .BattleAvatar battle_avatar_list = 4; + * repeated .BattleAvatar battle_avatar_list = 8; * @return whether the battleAvatarList field is set */ public boolean hasBattleAvatarList() { @@ -752,7 +752,7 @@ public boolean hasBattleAvatarList() { } /** - * repeated .BattleAvatar battle_avatar_list = 4; + * repeated .BattleAvatar battle_avatar_list = 8; * @return this */ public PVEBattleResultScRsp clearBattleAvatarList() { @@ -762,7 +762,7 @@ public PVEBattleResultScRsp clearBattleAvatarList() { } /** - * repeated .BattleAvatar battle_avatar_list = 4; + * repeated .BattleAvatar battle_avatar_list = 8; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -776,7 +776,7 @@ public RepeatedMessage getBattleAvatarList( } /** - * repeated .BattleAvatar battle_avatar_list = 4; + * repeated .BattleAvatar battle_avatar_list = 8; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -790,7 +790,7 @@ public RepeatedMessage getMutableBattleAvat } /** - * repeated .BattleAvatar battle_avatar_list = 4; + * repeated .BattleAvatar battle_avatar_list = 8; * @param value the battleAvatarList to add * @return this */ @@ -802,7 +802,7 @@ public PVEBattleResultScRsp addBattleAvatarList( } /** - * repeated .BattleAvatar battle_avatar_list = 4; + * repeated .BattleAvatar battle_avatar_list = 8; * @param values the battleAvatarList to add * @return this */ @@ -818,19 +818,19 @@ public PVEBattleResultScRsp copyFrom(final PVEBattleResultScRsp other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - mismatchTurnCount = other.mismatchTurnCount; + stageId = other.stageId; + eventId = other.eventId; retcode = other.retcode; battleId = other.battleId; - eventId = other.eventId; - stageId = other.stageId; + mismatchTurnCount = other.mismatchTurnCount; endStatus = other.endStatus; checkIdentical = other.checkIdentical; dropData.copyFrom(other.dropData); unk1.copyFrom(other.unk1); unk2.copyFrom(other.unk2); unk3.copyFrom(other.unk3); - binVersion.copyFrom(other.binVersion); resVersion.copyFrom(other.resVersion); + binVersion.copyFrom(other.binVersion); battleAvatarList.copyFrom(other.battleAvatarList); } return this; @@ -842,8 +842,11 @@ public PVEBattleResultScRsp mergeFrom(final PVEBattleResultScRsp other) { return this; } cachedSize = -1; - if (other.hasMismatchTurnCount()) { - setMismatchTurnCount(other.mismatchTurnCount); + if (other.hasStageId()) { + setStageId(other.stageId); + } + if (other.hasEventId()) { + setEventId(other.eventId); } if (other.hasRetcode()) { setRetcode(other.retcode); @@ -851,11 +854,8 @@ public PVEBattleResultScRsp mergeFrom(final PVEBattleResultScRsp other) { if (other.hasBattleId()) { setBattleId(other.battleId); } - if (other.hasEventId()) { - setEventId(other.eventId); - } - if (other.hasStageId()) { - setStageId(other.stageId); + if (other.hasMismatchTurnCount()) { + setMismatchTurnCount(other.mismatchTurnCount); } if (other.hasEndStatus()) { setEndStatusValue(other.endStatus); @@ -875,12 +875,12 @@ public PVEBattleResultScRsp mergeFrom(final PVEBattleResultScRsp other) { if (other.hasUnk3()) { getMutableUnk3().mergeFrom(other.unk3); } - if (other.hasBinVersion()) { - getMutableBinVersionBytes().copyFrom(other.binVersion); - } if (other.hasResVersion()) { getMutableResVersionBytes().copyFrom(other.resVersion); } + if (other.hasBinVersion()) { + getMutableBinVersionBytes().copyFrom(other.binVersion); + } if (other.hasBattleAvatarList()) { getMutableBattleAvatarList().addAll(other.battleAvatarList); } @@ -894,19 +894,19 @@ public PVEBattleResultScRsp clear() { } cachedSize = -1; bitField0_ = 0; - mismatchTurnCount = 0; + stageId = 0; + eventId = 0; retcode = 0; battleId = 0; - eventId = 0; - stageId = 0; + mismatchTurnCount = 0; endStatus = 0; checkIdentical = false; dropData.clear(); unk1.clear(); unk2.clear(); unk3.clear(); - binVersion.clear(); resVersion.clear(); + binVersion.clear(); battleAvatarList.clear(); return this; } @@ -922,8 +922,8 @@ public PVEBattleResultScRsp clearQuick() { unk1.clearQuick(); unk2.clearQuick(); unk3.clearQuick(); - binVersion.clear(); resVersion.clear(); + binVersion.clear(); battleAvatarList.clearQuick(); return this; } @@ -938,54 +938,54 @@ public boolean equals(Object o) { } PVEBattleResultScRsp other = (PVEBattleResultScRsp) o; return bitField0_ == other.bitField0_ - && (!hasMismatchTurnCount() || mismatchTurnCount == other.mismatchTurnCount) + && (!hasStageId() || stageId == other.stageId) + && (!hasEventId() || eventId == other.eventId) && (!hasRetcode() || retcode == other.retcode) && (!hasBattleId() || battleId == other.battleId) - && (!hasEventId() || eventId == other.eventId) - && (!hasStageId() || stageId == other.stageId) + && (!hasMismatchTurnCount() || mismatchTurnCount == other.mismatchTurnCount) && (!hasEndStatus() || endStatus == other.endStatus) && (!hasCheckIdentical() || checkIdentical == other.checkIdentical) && (!hasDropData() || dropData.equals(other.dropData)) && (!hasUnk1() || unk1.equals(other.unk1)) && (!hasUnk2() || unk2.equals(other.unk2)) && (!hasUnk3() || unk3.equals(other.unk3)) - && (!hasBinVersion() || binVersion.equals(other.binVersion)) && (!hasResVersion() || resVersion.equals(other.resVersion)) + && (!hasBinVersion() || binVersion.equals(other.binVersion)) && (!hasBattleAvatarList() || battleAvatarList.equals(other.battleAvatarList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); - output.writeUInt32NoTag(mismatchTurnCount); + output.writeRawByte((byte) 8); + output.writeUInt32NoTag(stageId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 24); - output.writeUInt32NoTag(retcode); + output.writeRawByte((byte) 32); + output.writeUInt32NoTag(eventId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 80); - output.writeUInt32NoTag(battleId); + output.writeRawByte((byte) 40); + output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 96); - output.writeUInt32NoTag(eventId); + output.writeRawByte((byte) 48); + output.writeUInt32NoTag(battleId); } if ((bitField0_ & 0x00000010) != 0) { output.writeRawByte((byte) 120); - output.writeUInt32NoTag(stageId); + output.writeUInt32NoTag(mismatchTurnCount); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 56); output.writeEnumNoTag(endStatus); } if ((bitField0_ & 0x00000040) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 96); output.writeBoolNoTag(checkIdentical); } if ((bitField0_ & 0x00000080) != 0) { - output.writeRawByte((byte) 66); + output.writeRawByte((byte) 18); output.writeMessageNoTag(dropData); } if ((bitField0_ & 0x00000100) != 0) { @@ -993,24 +993,24 @@ public void writeTo(final ProtoSink output) throws IOException { output.writeMessageNoTag(unk1); } if ((bitField0_ & 0x00000200) != 0) { - output.writeRawByte((byte) 114); + output.writeRawByte((byte) 106); output.writeMessageNoTag(unk2); } if ((bitField0_ & 0x00000400) != 0) { - output.writeRawLittleEndian16((short) 11962); + output.writeRawLittleEndian16((short) 8418); output.writeMessageNoTag(unk3); } if ((bitField0_ & 0x00000800) != 0) { - output.writeRawByte((byte) 90); - output.writeStringNoTag(binVersion); + output.writeRawByte((byte) 26); + output.writeStringNoTag(resVersion); } if ((bitField0_ & 0x00001000) != 0) { - output.writeRawByte((byte) 106); - output.writeStringNoTag(resVersion); + output.writeRawByte((byte) 114); + output.writeStringNoTag(binVersion); } if ((bitField0_ & 0x00002000) != 0) { for (int i = 0; i < battleAvatarList.length(); i++) { - output.writeRawByte((byte) 34); + output.writeRawByte((byte) 66); output.writeMessageNoTag(battleAvatarList.get(i)); } } @@ -1020,19 +1020,19 @@ public void writeTo(final ProtoSink output) throws IOException { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(mismatchTurnCount); + size += 1 + ProtoSink.computeUInt32SizeNoTag(stageId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(eventId); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(battleId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(eventId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(battleId); } if ((bitField0_ & 0x00000010) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(stageId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(mismatchTurnCount); } if ((bitField0_ & 0x00000020) != 0) { size += 1 + ProtoSink.computeEnumSizeNoTag(endStatus); @@ -1053,10 +1053,10 @@ protected int computeSerializedSize() { size += 2 + ProtoSink.computeMessageSizeNoTag(unk3); } if ((bitField0_ & 0x00000800) != 0) { - size += 1 + ProtoSink.computeStringSizeNoTag(binVersion); + size += 1 + ProtoSink.computeStringSizeNoTag(resVersion); } if ((bitField0_ & 0x00001000) != 0) { - size += 1 + ProtoSink.computeStringSizeNoTag(resVersion); + size += 1 + ProtoSink.computeStringSizeNoTag(binVersion); } if ((bitField0_ & 0x00002000) != 0) { size += (1 * battleAvatarList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(battleAvatarList); @@ -1071,36 +1071,36 @@ public PVEBattleResultScRsp mergeFrom(final ProtoSource input) throws IOExceptio int tag = input.readTag(); while (true) { switch (tag) { - case 16: { - // mismatchTurnCount - mismatchTurnCount = input.readUInt32(); + case 8: { + // stageId + stageId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 24) { + if (tag != 32) { break; } } - case 24: { - // retcode - retcode = input.readUInt32(); + case 32: { + // eventId + eventId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 80) { + if (tag != 40) { break; } } - case 80: { - // battleId - battleId = input.readUInt32(); + case 40: { + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 96) { + if (tag != 48) { break; } } - case 96: { - // eventId - eventId = input.readUInt32(); + case 48: { + // battleId + battleId = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); if (tag != 120) { @@ -1108,15 +1108,15 @@ public PVEBattleResultScRsp mergeFrom(final ProtoSource input) throws IOExceptio } } case 120: { - // stageId - stageId = input.readUInt32(); + // mismatchTurnCount + mismatchTurnCount = input.readUInt32(); bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 40) { + if (tag != 56) { break; } } - case 40: { + case 56: { // endStatus final int value = input.readInt32(); if (BattleEndStatusOuterClass.BattleEndStatus.forNumber(value) != null) { @@ -1124,20 +1124,20 @@ public PVEBattleResultScRsp mergeFrom(final ProtoSource input) throws IOExceptio bitField0_ |= 0x00000020; } tag = input.readTag(); - if (tag != 8) { + if (tag != 96) { break; } } - case 8: { + case 96: { // checkIdentical checkIdentical = input.readBool(); bitField0_ |= 0x00000040; tag = input.readTag(); - if (tag != 66) { + if (tag != 18) { break; } } - case 66: { + case 18: { // dropData input.readMessage(dropData); bitField0_ |= 0x00000080; @@ -1151,47 +1151,47 @@ public PVEBattleResultScRsp mergeFrom(final ProtoSource input) throws IOExceptio input.readMessage(unk1); bitField0_ |= 0x00000100; tag = input.readTag(); - if (tag != 114) { + if (tag != 106) { break; } } - case 114: { + case 106: { // unk2 input.readMessage(unk2); bitField0_ |= 0x00000200; tag = input.readTag(); - if (tag != 5946) { + if (tag != 4194) { break; } } - case 5946: { + case 4194: { // unk3 input.readMessage(unk3); bitField0_ |= 0x00000400; tag = input.readTag(); - if (tag != 90) { + if (tag != 26) { break; } } - case 90: { - // binVersion - input.readString(binVersion); + case 26: { + // resVersion + input.readString(resVersion); bitField0_ |= 0x00000800; tag = input.readTag(); - if (tag != 106) { + if (tag != 114) { break; } } - case 106: { - // resVersion - input.readString(resVersion); + case 114: { + // binVersion + input.readString(binVersion); bitField0_ |= 0x00001000; tag = input.readTag(); - if (tag != 34) { + if (tag != 66) { break; } } - case 34: { + case 66: { // battleAvatarList tag = input.readRepeatedMessage(battleAvatarList, tag); bitField0_ |= 0x00002000; @@ -1217,19 +1217,19 @@ public PVEBattleResultScRsp mergeFrom(final ProtoSource input) throws IOExceptio public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.mismatchTurnCount, mismatchTurnCount); + output.writeUInt32(FieldNames.stageId, stageId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.eventId, eventId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.battleId, battleId); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.eventId, eventId); + output.writeUInt32(FieldNames.battleId, battleId); } if ((bitField0_ & 0x00000010) != 0) { - output.writeUInt32(FieldNames.stageId, stageId); + output.writeUInt32(FieldNames.mismatchTurnCount, mismatchTurnCount); } if ((bitField0_ & 0x00000020) != 0) { output.writeEnum(FieldNames.endStatus, endStatus, BattleEndStatusOuterClass.BattleEndStatus.converter()); @@ -1250,10 +1250,10 @@ public void writeTo(final JsonSink output) throws IOException { output.writeMessage(FieldNames.unk3, unk3); } if ((bitField0_ & 0x00000800) != 0) { - output.writeString(FieldNames.binVersion, binVersion); + output.writeString(FieldNames.resVersion, resVersion); } if ((bitField0_ & 0x00001000) != 0) { - output.writeString(FieldNames.resVersion, resVersion); + output.writeString(FieldNames.binVersion, binVersion); } if ((bitField0_ & 0x00002000) != 0) { output.writeRepeatedMessage(FieldNames.battleAvatarList, battleAvatarList); @@ -1268,11 +1268,11 @@ public PVEBattleResultScRsp mergeFrom(final JsonSource input) throws IOException } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -2096079772: - case -1800906274: { - if (input.isAtField(FieldNames.mismatchTurnCount)) { + case -1897528135: + case 1306191356: { + if (input.isAtField(FieldNames.stageId)) { if (!input.trySkipNullValue()) { - mismatchTurnCount = input.readUInt32(); + stageId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -1280,10 +1280,11 @@ public PVEBattleResultScRsp mergeFrom(final JsonSource input) throws IOException } break; } - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case -1376502443: + case 278118624: { + if (input.isAtField(FieldNames.eventId)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + eventId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -1291,11 +1292,10 @@ public PVEBattleResultScRsp mergeFrom(final JsonSource input) throws IOException } break; } - case -1678308365: - case -487930366: { - if (input.isAtField(FieldNames.battleId)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - battleId = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -1303,11 +1303,11 @@ public PVEBattleResultScRsp mergeFrom(final JsonSource input) throws IOException } break; } - case -1376502443: - case 278118624: { - if (input.isAtField(FieldNames.eventId)) { + case -1678308365: + case -487930366: { + if (input.isAtField(FieldNames.battleId)) { if (!input.trySkipNullValue()) { - eventId = input.readUInt32(); + battleId = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -1315,11 +1315,11 @@ public PVEBattleResultScRsp mergeFrom(final JsonSource input) throws IOException } break; } - case -1897528135: - case 1306191356: { - if (input.isAtField(FieldNames.stageId)) { + case -2096079772: + case -1800906274: { + if (input.isAtField(FieldNames.mismatchTurnCount)) { if (!input.trySkipNullValue()) { - stageId = input.readUInt32(); + mismatchTurnCount = input.readUInt32(); bitField0_ |= 0x00000010; } } else { @@ -1401,11 +1401,11 @@ public PVEBattleResultScRsp mergeFrom(final JsonSource input) throws IOException } break; } - case 1864225233: - case -2003285600: { - if (input.isAtField(FieldNames.binVersion)) { + case 1778976792: + case -351019975: { + if (input.isAtField(FieldNames.resVersion)) { if (!input.trySkipNullValue()) { - input.readString(binVersion); + input.readString(resVersion); bitField0_ |= 0x00000800; } } else { @@ -1413,11 +1413,11 @@ public PVEBattleResultScRsp mergeFrom(final JsonSource input) throws IOException } break; } - case 1778976792: - case -351019975: { - if (input.isAtField(FieldNames.resVersion)) { + case 1864225233: + case -2003285600: { + if (input.isAtField(FieldNames.binVersion)) { if (!input.trySkipNullValue()) { - input.readString(resVersion); + input.readString(binVersion); bitField0_ |= 0x00001000; } } else { @@ -1490,15 +1490,15 @@ public PVEBattleResultScRsp create() { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName mismatchTurnCount = FieldName.forField("mismatchTurnCount", "mismatch_turn_count"); + static final FieldName stageId = FieldName.forField("stageId", "stage_id"); + + static final FieldName eventId = FieldName.forField("eventId", "event_id"); static final FieldName retcode = FieldName.forField("retcode"); static final FieldName battleId = FieldName.forField("battleId", "battle_id"); - static final FieldName eventId = FieldName.forField("eventId", "event_id"); - - static final FieldName stageId = FieldName.forField("stageId", "stage_id"); + static final FieldName mismatchTurnCount = FieldName.forField("mismatchTurnCount", "mismatch_turn_count"); static final FieldName endStatus = FieldName.forField("endStatus", "end_status"); @@ -1512,10 +1512,10 @@ static class FieldNames { static final FieldName unk3 = FieldName.forField("unk3"); - static final FieldName binVersion = FieldName.forField("binVersion", "bin_version"); - static final FieldName resVersion = FieldName.forField("resVersion", "res_version"); + static final FieldName binVersion = FieldName.forField("binVersion", "bin_version"); + static final FieldName battleAvatarList = FieldName.forField("battleAvatarList", "battle_avatar_list"); } } diff --git a/src/generated/main/emu/lunarcore/proto/PileItemOuterClass.java b/src/generated/main/emu/lunarcore/proto/PileItemOuterClass.java index 6e1322362..f3a609c69 100644 --- a/src/generated/main/emu/lunarcore/proto/PileItemOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/PileItemOuterClass.java @@ -19,12 +19,12 @@ public static final class PileItem extends ProtoMessage implements Clo private static final long serialVersionUID = 0L; /** - * optional uint32 item_id = 10; + * optional uint32 item_id = 4; */ private int itemId; /** - * optional uint32 item_num = 12; + * optional uint32 item_num = 14; */ private int itemNum; @@ -39,7 +39,7 @@ public static PileItem newInstance() { } /** - * optional uint32 item_id = 10; + * optional uint32 item_id = 4; * @return whether the itemId field is set */ public boolean hasItemId() { @@ -47,7 +47,7 @@ public boolean hasItemId() { } /** - * optional uint32 item_id = 10; + * optional uint32 item_id = 4; * @return this */ public PileItem clearItemId() { @@ -57,7 +57,7 @@ public PileItem clearItemId() { } /** - * optional uint32 item_id = 10; + * optional uint32 item_id = 4; * @return the itemId */ public int getItemId() { @@ -65,7 +65,7 @@ public int getItemId() { } /** - * optional uint32 item_id = 10; + * optional uint32 item_id = 4; * @param value the itemId to set * @return this */ @@ -76,7 +76,7 @@ public PileItem setItemId(final int value) { } /** - * optional uint32 item_num = 12; + * optional uint32 item_num = 14; * @return whether the itemNum field is set */ public boolean hasItemNum() { @@ -84,7 +84,7 @@ public boolean hasItemNum() { } /** - * optional uint32 item_num = 12; + * optional uint32 item_num = 14; * @return this */ public PileItem clearItemNum() { @@ -94,7 +94,7 @@ public PileItem clearItemNum() { } /** - * optional uint32 item_num = 12; + * optional uint32 item_num = 14; * @return the itemNum */ public int getItemNum() { @@ -102,7 +102,7 @@ public int getItemNum() { } /** - * optional uint32 item_num = 12; + * optional uint32 item_num = 14; * @param value the itemNum to set * @return this */ @@ -177,11 +177,11 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(itemId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(itemNum); } } @@ -205,16 +205,16 @@ public PileItem mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 80: { + case 32: { // itemId itemId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 96) { + if (tag != 112) { break; } } - case 96: { + case 112: { // itemNum itemNum = input.readUInt32(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/PlayBackGroundMusicCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/PlayBackGroundMusicCsReqOuterClass.java index e66278ac5..6f4a34203 100644 --- a/src/generated/main/emu/lunarcore/proto/PlayBackGroundMusicCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/PlayBackGroundMusicCsReqOuterClass.java @@ -19,7 +19,7 @@ public static final class PlayBackGroundMusicCsReq extends ProtoMessageoptional uint32 play_music_id = 9; + * optional uint32 play_music_id = 10; */ private int playMusicId; @@ -34,7 +34,7 @@ public static PlayBackGroundMusicCsReq newInstance() { } /** - * optional uint32 play_music_id = 9; + * optional uint32 play_music_id = 10; * @return whether the playMusicId field is set */ public boolean hasPlayMusicId() { @@ -42,7 +42,7 @@ public boolean hasPlayMusicId() { } /** - * optional uint32 play_music_id = 9; + * optional uint32 play_music_id = 10; * @return this */ public PlayBackGroundMusicCsReq clearPlayMusicId() { @@ -52,7 +52,7 @@ public PlayBackGroundMusicCsReq clearPlayMusicId() { } /** - * optional uint32 play_music_id = 9; + * optional uint32 play_music_id = 10; * @return the playMusicId */ public int getPlayMusicId() { @@ -60,7 +60,7 @@ public int getPlayMusicId() { } /** - * optional uint32 play_music_id = 9; + * optional uint32 play_music_id = 10; * @param value the playMusicId to set * @return this */ @@ -129,7 +129,7 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(playMusicId); } } @@ -150,7 +150,7 @@ public PlayBackGroundMusicCsReq mergeFrom(final ProtoSource input) throws IOExce int tag = input.readTag(); while (true) { switch (tag) { - case 72: { + case 80: { // playMusicId playMusicId = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/PlayBackGroundMusicScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/PlayBackGroundMusicScRspOuterClass.java index be2ca25ce..39a93095b 100644 --- a/src/generated/main/emu/lunarcore/proto/PlayBackGroundMusicScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/PlayBackGroundMusicScRspOuterClass.java @@ -19,17 +19,17 @@ public static final class PlayBackGroundMusicScRsp extends ProtoMessageoptional uint32 playing_id = 6; + * optional uint32 playing_id = 4; */ private int playingId; /** - * optional uint32 play_music_id = 9; + * optional uint32 play_music_id = 6; */ private int playMusicId; /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 15; */ private int retcode; @@ -44,7 +44,7 @@ public static PlayBackGroundMusicScRsp newInstance() { } /** - * optional uint32 playing_id = 6; + * optional uint32 playing_id = 4; * @return whether the playingId field is set */ public boolean hasPlayingId() { @@ -52,7 +52,7 @@ public boolean hasPlayingId() { } /** - * optional uint32 playing_id = 6; + * optional uint32 playing_id = 4; * @return this */ public PlayBackGroundMusicScRsp clearPlayingId() { @@ -62,7 +62,7 @@ public PlayBackGroundMusicScRsp clearPlayingId() { } /** - * optional uint32 playing_id = 6; + * optional uint32 playing_id = 4; * @return the playingId */ public int getPlayingId() { @@ -70,7 +70,7 @@ public int getPlayingId() { } /** - * optional uint32 playing_id = 6; + * optional uint32 playing_id = 4; * @param value the playingId to set * @return this */ @@ -81,7 +81,7 @@ public PlayBackGroundMusicScRsp setPlayingId(final int value) { } /** - * optional uint32 play_music_id = 9; + * optional uint32 play_music_id = 6; * @return whether the playMusicId field is set */ public boolean hasPlayMusicId() { @@ -89,7 +89,7 @@ public boolean hasPlayMusicId() { } /** - * optional uint32 play_music_id = 9; + * optional uint32 play_music_id = 6; * @return this */ public PlayBackGroundMusicScRsp clearPlayMusicId() { @@ -99,7 +99,7 @@ public PlayBackGroundMusicScRsp clearPlayMusicId() { } /** - * optional uint32 play_music_id = 9; + * optional uint32 play_music_id = 6; * @return the playMusicId */ public int getPlayMusicId() { @@ -107,7 +107,7 @@ public int getPlayMusicId() { } /** - * optional uint32 play_music_id = 9; + * optional uint32 play_music_id = 6; * @param value the playMusicId to set * @return this */ @@ -118,7 +118,7 @@ public PlayBackGroundMusicScRsp setPlayMusicId(final int value) { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 15; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -126,7 +126,7 @@ public boolean hasRetcode() { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 15; * @return this */ public PlayBackGroundMusicScRsp clearRetcode() { @@ -136,7 +136,7 @@ public PlayBackGroundMusicScRsp clearRetcode() { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 15; * @return the retcode */ public int getRetcode() { @@ -144,7 +144,7 @@ public int getRetcode() { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 15; * @param value the retcode to set * @return this */ @@ -225,15 +225,15 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(playingId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(playMusicId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(retcode); } } @@ -260,25 +260,25 @@ public PlayBackGroundMusicScRsp mergeFrom(final ProtoSource input) throws IOExce int tag = input.readTag(); while (true) { switch (tag) { - case 48: { + case 32: { // playingId playingId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 72) { + if (tag != 48) { break; } } - case 72: { + case 48: { // playMusicId playMusicId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 80) { + if (tag != 120) { break; } } - case 80: { + case 120: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/PlayerGetTokenCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/PlayerGetTokenCsReqOuterClass.java index 09d913743..4ece489ad 100644 --- a/src/generated/main/emu/lunarcore/proto/PlayerGetTokenCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/PlayerGetTokenCsReqOuterClass.java @@ -20,17 +20,17 @@ public static final class PlayerGetTokenCsReq extends ProtoMessageoptional uint32 platform_type = 11; + * optional uint32 platform_type = 7; */ private int platformType; /** - * optional string token = 4; + * optional string token = 11; */ private final Utf8String token = Utf8String.newEmptyInstance(); /** - * optional string account_uid = 7; + * optional string account_uid = 14; */ private final Utf8String accountUid = Utf8String.newEmptyInstance(); @@ -45,7 +45,7 @@ public static PlayerGetTokenCsReq newInstance() { } /** - * optional uint32 platform_type = 11; + * optional uint32 platform_type = 7; * @return whether the platformType field is set */ public boolean hasPlatformType() { @@ -53,7 +53,7 @@ public boolean hasPlatformType() { } /** - * optional uint32 platform_type = 11; + * optional uint32 platform_type = 7; * @return this */ public PlayerGetTokenCsReq clearPlatformType() { @@ -63,7 +63,7 @@ public PlayerGetTokenCsReq clearPlatformType() { } /** - * optional uint32 platform_type = 11; + * optional uint32 platform_type = 7; * @return the platformType */ public int getPlatformType() { @@ -71,7 +71,7 @@ public int getPlatformType() { } /** - * optional uint32 platform_type = 11; + * optional uint32 platform_type = 7; * @param value the platformType to set * @return this */ @@ -82,7 +82,7 @@ public PlayerGetTokenCsReq setPlatformType(final int value) { } /** - * optional string token = 4; + * optional string token = 11; * @return whether the token field is set */ public boolean hasToken() { @@ -90,7 +90,7 @@ public boolean hasToken() { } /** - * optional string token = 4; + * optional string token = 11; * @return this */ public PlayerGetTokenCsReq clearToken() { @@ -100,7 +100,7 @@ public PlayerGetTokenCsReq clearToken() { } /** - * optional string token = 4; + * optional string token = 11; * @return the token */ public String getToken() { @@ -108,7 +108,7 @@ public String getToken() { } /** - * optional string token = 4; + * optional string token = 11; * @return internal {@code Utf8String} representation of token for reading */ public Utf8String getTokenBytes() { @@ -116,7 +116,7 @@ public Utf8String getTokenBytes() { } /** - * optional string token = 4; + * optional string token = 11; * @return internal {@code Utf8String} representation of token for modifications */ public Utf8String getMutableTokenBytes() { @@ -125,7 +125,7 @@ public Utf8String getMutableTokenBytes() { } /** - * optional string token = 4; + * optional string token = 11; * @param value the token to set * @return this */ @@ -136,7 +136,7 @@ public PlayerGetTokenCsReq setToken(final CharSequence value) { } /** - * optional string token = 4; + * optional string token = 11; * @param value the token to set * @return this */ @@ -147,7 +147,7 @@ public PlayerGetTokenCsReq setToken(final Utf8String value) { } /** - * optional string account_uid = 7; + * optional string account_uid = 14; * @return whether the accountUid field is set */ public boolean hasAccountUid() { @@ -155,7 +155,7 @@ public boolean hasAccountUid() { } /** - * optional string account_uid = 7; + * optional string account_uid = 14; * @return this */ public PlayerGetTokenCsReq clearAccountUid() { @@ -165,7 +165,7 @@ public PlayerGetTokenCsReq clearAccountUid() { } /** - * optional string account_uid = 7; + * optional string account_uid = 14; * @return the accountUid */ public String getAccountUid() { @@ -173,7 +173,7 @@ public String getAccountUid() { } /** - * optional string account_uid = 7; + * optional string account_uid = 14; * @return internal {@code Utf8String} representation of accountUid for reading */ public Utf8String getAccountUidBytes() { @@ -181,7 +181,7 @@ public Utf8String getAccountUidBytes() { } /** - * optional string account_uid = 7; + * optional string account_uid = 14; * @return internal {@code Utf8String} representation of accountUid for modifications */ public Utf8String getMutableAccountUidBytes() { @@ -190,7 +190,7 @@ public Utf8String getMutableAccountUidBytes() { } /** - * optional string account_uid = 7; + * optional string account_uid = 14; * @param value the accountUid to set * @return this */ @@ -201,7 +201,7 @@ public PlayerGetTokenCsReq setAccountUid(final CharSequence value) { } /** - * optional string account_uid = 7; + * optional string account_uid = 14; * @param value the accountUid to set * @return this */ @@ -284,15 +284,15 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(platformType); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 34); + output.writeRawByte((byte) 90); output.writeStringNoTag(token); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 58); + output.writeRawByte((byte) 114); output.writeStringNoTag(accountUid); } } @@ -319,25 +319,25 @@ public PlayerGetTokenCsReq mergeFrom(final ProtoSource input) throws IOException int tag = input.readTag(); while (true) { switch (tag) { - case 88: { + case 56: { // platformType platformType = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 34) { + if (tag != 90) { break; } } - case 34: { + case 90: { // token input.readString(token); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 58) { + if (tag != 114) { break; } } - case 58: { + case 114: { // accountUid input.readString(accountUid); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/PlayerGetTokenScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/PlayerGetTokenScRspOuterClass.java index e20fb39a5..60262e47f 100644 --- a/src/generated/main/emu/lunarcore/proto/PlayerGetTokenScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/PlayerGetTokenScRspOuterClass.java @@ -20,27 +20,27 @@ public static final class PlayerGetTokenScRsp extends ProtoMessageoptional uint64 secret_key_seed = 11; + * optional uint64 secret_key_seed = 10; */ private long secretKeySeed; /** - * optional uint32 uid = 8; + * optional uint32 retcode = 1; */ - private int uid; + private int retcode; /** - * optional uint32 retcode = 13; + * optional uint32 uid = 3; */ - private int retcode; + private int uid; /** - * optional .BlackInfo black_info = 12; + * optional .BlackInfo black_info = 7; */ private final BlackInfoOuterClass.BlackInfo blackInfo = BlackInfoOuterClass.BlackInfo.newInstance(); /** - * optional string msg = 14; + * optional string msg = 8; */ private final Utf8String msg = Utf8String.newEmptyInstance(); @@ -55,7 +55,7 @@ public static PlayerGetTokenScRsp newInstance() { } /** - * optional uint64 secret_key_seed = 11; + * optional uint64 secret_key_seed = 10; * @return whether the secretKeySeed field is set */ public boolean hasSecretKeySeed() { @@ -63,7 +63,7 @@ public boolean hasSecretKeySeed() { } /** - * optional uint64 secret_key_seed = 11; + * optional uint64 secret_key_seed = 10; * @return this */ public PlayerGetTokenScRsp clearSecretKeySeed() { @@ -73,7 +73,7 @@ public PlayerGetTokenScRsp clearSecretKeySeed() { } /** - * optional uint64 secret_key_seed = 11; + * optional uint64 secret_key_seed = 10; * @return the secretKeySeed */ public long getSecretKeySeed() { @@ -81,7 +81,7 @@ public long getSecretKeySeed() { } /** - * optional uint64 secret_key_seed = 11; + * optional uint64 secret_key_seed = 10; * @param value the secretKeySeed to set * @return this */ @@ -92,81 +92,81 @@ public PlayerGetTokenScRsp setSecretKeySeed(final long value) { } /** - * optional uint32 uid = 8; - * @return whether the uid field is set + * optional uint32 retcode = 1; + * @return whether the retcode field is set */ - public boolean hasUid() { + public boolean hasRetcode() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 uid = 8; + * optional uint32 retcode = 1; * @return this */ - public PlayerGetTokenScRsp clearUid() { + public PlayerGetTokenScRsp clearRetcode() { bitField0_ &= ~0x00000002; - uid = 0; + retcode = 0; return this; } /** - * optional uint32 uid = 8; - * @return the uid + * optional uint32 retcode = 1; + * @return the retcode */ - public int getUid() { - return uid; + public int getRetcode() { + return retcode; } /** - * optional uint32 uid = 8; - * @param value the uid to set + * optional uint32 retcode = 1; + * @param value the retcode to set * @return this */ - public PlayerGetTokenScRsp setUid(final int value) { + public PlayerGetTokenScRsp setRetcode(final int value) { bitField0_ |= 0x00000002; - uid = value; + retcode = value; return this; } /** - * optional uint32 retcode = 13; - * @return whether the retcode field is set + * optional uint32 uid = 3; + * @return whether the uid field is set */ - public boolean hasRetcode() { + public boolean hasUid() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 retcode = 13; + * optional uint32 uid = 3; * @return this */ - public PlayerGetTokenScRsp clearRetcode() { + public PlayerGetTokenScRsp clearUid() { bitField0_ &= ~0x00000004; - retcode = 0; + uid = 0; return this; } /** - * optional uint32 retcode = 13; - * @return the retcode + * optional uint32 uid = 3; + * @return the uid */ - public int getRetcode() { - return retcode; + public int getUid() { + return uid; } /** - * optional uint32 retcode = 13; - * @param value the retcode to set + * optional uint32 uid = 3; + * @param value the uid to set * @return this */ - public PlayerGetTokenScRsp setRetcode(final int value) { + public PlayerGetTokenScRsp setUid(final int value) { bitField0_ |= 0x00000004; - retcode = value; + uid = value; return this; } /** - * optional .BlackInfo black_info = 12; + * optional .BlackInfo black_info = 7; * @return whether the blackInfo field is set */ public boolean hasBlackInfo() { @@ -174,7 +174,7 @@ public boolean hasBlackInfo() { } /** - * optional .BlackInfo black_info = 12; + * optional .BlackInfo black_info = 7; * @return this */ public PlayerGetTokenScRsp clearBlackInfo() { @@ -184,7 +184,7 @@ public PlayerGetTokenScRsp clearBlackInfo() { } /** - * optional .BlackInfo black_info = 12; + * optional .BlackInfo black_info = 7; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -198,7 +198,7 @@ public BlackInfoOuterClass.BlackInfo getBlackInfo() { } /** - * optional .BlackInfo black_info = 12; + * optional .BlackInfo black_info = 7; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -212,7 +212,7 @@ public BlackInfoOuterClass.BlackInfo getMutableBlackInfo() { } /** - * optional .BlackInfo black_info = 12; + * optional .BlackInfo black_info = 7; * @param value the blackInfo to set * @return this */ @@ -223,7 +223,7 @@ public PlayerGetTokenScRsp setBlackInfo(final BlackInfoOuterClass.BlackInfo valu } /** - * optional string msg = 14; + * optional string msg = 8; * @return whether the msg field is set */ public boolean hasMsg() { @@ -231,7 +231,7 @@ public boolean hasMsg() { } /** - * optional string msg = 14; + * optional string msg = 8; * @return this */ public PlayerGetTokenScRsp clearMsg() { @@ -241,7 +241,7 @@ public PlayerGetTokenScRsp clearMsg() { } /** - * optional string msg = 14; + * optional string msg = 8; * @return the msg */ public String getMsg() { @@ -249,7 +249,7 @@ public String getMsg() { } /** - * optional string msg = 14; + * optional string msg = 8; * @return internal {@code Utf8String} representation of msg for reading */ public Utf8String getMsgBytes() { @@ -257,7 +257,7 @@ public Utf8String getMsgBytes() { } /** - * optional string msg = 14; + * optional string msg = 8; * @return internal {@code Utf8String} representation of msg for modifications */ public Utf8String getMutableMsgBytes() { @@ -266,7 +266,7 @@ public Utf8String getMutableMsgBytes() { } /** - * optional string msg = 14; + * optional string msg = 8; * @param value the msg to set * @return this */ @@ -277,7 +277,7 @@ public PlayerGetTokenScRsp setMsg(final CharSequence value) { } /** - * optional string msg = 14; + * optional string msg = 8; * @param value the msg to set * @return this */ @@ -293,8 +293,8 @@ public PlayerGetTokenScRsp copyFrom(final PlayerGetTokenScRsp other) { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; secretKeySeed = other.secretKeySeed; - uid = other.uid; retcode = other.retcode; + uid = other.uid; blackInfo.copyFrom(other.blackInfo); msg.copyFrom(other.msg); } @@ -310,12 +310,12 @@ public PlayerGetTokenScRsp mergeFrom(final PlayerGetTokenScRsp other) { if (other.hasSecretKeySeed()) { setSecretKeySeed(other.secretKeySeed); } - if (other.hasUid()) { - setUid(other.uid); - } if (other.hasRetcode()) { setRetcode(other.retcode); } + if (other.hasUid()) { + setUid(other.uid); + } if (other.hasBlackInfo()) { getMutableBlackInfo().mergeFrom(other.blackInfo); } @@ -333,8 +333,8 @@ public PlayerGetTokenScRsp clear() { cachedSize = -1; bitField0_ = 0; secretKeySeed = 0L; - uid = 0; retcode = 0; + uid = 0; blackInfo.clear(); msg.clear(); return this; @@ -363,8 +363,8 @@ public boolean equals(Object o) { PlayerGetTokenScRsp other = (PlayerGetTokenScRsp) o; return bitField0_ == other.bitField0_ && (!hasSecretKeySeed() || secretKeySeed == other.secretKeySeed) - && (!hasUid() || uid == other.uid) && (!hasRetcode() || retcode == other.retcode) + && (!hasUid() || uid == other.uid) && (!hasBlackInfo() || blackInfo.equals(other.blackInfo)) && (!hasMsg() || msg.equals(other.msg)); } @@ -372,23 +372,23 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 80); output.writeUInt64NoTag(secretKeySeed); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 64); - output.writeUInt32NoTag(uid); + output.writeRawByte((byte) 8); + output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 104); - output.writeUInt32NoTag(retcode); + output.writeRawByte((byte) 24); + output.writeUInt32NoTag(uid); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 98); + output.writeRawByte((byte) 58); output.writeMessageNoTag(blackInfo); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 114); + output.writeRawByte((byte) 66); output.writeStringNoTag(msg); } } @@ -400,10 +400,10 @@ protected int computeSerializedSize() { size += 1 + ProtoSink.computeUInt64SizeNoTag(secretKeySeed); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(uid); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(uid); } if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(blackInfo); @@ -421,43 +421,43 @@ public PlayerGetTokenScRsp mergeFrom(final ProtoSource input) throws IOException int tag = input.readTag(); while (true) { switch (tag) { - case 88: { + case 80: { // secretKeySeed secretKeySeed = input.readUInt64(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 64) { + if (tag != 8) { break; } } - case 64: { - // uid - uid = input.readUInt32(); + case 8: { + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 104) { + if (tag != 24) { break; } } - case 104: { - // retcode - retcode = input.readUInt32(); + case 24: { + // uid + uid = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 98) { + if (tag != 58) { break; } } - case 98: { + case 58: { // blackInfo input.readMessage(blackInfo); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 114) { + if (tag != 66) { break; } } - case 114: { + case 66: { // msg input.readString(msg); bitField0_ |= 0x00000010; @@ -487,10 +487,10 @@ public void writeTo(final JsonSink output) throws IOException { output.writeUInt64(FieldNames.secretKeySeed, secretKeySeed); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.uid, uid); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.uid, uid); } if ((bitField0_ & 0x00000008) != 0) { output.writeMessage(FieldNames.blackInfo, blackInfo); @@ -520,10 +520,10 @@ public PlayerGetTokenScRsp mergeFrom(final JsonSource input) throws IOException } break; } - case 115792: { - if (input.isAtField(FieldNames.uid)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - uid = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -531,10 +531,10 @@ public PlayerGetTokenScRsp mergeFrom(final JsonSource input) throws IOException } break; } - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case 115792: { + if (input.isAtField(FieldNames.uid)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + uid = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -620,10 +620,10 @@ public PlayerGetTokenScRsp create() { static class FieldNames { static final FieldName secretKeySeed = FieldName.forField("secretKeySeed", "secret_key_seed"); - static final FieldName uid = FieldName.forField("uid"); - static final FieldName retcode = FieldName.forField("retcode"); + static final FieldName uid = FieldName.forField("uid"); + static final FieldName blackInfo = FieldName.forField("blackInfo", "black_info"); static final FieldName msg = FieldName.forField("msg"); diff --git a/src/generated/main/emu/lunarcore/proto/PlayerHeartbeatCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/PlayerHeartbeatCsReqOuterClass.java index 4fb83370c..d150009ff 100644 --- a/src/generated/main/emu/lunarcore/proto/PlayerHeartbeatCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/PlayerHeartbeatCsReqOuterClass.java @@ -19,7 +19,7 @@ public static final class PlayerHeartbeatCsReq extends ProtoMessageoptional uint64 client_time_ms = 12; + * optional uint64 client_time_ms = 4; */ private long clientTimeMs; @@ -34,7 +34,7 @@ public static PlayerHeartbeatCsReq newInstance() { } /** - * optional uint64 client_time_ms = 12; + * optional uint64 client_time_ms = 4; * @return whether the clientTimeMs field is set */ public boolean hasClientTimeMs() { @@ -42,7 +42,7 @@ public boolean hasClientTimeMs() { } /** - * optional uint64 client_time_ms = 12; + * optional uint64 client_time_ms = 4; * @return this */ public PlayerHeartbeatCsReq clearClientTimeMs() { @@ -52,7 +52,7 @@ public PlayerHeartbeatCsReq clearClientTimeMs() { } /** - * optional uint64 client_time_ms = 12; + * optional uint64 client_time_ms = 4; * @return the clientTimeMs */ public long getClientTimeMs() { @@ -60,7 +60,7 @@ public long getClientTimeMs() { } /** - * optional uint64 client_time_ms = 12; + * optional uint64 client_time_ms = 4; * @param value the clientTimeMs to set * @return this */ @@ -129,7 +129,7 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 32); output.writeUInt64NoTag(clientTimeMs); } } @@ -150,7 +150,7 @@ public PlayerHeartbeatCsReq mergeFrom(final ProtoSource input) throws IOExceptio int tag = input.readTag(); while (true) { switch (tag) { - case 96: { + case 32: { // clientTimeMs clientTimeMs = input.readUInt64(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/PlayerHeartbeatScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/PlayerHeartbeatScRspOuterClass.java index 5243c70d7..1d1707f55 100644 --- a/src/generated/main/emu/lunarcore/proto/PlayerHeartbeatScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/PlayerHeartbeatScRspOuterClass.java @@ -19,21 +19,17 @@ public static final class PlayerHeartbeatScRsp extends ProtoMessage - * ClientDownloadData download_data = 13; - * - * - * optional uint64 server_time_ms = 6; + * optional uint64 server_time_ms = 11; */ private long serverTimeMs; /** - * optional uint64 client_time_ms = 8; + * optional uint64 client_time_ms = 13; */ private long clientTimeMs; /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 1; */ private int retcode; @@ -48,11 +44,7 @@ public static PlayerHeartbeatScRsp newInstance() { } /** - * 
-     * ClientDownloadData download_data = 13;
-     *
- * - * optional uint64 server_time_ms = 6; + * optional uint64 server_time_ms = 11; * @return whether the serverTimeMs field is set */ public boolean hasServerTimeMs() { @@ -60,11 +52,7 @@ public boolean hasServerTimeMs() { } /** - * 
-     * ClientDownloadData download_data = 13;
-     *
- * - * optional uint64 server_time_ms = 6; + * optional uint64 server_time_ms = 11; * @return this */ public PlayerHeartbeatScRsp clearServerTimeMs() { @@ -74,11 +62,7 @@ public PlayerHeartbeatScRsp clearServerTimeMs() { } /** - * 
-     * ClientDownloadData download_data = 13;
-     *
- * - * optional uint64 server_time_ms = 6; + * optional uint64 server_time_ms = 11; * @return the serverTimeMs */ public long getServerTimeMs() { @@ -86,11 +70,7 @@ public long getServerTimeMs() { } /** - * 
-     * ClientDownloadData download_data = 13;
-     *
- * - * optional uint64 server_time_ms = 6; + * optional uint64 server_time_ms = 11; * @param value the serverTimeMs to set * @return this */ @@ -101,7 +81,7 @@ public PlayerHeartbeatScRsp setServerTimeMs(final long value) { } /** - * optional uint64 client_time_ms = 8; + * optional uint64 client_time_ms = 13; * @return whether the clientTimeMs field is set */ public boolean hasClientTimeMs() { @@ -109,7 +89,7 @@ public boolean hasClientTimeMs() { } /** - * optional uint64 client_time_ms = 8; + * optional uint64 client_time_ms = 13; * @return this */ public PlayerHeartbeatScRsp clearClientTimeMs() { @@ -119,7 +99,7 @@ public PlayerHeartbeatScRsp clearClientTimeMs() { } /** - * optional uint64 client_time_ms = 8; + * optional uint64 client_time_ms = 13; * @return the clientTimeMs */ public long getClientTimeMs() { @@ -127,7 +107,7 @@ public long getClientTimeMs() { } /** - * optional uint64 client_time_ms = 8; + * optional uint64 client_time_ms = 13; * @param value the clientTimeMs to set * @return this */ @@ -138,7 +118,7 @@ public PlayerHeartbeatScRsp setClientTimeMs(final long value) { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 1; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -146,7 +126,7 @@ public boolean hasRetcode() { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 1; * @return this */ public PlayerHeartbeatScRsp clearRetcode() { @@ -156,7 +136,7 @@ public PlayerHeartbeatScRsp clearRetcode() { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 1; * @return the retcode */ public int getRetcode() { @@ -164,7 +144,7 @@ public int getRetcode() { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 1; * @param value the retcode to set * @return this */ @@ -245,15 +225,15 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 88); output.writeUInt64NoTag(serverTimeMs); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 104); output.writeUInt64NoTag(clientTimeMs); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(retcode); } } @@ -280,25 +260,25 @@ public PlayerHeartbeatScRsp mergeFrom(final ProtoSource input) throws IOExceptio int tag = input.readTag(); while (true) { switch (tag) { - case 48: { + case 88: { // serverTimeMs serverTimeMs = input.readUInt64(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 64) { + if (tag != 104) { break; } } - case 64: { + case 104: { // clientTimeMs clientTimeMs = input.readUInt64(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 32) { + if (tag != 8) { break; } } - case 32: { + case 8: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/PlayerLoginScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/PlayerLoginScRspOuterClass.java index 589f9ee08..09ab536a9 100644 --- a/src/generated/main/emu/lunarcore/proto/PlayerLoginScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/PlayerLoginScRspOuterClass.java @@ -19,32 +19,32 @@ public static final class PlayerLoginScRsp extends ProtoMessageoptional uint64 server_timestamp_ms = 8; + * optional uint64 server_timestamp_ms = 4; */ private long serverTimestampMs; /** - * optional uint64 login_random = 14; + * optional uint64 login_random = 13; */ private long loginRandom; /** - * optional uint32 stamina = 7; + * optional uint32 retcode = 2; */ - private int stamina; + private int retcode; /** - * optional uint32 retcode = 13; + * optional uint32 stamina = 15; */ - private int retcode; + private int stamina; /** - * optional sint32 cur_timezone = 1; + * optional sint32 cur_timezone = 7; */ private int curTimezone; /** - * optional .PlayerBasicInfo basic_info = 11; + * optional .PlayerBasicInfo basic_info = 6; */ private final PlayerBasicInfoOuterClass.PlayerBasicInfo basicInfo = PlayerBasicInfoOuterClass.PlayerBasicInfo.newInstance(); @@ -59,7 +59,7 @@ public static PlayerLoginScRsp newInstance() { } /** - * optional uint64 server_timestamp_ms = 8; + * optional uint64 server_timestamp_ms = 4; * @return whether the serverTimestampMs field is set */ public boolean hasServerTimestampMs() { @@ -67,7 +67,7 @@ public boolean hasServerTimestampMs() { } /** - * optional uint64 server_timestamp_ms = 8; + * optional uint64 server_timestamp_ms = 4; * @return this */ public PlayerLoginScRsp clearServerTimestampMs() { @@ -77,7 +77,7 @@ public PlayerLoginScRsp clearServerTimestampMs() { } /** - * optional uint64 server_timestamp_ms = 8; + * optional uint64 server_timestamp_ms = 4; * @return the serverTimestampMs */ public long getServerTimestampMs() { @@ -85,7 +85,7 @@ public long getServerTimestampMs() { } /** - * optional uint64 server_timestamp_ms = 8; + * optional uint64 server_timestamp_ms = 4; * @param value the serverTimestampMs to set * @return this */ @@ -96,7 +96,7 @@ public PlayerLoginScRsp setServerTimestampMs(final long value) { } /** - * optional uint64 login_random = 14; + * optional uint64 login_random = 13; * @return whether the loginRandom field is set */ public boolean hasLoginRandom() { @@ -104,7 +104,7 @@ public boolean hasLoginRandom() { } /** - * optional uint64 login_random = 14; + * optional uint64 login_random = 13; * @return this */ public PlayerLoginScRsp clearLoginRandom() { @@ -114,7 +114,7 @@ public PlayerLoginScRsp clearLoginRandom() { } /** - * optional uint64 login_random = 14; + * optional uint64 login_random = 13; * @return the loginRandom */ public long getLoginRandom() { @@ -122,7 +122,7 @@ public long getLoginRandom() { } /** - * optional uint64 login_random = 14; + * optional uint64 login_random = 13; * @param value the loginRandom to set * @return this */ @@ -133,81 +133,81 @@ public PlayerLoginScRsp setLoginRandom(final long value) { } /** - * optional uint32 stamina = 7; - * @return whether the stamina field is set + * optional uint32 retcode = 2; + * @return whether the retcode field is set */ - public boolean hasStamina() { + public boolean hasRetcode() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 stamina = 7; + * optional uint32 retcode = 2; * @return this */ - public PlayerLoginScRsp clearStamina() { + public PlayerLoginScRsp clearRetcode() { bitField0_ &= ~0x00000004; - stamina = 0; + retcode = 0; return this; } /** - * optional uint32 stamina = 7; - * @return the stamina + * optional uint32 retcode = 2; + * @return the retcode */ - public int getStamina() { - return stamina; + public int getRetcode() { + return retcode; } /** - * optional uint32 stamina = 7; - * @param value the stamina to set + * optional uint32 retcode = 2; + * @param value the retcode to set * @return this */ - public PlayerLoginScRsp setStamina(final int value) { + public PlayerLoginScRsp setRetcode(final int value) { bitField0_ |= 0x00000004; - stamina = value; + retcode = value; return this; } /** - * optional uint32 retcode = 13; - * @return whether the retcode field is set + * optional uint32 stamina = 15; + * @return whether the stamina field is set */ - public boolean hasRetcode() { + public boolean hasStamina() { return (bitField0_ & 0x00000008) != 0; } /** - * optional uint32 retcode = 13; + * optional uint32 stamina = 15; * @return this */ - public PlayerLoginScRsp clearRetcode() { + public PlayerLoginScRsp clearStamina() { bitField0_ &= ~0x00000008; - retcode = 0; + stamina = 0; return this; } /** - * optional uint32 retcode = 13; - * @return the retcode + * optional uint32 stamina = 15; + * @return the stamina */ - public int getRetcode() { - return retcode; + public int getStamina() { + return stamina; } /** - * optional uint32 retcode = 13; - * @param value the retcode to set + * optional uint32 stamina = 15; + * @param value the stamina to set * @return this */ - public PlayerLoginScRsp setRetcode(final int value) { + public PlayerLoginScRsp setStamina(final int value) { bitField0_ |= 0x00000008; - retcode = value; + stamina = value; return this; } /** - * optional sint32 cur_timezone = 1; + * optional sint32 cur_timezone = 7; * @return whether the curTimezone field is set */ public boolean hasCurTimezone() { @@ -215,7 +215,7 @@ public boolean hasCurTimezone() { } /** - * optional sint32 cur_timezone = 1; + * optional sint32 cur_timezone = 7; * @return this */ public PlayerLoginScRsp clearCurTimezone() { @@ -225,7 +225,7 @@ public PlayerLoginScRsp clearCurTimezone() { } /** - * optional sint32 cur_timezone = 1; + * optional sint32 cur_timezone = 7; * @return the curTimezone */ public int getCurTimezone() { @@ -233,7 +233,7 @@ public int getCurTimezone() { } /** - * optional sint32 cur_timezone = 1; + * optional sint32 cur_timezone = 7; * @param value the curTimezone to set * @return this */ @@ -244,7 +244,7 @@ public PlayerLoginScRsp setCurTimezone(final int value) { } /** - * optional .PlayerBasicInfo basic_info = 11; + * optional .PlayerBasicInfo basic_info = 6; * @return whether the basicInfo field is set */ public boolean hasBasicInfo() { @@ -252,7 +252,7 @@ public boolean hasBasicInfo() { } /** - * optional .PlayerBasicInfo basic_info = 11; + * optional .PlayerBasicInfo basic_info = 6; * @return this */ public PlayerLoginScRsp clearBasicInfo() { @@ -262,7 +262,7 @@ public PlayerLoginScRsp clearBasicInfo() { } /** - * optional .PlayerBasicInfo basic_info = 11; + * optional .PlayerBasicInfo basic_info = 6; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -276,7 +276,7 @@ public PlayerBasicInfoOuterClass.PlayerBasicInfo getBasicInfo() { } /** - * optional .PlayerBasicInfo basic_info = 11; + * optional .PlayerBasicInfo basic_info = 6; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -290,7 +290,7 @@ public PlayerBasicInfoOuterClass.PlayerBasicInfo getMutableBasicInfo() { } /** - * optional .PlayerBasicInfo basic_info = 11; + * optional .PlayerBasicInfo basic_info = 6; * @param value the basicInfo to set * @return this */ @@ -307,8 +307,8 @@ public PlayerLoginScRsp copyFrom(final PlayerLoginScRsp other) { bitField0_ = other.bitField0_; serverTimestampMs = other.serverTimestampMs; loginRandom = other.loginRandom; - stamina = other.stamina; retcode = other.retcode; + stamina = other.stamina; curTimezone = other.curTimezone; basicInfo.copyFrom(other.basicInfo); } @@ -327,12 +327,12 @@ public PlayerLoginScRsp mergeFrom(final PlayerLoginScRsp other) { if (other.hasLoginRandom()) { setLoginRandom(other.loginRandom); } - if (other.hasStamina()) { - setStamina(other.stamina); - } if (other.hasRetcode()) { setRetcode(other.retcode); } + if (other.hasStamina()) { + setStamina(other.stamina); + } if (other.hasCurTimezone()) { setCurTimezone(other.curTimezone); } @@ -351,8 +351,8 @@ public PlayerLoginScRsp clear() { bitField0_ = 0; serverTimestampMs = 0L; loginRandom = 0L; - stamina = 0; retcode = 0; + stamina = 0; curTimezone = 0; basicInfo.clear(); return this; @@ -381,8 +381,8 @@ public boolean equals(Object o) { return bitField0_ == other.bitField0_ && (!hasServerTimestampMs() || serverTimestampMs == other.serverTimestampMs) && (!hasLoginRandom() || loginRandom == other.loginRandom) - && (!hasStamina() || stamina == other.stamina) && (!hasRetcode() || retcode == other.retcode) + && (!hasStamina() || stamina == other.stamina) && (!hasCurTimezone() || curTimezone == other.curTimezone) && (!hasBasicInfo() || basicInfo.equals(other.basicInfo)); } @@ -390,27 +390,27 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 32); output.writeUInt64NoTag(serverTimestampMs); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 104); output.writeUInt64NoTag(loginRandom); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 56); - output.writeUInt32NoTag(stamina); + output.writeRawByte((byte) 16); + output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 104); - output.writeUInt32NoTag(retcode); + output.writeRawByte((byte) 120); + output.writeUInt32NoTag(stamina); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 56); output.writeSInt32NoTag(curTimezone); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 90); + output.writeRawByte((byte) 50); output.writeMessageNoTag(basicInfo); } } @@ -425,10 +425,10 @@ protected int computeSerializedSize() { size += 1 + ProtoSink.computeUInt64SizeNoTag(loginRandom); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(stamina); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(stamina); } if ((bitField0_ & 0x00000010) != 0) { size += 1 + ProtoSink.computeSInt32SizeNoTag(curTimezone); @@ -446,52 +446,52 @@ public PlayerLoginScRsp mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { + case 32: { // serverTimestampMs serverTimestampMs = input.readUInt64(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 112) { + if (tag != 104) { break; } } - case 112: { + case 104: { // loginRandom loginRandom = input.readUInt64(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 56) { + if (tag != 16) { break; } } - case 56: { - // stamina - stamina = input.readUInt32(); + case 16: { + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 104) { + if (tag != 120) { break; } } - case 104: { - // retcode - retcode = input.readUInt32(); + case 120: { + // stamina + stamina = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 8) { + if (tag != 56) { break; } } - case 8: { + case 56: { // curTimezone curTimezone = input.readSInt32(); bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 90) { + if (tag != 50) { break; } } - case 90: { + case 50: { // basicInfo input.readMessage(basicInfo); bitField0_ |= 0x00000020; @@ -524,10 +524,10 @@ public void writeTo(final JsonSink output) throws IOException { output.writeUInt64(FieldNames.loginRandom, loginRandom); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.stamina, stamina); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.stamina, stamina); } if ((bitField0_ & 0x00000010) != 0) { output.writeSInt32(FieldNames.curTimezone, curTimezone); @@ -569,10 +569,10 @@ public PlayerLoginScRsp mergeFrom(final JsonSource input) throws IOException { } break; } - case -1897344401: { - if (input.isAtField(FieldNames.stamina)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - stamina = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -580,10 +580,10 @@ public PlayerLoginScRsp mergeFrom(final JsonSource input) throws IOException { } break; } - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case -1897344401: { + if (input.isAtField(FieldNames.stamina)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + stamina = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -672,10 +672,10 @@ static class FieldNames { static final FieldName loginRandom = FieldName.forField("loginRandom", "login_random"); - static final FieldName stamina = FieldName.forField("stamina"); - static final FieldName retcode = FieldName.forField("retcode"); + static final FieldName stamina = FieldName.forField("stamina"); + static final FieldName curTimezone = FieldName.forField("curTimezone", "cur_timezone"); static final FieldName basicInfo = FieldName.forField("basicInfo", "basic_info"); diff --git a/src/generated/main/emu/lunarcore/proto/PlayerSyncScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/PlayerSyncScNotifyOuterClass.java index cdda8e22d..256d7967b 100644 --- a/src/generated/main/emu/lunarcore/proto/PlayerSyncScNotifyOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/PlayerSyncScNotifyOuterClass.java @@ -21,49 +21,49 @@ public static final class PlayerSyncScNotify extends ProtoMessageoptional .AvatarSync avatar_sync = 1; + * optional .AvatarSync avatar_sync = 3; */ private final AvatarSyncOuterClass.AvatarSync avatarSync = AvatarSyncOuterClass.AvatarSync.newInstance(); /** - * optional .PlayerBasicInfo basic_info = 6; + * optional .PlayerBasicInfo basic_info = 4; */ private final PlayerBasicInfoOuterClass.PlayerBasicInfo basicInfo = PlayerBasicInfoOuterClass.PlayerBasicInfo.newInstance(); /** - * optional .BoardDataSync board_data_sync = 2034; + * optional .BoardDataSync board_data_sync = 1627; */ private final BoardDataSyncOuterClass.BoardDataSync boardDataSync = BoardDataSyncOuterClass.BoardDataSync.newInstance(); /** - * repeated uint32 del_equipment_list = 10; + * repeated uint32 del_relic_list = 8; */ - private final RepeatedInt delEquipmentList = RepeatedInt.newEmptyInstance(); + private final RepeatedInt delRelicList = RepeatedInt.newEmptyInstance(); /** - * repeated uint32 del_relic_list = 14; + * repeated uint32 del_equipment_list = 13; */ - private final RepeatedInt delRelicList = RepeatedInt.newEmptyInstance(); + private final RepeatedInt delEquipmentList = RepeatedInt.newEmptyInstance(); /** - * repeated .Relic relic_list = 2; + * repeated .Relic relic_list = 1; */ private final RepeatedMessage relicList = RepeatedMessage.newEmptyInstance(RelicOuterClass.Relic.getFactory()); /** - * repeated .Equipment equipment_list = 5; + * repeated .Equipment equipment_list = 6; */ private final RepeatedMessage equipmentList = RepeatedMessage.newEmptyInstance(EquipmentOuterClass.Equipment.getFactory()); /** - * repeated .Material material_list = 11; + * repeated .HeroBasicTypeInfo basic_type_info_list = 11; */ - private final RepeatedMessage materialList = RepeatedMessage.newEmptyInstance(MaterialOuterClass.Material.getFactory()); + private final RepeatedMessage basicTypeInfoList = RepeatedMessage.newEmptyInstance(HeroBasicTypeInfoOuterClass.HeroBasicTypeInfo.getFactory()); /** - * repeated .HeroBasicTypeInfo basic_type_info_list = 15; + * repeated .Material material_list = 15; */ - private final RepeatedMessage basicTypeInfoList = RepeatedMessage.newEmptyInstance(HeroBasicTypeInfoOuterClass.HeroBasicTypeInfo.getFactory()); + private final RepeatedMessage materialList = RepeatedMessage.newEmptyInstance(MaterialOuterClass.Material.getFactory()); private PlayerSyncScNotify() { } @@ -76,7 +76,7 @@ public static PlayerSyncScNotify newInstance() { } /** - * optional .AvatarSync avatar_sync = 1; + * optional .AvatarSync avatar_sync = 3; * @return whether the avatarSync field is set */ public boolean hasAvatarSync() { @@ -84,7 +84,7 @@ public boolean hasAvatarSync() { } /** - * optional .AvatarSync avatar_sync = 1; + * optional .AvatarSync avatar_sync = 3; * @return this */ public PlayerSyncScNotify clearAvatarSync() { @@ -94,7 +94,7 @@ public PlayerSyncScNotify clearAvatarSync() { } /** - * optional .AvatarSync avatar_sync = 1; + * optional .AvatarSync avatar_sync = 3; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -108,7 +108,7 @@ public AvatarSyncOuterClass.AvatarSync getAvatarSync() { } /** - * optional .AvatarSync avatar_sync = 1; + * optional .AvatarSync avatar_sync = 3; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -122,7 +122,7 @@ public AvatarSyncOuterClass.AvatarSync getMutableAvatarSync() { } /** - * optional .AvatarSync avatar_sync = 1; + * optional .AvatarSync avatar_sync = 3; * @param value the avatarSync to set * @return this */ @@ -133,7 +133,7 @@ public PlayerSyncScNotify setAvatarSync(final AvatarSyncOuterClass.AvatarSync va } /** - * optional .PlayerBasicInfo basic_info = 6; + * optional .PlayerBasicInfo basic_info = 4; * @return whether the basicInfo field is set */ public boolean hasBasicInfo() { @@ -141,7 +141,7 @@ public boolean hasBasicInfo() { } /** - * optional .PlayerBasicInfo basic_info = 6; + * optional .PlayerBasicInfo basic_info = 4; * @return this */ public PlayerSyncScNotify clearBasicInfo() { @@ -151,7 +151,7 @@ public PlayerSyncScNotify clearBasicInfo() { } /** - * optional .PlayerBasicInfo basic_info = 6; + * optional .PlayerBasicInfo basic_info = 4; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -165,7 +165,7 @@ public PlayerBasicInfoOuterClass.PlayerBasicInfo getBasicInfo() { } /** - * optional .PlayerBasicInfo basic_info = 6; + * optional .PlayerBasicInfo basic_info = 4; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -179,7 +179,7 @@ public PlayerBasicInfoOuterClass.PlayerBasicInfo getMutableBasicInfo() { } /** - * optional .PlayerBasicInfo basic_info = 6; + * optional .PlayerBasicInfo basic_info = 4; * @param value the basicInfo to set * @return this */ @@ -190,7 +190,7 @@ public PlayerSyncScNotify setBasicInfo(final PlayerBasicInfoOuterClass.PlayerBas } /** - * optional .BoardDataSync board_data_sync = 2034; + * optional .BoardDataSync board_data_sync = 1627; * @return whether the boardDataSync field is set */ public boolean hasBoardDataSync() { @@ -198,7 +198,7 @@ public boolean hasBoardDataSync() { } /** - * optional .BoardDataSync board_data_sync = 2034; + * optional .BoardDataSync board_data_sync = 1627; * @return this */ public PlayerSyncScNotify clearBoardDataSync() { @@ -208,7 +208,7 @@ public PlayerSyncScNotify clearBoardDataSync() { } /** - * optional .BoardDataSync board_data_sync = 2034; + * optional .BoardDataSync board_data_sync = 1627; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -222,7 +222,7 @@ public BoardDataSyncOuterClass.BoardDataSync getBoardDataSync() { } /** - * optional .BoardDataSync board_data_sync = 2034; + * optional .BoardDataSync board_data_sync = 1627; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -236,7 +236,7 @@ public BoardDataSyncOuterClass.BoardDataSync getMutableBoardDataSync() { } /** - * optional .BoardDataSync board_data_sync = 2034; + * optional .BoardDataSync board_data_sync = 1627; * @param value the boardDataSync to set * @return this */ @@ -247,39 +247,39 @@ public PlayerSyncScNotify setBoardDataSync(final BoardDataSyncOuterClass.BoardDa } /** - * repeated uint32 del_equipment_list = 10; - * @return whether the delEquipmentList field is set + * repeated uint32 del_relic_list = 8; + * @return whether the delRelicList field is set */ - public boolean hasDelEquipmentList() { + public boolean hasDelRelicList() { return (bitField0_ & 0x00000008) != 0; } /** - * repeated uint32 del_equipment_list = 10; + * repeated uint32 del_relic_list = 8; * @return this */ - public PlayerSyncScNotify clearDelEquipmentList() { + public PlayerSyncScNotify clearDelRelicList() { bitField0_ &= ~0x00000008; - delEquipmentList.clear(); + delRelicList.clear(); return this; } /** - * repeated uint32 del_equipment_list = 10; + * repeated uint32 del_relic_list = 8; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. * - * Use {@link #getMutableDelEquipmentList()} if you want to modify it. + * Use {@link #getMutableDelRelicList()} if you want to modify it. * * @return internal storage object for reading */ - public RepeatedInt getDelEquipmentList() { - return delEquipmentList; + public RepeatedInt getDelRelicList() { + return delRelicList; } /** - * repeated uint32 del_equipment_list = 10; + * repeated uint32 del_relic_list = 8; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -287,67 +287,67 @@ public RepeatedInt getDelEquipmentList() { * * @return internal storage object for modifications */ - public RepeatedInt getMutableDelEquipmentList() { + public RepeatedInt getMutableDelRelicList() { bitField0_ |= 0x00000008; - return delEquipmentList; + return delRelicList; } /** - * repeated uint32 del_equipment_list = 10; - * @param value the delEquipmentList to add + * repeated uint32 del_relic_list = 8; + * @param value the delRelicList to add * @return this */ - public PlayerSyncScNotify addDelEquipmentList(final int value) { + public PlayerSyncScNotify addDelRelicList(final int value) { bitField0_ |= 0x00000008; - delEquipmentList.add(value); + delRelicList.add(value); return this; } /** - * repeated uint32 del_equipment_list = 10; - * @param values the delEquipmentList to add + * repeated uint32 del_relic_list = 8; + * @param values the delRelicList to add * @return this */ - public PlayerSyncScNotify addAllDelEquipmentList(final int... values) { + public PlayerSyncScNotify addAllDelRelicList(final int... values) { bitField0_ |= 0x00000008; - delEquipmentList.addAll(values); + delRelicList.addAll(values); return this; } /** - * repeated uint32 del_relic_list = 14; - * @return whether the delRelicList field is set + * repeated uint32 del_equipment_list = 13; + * @return whether the delEquipmentList field is set */ - public boolean hasDelRelicList() { + public boolean hasDelEquipmentList() { return (bitField0_ & 0x00000010) != 0; } /** - * repeated uint32 del_relic_list = 14; + * repeated uint32 del_equipment_list = 13; * @return this */ - public PlayerSyncScNotify clearDelRelicList() { + public PlayerSyncScNotify clearDelEquipmentList() { bitField0_ &= ~0x00000010; - delRelicList.clear(); + delEquipmentList.clear(); return this; } /** - * repeated uint32 del_relic_list = 14; + * repeated uint32 del_equipment_list = 13; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. * - * Use {@link #getMutableDelRelicList()} if you want to modify it. + * Use {@link #getMutableDelEquipmentList()} if you want to modify it. * * @return internal storage object for reading */ - public RepeatedInt getDelRelicList() { - return delRelicList; + public RepeatedInt getDelEquipmentList() { + return delEquipmentList; } /** - * repeated uint32 del_relic_list = 14; + * repeated uint32 del_equipment_list = 13; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -355,35 +355,35 @@ public RepeatedInt getDelRelicList() { * * @return internal storage object for modifications */ - public RepeatedInt getMutableDelRelicList() { + public RepeatedInt getMutableDelEquipmentList() { bitField0_ |= 0x00000010; - return delRelicList; + return delEquipmentList; } /** - * repeated uint32 del_relic_list = 14; - * @param value the delRelicList to add + * repeated uint32 del_equipment_list = 13; + * @param value the delEquipmentList to add * @return this */ - public PlayerSyncScNotify addDelRelicList(final int value) { + public PlayerSyncScNotify addDelEquipmentList(final int value) { bitField0_ |= 0x00000010; - delRelicList.add(value); + delEquipmentList.add(value); return this; } /** - * repeated uint32 del_relic_list = 14; - * @param values the delRelicList to add + * repeated uint32 del_equipment_list = 13; + * @param values the delEquipmentList to add * @return this */ - public PlayerSyncScNotify addAllDelRelicList(final int... values) { + public PlayerSyncScNotify addAllDelEquipmentList(final int... values) { bitField0_ |= 0x00000010; - delRelicList.addAll(values); + delEquipmentList.addAll(values); return this; } /** - * repeated .Relic relic_list = 2; + * repeated .Relic relic_list = 1; * @return whether the relicList field is set */ public boolean hasRelicList() { @@ -391,7 +391,7 @@ public boolean hasRelicList() { } /** - * repeated .Relic relic_list = 2; + * repeated .Relic relic_list = 1; * @return this */ public PlayerSyncScNotify clearRelicList() { @@ -401,7 +401,7 @@ public PlayerSyncScNotify clearRelicList() { } /** - * repeated .Relic relic_list = 2; + * repeated .Relic relic_list = 1; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -415,7 +415,7 @@ public RepeatedMessage getRelicList() { } /** - * repeated .Relic relic_list = 2; + * repeated .Relic relic_list = 1; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -429,7 +429,7 @@ public RepeatedMessage getMutableRelicList() { } /** - * repeated .Relic relic_list = 2; + * repeated .Relic relic_list = 1; * @param value the relicList to add * @return this */ @@ -440,7 +440,7 @@ public PlayerSyncScNotify addRelicList(final RelicOuterClass.Relic value) { } /** - * repeated .Relic relic_list = 2; + * repeated .Relic relic_list = 1; * @param values the relicList to add * @return this */ @@ -451,7 +451,7 @@ public PlayerSyncScNotify addAllRelicList(final RelicOuterClass.Relic... values) } /** - * repeated .Equipment equipment_list = 5; + * repeated .Equipment equipment_list = 6; * @return whether the equipmentList field is set */ public boolean hasEquipmentList() { @@ -459,7 +459,7 @@ public boolean hasEquipmentList() { } /** - * repeated .Equipment equipment_list = 5; + * repeated .Equipment equipment_list = 6; * @return this */ public PlayerSyncScNotify clearEquipmentList() { @@ -469,7 +469,7 @@ public PlayerSyncScNotify clearEquipmentList() { } /** - * repeated .Equipment equipment_list = 5; + * repeated .Equipment equipment_list = 6; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -483,7 +483,7 @@ public RepeatedMessage getEquipmentList() { } /** - * repeated .Equipment equipment_list = 5; + * repeated .Equipment equipment_list = 6; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -497,7 +497,7 @@ public RepeatedMessage getMutableEquipmentList() } /** - * repeated .Equipment equipment_list = 5; + * repeated .Equipment equipment_list = 6; * @param value the equipmentList to add * @return this */ @@ -508,7 +508,7 @@ public PlayerSyncScNotify addEquipmentList(final EquipmentOuterClass.Equipment v } /** - * repeated .Equipment equipment_list = 5; + * repeated .Equipment equipment_list = 6; * @param values the equipmentList to add * @return this */ @@ -519,39 +519,39 @@ public PlayerSyncScNotify addAllEquipmentList(final EquipmentOuterClass.Equipmen } /** - * repeated .Material material_list = 11; - * @return whether the materialList field is set + * repeated .HeroBasicTypeInfo basic_type_info_list = 11; + * @return whether the basicTypeInfoList field is set */ - public boolean hasMaterialList() { + public boolean hasBasicTypeInfoList() { return (bitField0_ & 0x00000080) != 0; } /** - * repeated .Material material_list = 11; + * repeated .HeroBasicTypeInfo basic_type_info_list = 11; * @return this */ - public PlayerSyncScNotify clearMaterialList() { + public PlayerSyncScNotify clearBasicTypeInfoList() { bitField0_ &= ~0x00000080; - materialList.clear(); + basicTypeInfoList.clear(); return this; } /** - * repeated .Material material_list = 11; + * repeated .HeroBasicTypeInfo basic_type_info_list = 11; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. * - * Use {@link #getMutableMaterialList()} if you want to modify it. + * Use {@link #getMutableBasicTypeInfoList()} if you want to modify it. * * @return internal storage object for reading */ - public RepeatedMessage getMaterialList() { - return materialList; + public RepeatedMessage getBasicTypeInfoList() { + return basicTypeInfoList; } /** - * repeated .Material material_list = 11; + * repeated .HeroBasicTypeInfo basic_type_info_list = 11; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -559,67 +559,70 @@ public RepeatedMessage getMaterialList() { * * @return internal storage object for modifications */ - public RepeatedMessage getMutableMaterialList() { + public RepeatedMessage getMutableBasicTypeInfoList( + ) { bitField0_ |= 0x00000080; - return materialList; + return basicTypeInfoList; } /** - * repeated .Material material_list = 11; - * @param value the materialList to add + * repeated .HeroBasicTypeInfo basic_type_info_list = 11; + * @param value the basicTypeInfoList to add * @return this */ - public PlayerSyncScNotify addMaterialList(final MaterialOuterClass.Material value) { + public PlayerSyncScNotify addBasicTypeInfoList( + final HeroBasicTypeInfoOuterClass.HeroBasicTypeInfo value) { bitField0_ |= 0x00000080; - materialList.add(value); + basicTypeInfoList.add(value); return this; } /** - * repeated .Material material_list = 11; - * @param values the materialList to add + * repeated .HeroBasicTypeInfo basic_type_info_list = 11; + * @param values the basicTypeInfoList to add * @return this */ - public PlayerSyncScNotify addAllMaterialList(final MaterialOuterClass.Material... values) { + public PlayerSyncScNotify addAllBasicTypeInfoList( + final HeroBasicTypeInfoOuterClass.HeroBasicTypeInfo... values) { bitField0_ |= 0x00000080; - materialList.addAll(values); + basicTypeInfoList.addAll(values); return this; } /** - * repeated .HeroBasicTypeInfo basic_type_info_list = 15; - * @return whether the basicTypeInfoList field is set + * repeated .Material material_list = 15; + * @return whether the materialList field is set */ - public boolean hasBasicTypeInfoList() { + public boolean hasMaterialList() { return (bitField0_ & 0x00000100) != 0; } /** - * repeated .HeroBasicTypeInfo basic_type_info_list = 15; + * repeated .Material material_list = 15; * @return this */ - public PlayerSyncScNotify clearBasicTypeInfoList() { + public PlayerSyncScNotify clearMaterialList() { bitField0_ &= ~0x00000100; - basicTypeInfoList.clear(); + materialList.clear(); return this; } /** - * repeated .HeroBasicTypeInfo basic_type_info_list = 15; + * repeated .Material material_list = 15; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. * - * Use {@link #getMutableBasicTypeInfoList()} if you want to modify it. + * Use {@link #getMutableMaterialList()} if you want to modify it. * * @return internal storage object for reading */ - public RepeatedMessage getBasicTypeInfoList() { - return basicTypeInfoList; + public RepeatedMessage getMaterialList() { + return materialList; } /** - * repeated .HeroBasicTypeInfo basic_type_info_list = 15; + * repeated .Material material_list = 15; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -627,33 +630,30 @@ public RepeatedMessage getBasicTy * * @return internal storage object for modifications */ - public RepeatedMessage getMutableBasicTypeInfoList( - ) { + public RepeatedMessage getMutableMaterialList() { bitField0_ |= 0x00000100; - return basicTypeInfoList; + return materialList; } /** - * repeated .HeroBasicTypeInfo basic_type_info_list = 15; - * @param value the basicTypeInfoList to add + * repeated .Material material_list = 15; + * @param value the materialList to add * @return this */ - public PlayerSyncScNotify addBasicTypeInfoList( - final HeroBasicTypeInfoOuterClass.HeroBasicTypeInfo value) { + public PlayerSyncScNotify addMaterialList(final MaterialOuterClass.Material value) { bitField0_ |= 0x00000100; - basicTypeInfoList.add(value); + materialList.add(value); return this; } /** - * repeated .HeroBasicTypeInfo basic_type_info_list = 15; - * @param values the basicTypeInfoList to add + * repeated .Material material_list = 15; + * @param values the materialList to add * @return this */ - public PlayerSyncScNotify addAllBasicTypeInfoList( - final HeroBasicTypeInfoOuterClass.HeroBasicTypeInfo... values) { + public PlayerSyncScNotify addAllMaterialList(final MaterialOuterClass.Material... values) { bitField0_ |= 0x00000100; - basicTypeInfoList.addAll(values); + materialList.addAll(values); return this; } @@ -665,12 +665,12 @@ public PlayerSyncScNotify copyFrom(final PlayerSyncScNotify other) { avatarSync.copyFrom(other.avatarSync); basicInfo.copyFrom(other.basicInfo); boardDataSync.copyFrom(other.boardDataSync); - delEquipmentList.copyFrom(other.delEquipmentList); delRelicList.copyFrom(other.delRelicList); + delEquipmentList.copyFrom(other.delEquipmentList); relicList.copyFrom(other.relicList); equipmentList.copyFrom(other.equipmentList); - materialList.copyFrom(other.materialList); basicTypeInfoList.copyFrom(other.basicTypeInfoList); + materialList.copyFrom(other.materialList); } return this; } @@ -690,24 +690,24 @@ public PlayerSyncScNotify mergeFrom(final PlayerSyncScNotify other) { if (other.hasBoardDataSync()) { getMutableBoardDataSync().mergeFrom(other.boardDataSync); } - if (other.hasDelEquipmentList()) { - getMutableDelEquipmentList().addAll(other.delEquipmentList); - } if (other.hasDelRelicList()) { getMutableDelRelicList().addAll(other.delRelicList); } + if (other.hasDelEquipmentList()) { + getMutableDelEquipmentList().addAll(other.delEquipmentList); + } if (other.hasRelicList()) { getMutableRelicList().addAll(other.relicList); } if (other.hasEquipmentList()) { getMutableEquipmentList().addAll(other.equipmentList); } - if (other.hasMaterialList()) { - getMutableMaterialList().addAll(other.materialList); - } if (other.hasBasicTypeInfoList()) { getMutableBasicTypeInfoList().addAll(other.basicTypeInfoList); } + if (other.hasMaterialList()) { + getMutableMaterialList().addAll(other.materialList); + } return this; } @@ -721,12 +721,12 @@ public PlayerSyncScNotify clear() { avatarSync.clear(); basicInfo.clear(); boardDataSync.clear(); - delEquipmentList.clear(); delRelicList.clear(); + delEquipmentList.clear(); relicList.clear(); equipmentList.clear(); - materialList.clear(); basicTypeInfoList.clear(); + materialList.clear(); return this; } @@ -740,12 +740,12 @@ public PlayerSyncScNotify clearQuick() { avatarSync.clearQuick(); basicInfo.clearQuick(); boardDataSync.clearQuick(); - delEquipmentList.clear(); delRelicList.clear(); + delEquipmentList.clear(); relicList.clearQuick(); equipmentList.clearQuick(); - materialList.clearQuick(); basicTypeInfoList.clearQuick(); + materialList.clearQuick(); return this; } @@ -762,62 +762,62 @@ public boolean equals(Object o) { && (!hasAvatarSync() || avatarSync.equals(other.avatarSync)) && (!hasBasicInfo() || basicInfo.equals(other.basicInfo)) && (!hasBoardDataSync() || boardDataSync.equals(other.boardDataSync)) - && (!hasDelEquipmentList() || delEquipmentList.equals(other.delEquipmentList)) && (!hasDelRelicList() || delRelicList.equals(other.delRelicList)) + && (!hasDelEquipmentList() || delEquipmentList.equals(other.delEquipmentList)) && (!hasRelicList() || relicList.equals(other.relicList)) && (!hasEquipmentList() || equipmentList.equals(other.equipmentList)) - && (!hasMaterialList() || materialList.equals(other.materialList)) - && (!hasBasicTypeInfoList() || basicTypeInfoList.equals(other.basicTypeInfoList)); + && (!hasBasicTypeInfoList() || basicTypeInfoList.equals(other.basicTypeInfoList)) + && (!hasMaterialList() || materialList.equals(other.materialList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 10); + output.writeRawByte((byte) 26); output.writeMessageNoTag(avatarSync); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 50); + output.writeRawByte((byte) 34); output.writeMessageNoTag(basicInfo); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawLittleEndian16((short) 32658); + output.writeRawLittleEndian16((short) 26074); output.writeMessageNoTag(boardDataSync); } if ((bitField0_ & 0x00000008) != 0) { - for (int i = 0; i < delEquipmentList.length(); i++) { - output.writeRawByte((byte) 80); - output.writeUInt32NoTag(delEquipmentList.array()[i]); + for (int i = 0; i < delRelicList.length(); i++) { + output.writeRawByte((byte) 64); + output.writeUInt32NoTag(delRelicList.array()[i]); } } if ((bitField0_ & 0x00000010) != 0) { - for (int i = 0; i < delRelicList.length(); i++) { - output.writeRawByte((byte) 112); - output.writeUInt32NoTag(delRelicList.array()[i]); + for (int i = 0; i < delEquipmentList.length(); i++) { + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(delEquipmentList.array()[i]); } } if ((bitField0_ & 0x00000020) != 0) { for (int i = 0; i < relicList.length(); i++) { - output.writeRawByte((byte) 18); + output.writeRawByte((byte) 10); output.writeMessageNoTag(relicList.get(i)); } } if ((bitField0_ & 0x00000040) != 0) { for (int i = 0; i < equipmentList.length(); i++) { - output.writeRawByte((byte) 42); + output.writeRawByte((byte) 50); output.writeMessageNoTag(equipmentList.get(i)); } } if ((bitField0_ & 0x00000080) != 0) { - for (int i = 0; i < materialList.length(); i++) { + for (int i = 0; i < basicTypeInfoList.length(); i++) { output.writeRawByte((byte) 90); - output.writeMessageNoTag(materialList.get(i)); + output.writeMessageNoTag(basicTypeInfoList.get(i)); } } if ((bitField0_ & 0x00000100) != 0) { - for (int i = 0; i < basicTypeInfoList.length(); i++) { + for (int i = 0; i < materialList.length(); i++) { output.writeRawByte((byte) 122); - output.writeMessageNoTag(basicTypeInfoList.get(i)); + output.writeMessageNoTag(materialList.get(i)); } } } @@ -835,10 +835,10 @@ protected int computeSerializedSize() { size += 2 + ProtoSink.computeMessageSizeNoTag(boardDataSync); } if ((bitField0_ & 0x00000008) != 0) { - size += (1 * delEquipmentList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(delEquipmentList); + size += (1 * delRelicList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(delRelicList); } if ((bitField0_ & 0x00000010) != 0) { - size += (1 * delRelicList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(delRelicList); + size += (1 * delEquipmentList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(delEquipmentList); } if ((bitField0_ & 0x00000020) != 0) { size += (1 * relicList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(relicList); @@ -847,10 +847,10 @@ protected int computeSerializedSize() { size += (1 * equipmentList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(equipmentList); } if ((bitField0_ & 0x00000080) != 0) { - size += (1 * materialList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(materialList); + size += (1 * basicTypeInfoList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(basicTypeInfoList); } if ((bitField0_ & 0x00000100) != 0) { - size += (1 * basicTypeInfoList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(basicTypeInfoList); + size += (1 * materialList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(materialList); } return size; } @@ -862,60 +862,60 @@ public PlayerSyncScNotify mergeFrom(final ProtoSource input) throws IOException int tag = input.readTag(); while (true) { switch (tag) { - case 10: { + case 26: { // avatarSync input.readMessage(avatarSync); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 50) { + if (tag != 34) { break; } } - case 50: { + case 34: { // basicInfo input.readMessage(basicInfo); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 16274) { + if (tag != 13018) { break; } } - case 16274: { + case 13018: { // boardDataSync input.readMessage(boardDataSync); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 82) { + if (tag != 66) { break; } } - case 82: { - // delEquipmentList [packed=true] - input.readPackedUInt32(delEquipmentList, tag); + case 66: { + // delRelicList [packed=true] + input.readPackedUInt32(delRelicList, tag); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 114) { + if (tag != 106) { break; } } - case 114: { - // delRelicList [packed=true] - input.readPackedUInt32(delRelicList, tag); + case 106: { + // delEquipmentList [packed=true] + input.readPackedUInt32(delEquipmentList, tag); bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 18) { + if (tag != 10) { break; } } - case 18: { + case 10: { // relicList tag = input.readRepeatedMessage(relicList, tag); bitField0_ |= 0x00000020; - if (tag != 42) { + if (tag != 50) { break; } } - case 42: { + case 50: { // equipmentList tag = input.readRepeatedMessage(equipmentList, tag); bitField0_ |= 0x00000040; @@ -924,16 +924,16 @@ public PlayerSyncScNotify mergeFrom(final ProtoSource input) throws IOException } } case 90: { - // materialList - tag = input.readRepeatedMessage(materialList, tag); + // basicTypeInfoList + tag = input.readRepeatedMessage(basicTypeInfoList, tag); bitField0_ |= 0x00000080; if (tag != 122) { break; } } case 122: { - // basicTypeInfoList - tag = input.readRepeatedMessage(basicTypeInfoList, tag); + // materialList + tag = input.readRepeatedMessage(materialList, tag); bitField0_ |= 0x00000100; if (tag != 0) { break; @@ -949,15 +949,15 @@ public PlayerSyncScNotify mergeFrom(final ProtoSource input) throws IOException tag = input.readTag(); break; } - case 80: { - // delEquipmentList [packed=false] - tag = input.readRepeatedUInt32(delEquipmentList, tag); + case 64: { + // delRelicList [packed=false] + tag = input.readRepeatedUInt32(delRelicList, tag); bitField0_ |= 0x00000008; break; } - case 112: { - // delRelicList [packed=false] - tag = input.readRepeatedUInt32(delRelicList, tag); + case 104: { + // delEquipmentList [packed=false] + tag = input.readRepeatedUInt32(delEquipmentList, tag); bitField0_ |= 0x00000010; break; } @@ -978,10 +978,10 @@ public void writeTo(final JsonSink output) throws IOException { output.writeMessage(FieldNames.boardDataSync, boardDataSync); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRepeatedUInt32(FieldNames.delEquipmentList, delEquipmentList); + output.writeRepeatedUInt32(FieldNames.delRelicList, delRelicList); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRepeatedUInt32(FieldNames.delRelicList, delRelicList); + output.writeRepeatedUInt32(FieldNames.delEquipmentList, delEquipmentList); } if ((bitField0_ & 0x00000020) != 0) { output.writeRepeatedMessage(FieldNames.relicList, relicList); @@ -990,10 +990,10 @@ public void writeTo(final JsonSink output) throws IOException { output.writeRepeatedMessage(FieldNames.equipmentList, equipmentList); } if ((bitField0_ & 0x00000080) != 0) { - output.writeRepeatedMessage(FieldNames.materialList, materialList); + output.writeRepeatedMessage(FieldNames.basicTypeInfoList, basicTypeInfoList); } if ((bitField0_ & 0x00000100) != 0) { - output.writeRepeatedMessage(FieldNames.basicTypeInfoList, basicTypeInfoList); + output.writeRepeatedMessage(FieldNames.materialList, materialList); } output.endObject(); } @@ -1041,11 +1041,11 @@ public PlayerSyncScNotify mergeFrom(final JsonSource input) throws IOException { } break; } - case -2124519167: - case -1682718877: { - if (input.isAtField(FieldNames.delEquipmentList)) { + case 1380069094: + case 1336083102: { + if (input.isAtField(FieldNames.delRelicList)) { if (!input.trySkipNullValue()) { - input.readRepeatedUInt32(delEquipmentList); + input.readRepeatedUInt32(delRelicList); bitField0_ |= 0x00000008; } } else { @@ -1053,11 +1053,11 @@ public PlayerSyncScNotify mergeFrom(final JsonSource input) throws IOException { } break; } - case 1380069094: - case 1336083102: { - if (input.isAtField(FieldNames.delRelicList)) { + case -2124519167: + case -1682718877: { + if (input.isAtField(FieldNames.delEquipmentList)) { if (!input.trySkipNullValue()) { - input.readRepeatedUInt32(delRelicList); + input.readRepeatedUInt32(delEquipmentList); bitField0_ |= 0x00000010; } } else { @@ -1089,11 +1089,11 @@ public PlayerSyncScNotify mergeFrom(final JsonSource input) throws IOException { } break; } - case -2115854747: - case -1149360970: { - if (input.isAtField(FieldNames.materialList)) { + case -344592620: + case -1315699973: { + if (input.isAtField(FieldNames.basicTypeInfoList)) { if (!input.trySkipNullValue()) { - input.readRepeatedMessage(materialList); + input.readRepeatedMessage(basicTypeInfoList); bitField0_ |= 0x00000080; } } else { @@ -1101,11 +1101,11 @@ public PlayerSyncScNotify mergeFrom(final JsonSource input) throws IOException { } break; } - case -344592620: - case -1315699973: { - if (input.isAtField(FieldNames.basicTypeInfoList)) { + case -2115854747: + case -1149360970: { + if (input.isAtField(FieldNames.materialList)) { if (!input.trySkipNullValue()) { - input.readRepeatedMessage(basicTypeInfoList); + input.readRepeatedMessage(materialList); bitField0_ |= 0x00000100; } } else { @@ -1172,17 +1172,17 @@ static class FieldNames { static final FieldName boardDataSync = FieldName.forField("boardDataSync", "board_data_sync"); - static final FieldName delEquipmentList = FieldName.forField("delEquipmentList", "del_equipment_list"); - static final FieldName delRelicList = FieldName.forField("delRelicList", "del_relic_list"); + static final FieldName delEquipmentList = FieldName.forField("delEquipmentList", "del_equipment_list"); + static final FieldName relicList = FieldName.forField("relicList", "relic_list"); static final FieldName equipmentList = FieldName.forField("equipmentList", "equipment_list"); - static final FieldName materialList = FieldName.forField("materialList", "material_list"); - static final FieldName basicTypeInfoList = FieldName.forField("basicTypeInfoList", "basic_type_info_list"); + + static final FieldName materialList = FieldName.forField("materialList", "material_list"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/PromoteAvatarCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/PromoteAvatarCsReqOuterClass.java index a7b17e747..67753a6d5 100644 --- a/src/generated/main/emu/lunarcore/proto/PromoteAvatarCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/PromoteAvatarCsReqOuterClass.java @@ -20,12 +20,12 @@ public static final class PromoteAvatarCsReq extends ProtoMessageoptional uint32 base_avatar_id = 14; + * optional uint32 base_avatar_id = 7; */ private int baseAvatarId; /** - * repeated .ItemCost item_list = 7; + * repeated .ItemCost item_list = 13; */ private final RepeatedMessage itemList = RepeatedMessage.newEmptyInstance(ItemCostOuterClass.ItemCost.getFactory()); @@ -40,7 +40,7 @@ public static PromoteAvatarCsReq newInstance() { } /** - * optional uint32 base_avatar_id = 14; + * optional uint32 base_avatar_id = 7; * @return whether the baseAvatarId field is set */ public boolean hasBaseAvatarId() { @@ -48,7 +48,7 @@ public boolean hasBaseAvatarId() { } /** - * optional uint32 base_avatar_id = 14; + * optional uint32 base_avatar_id = 7; * @return this */ public PromoteAvatarCsReq clearBaseAvatarId() { @@ -58,7 +58,7 @@ public PromoteAvatarCsReq clearBaseAvatarId() { } /** - * optional uint32 base_avatar_id = 14; + * optional uint32 base_avatar_id = 7; * @return the baseAvatarId */ public int getBaseAvatarId() { @@ -66,7 +66,7 @@ public int getBaseAvatarId() { } /** - * optional uint32 base_avatar_id = 14; + * optional uint32 base_avatar_id = 7; * @param value the baseAvatarId to set * @return this */ @@ -77,7 +77,7 @@ public PromoteAvatarCsReq setBaseAvatarId(final int value) { } /** - * repeated .ItemCost item_list = 7; + * repeated .ItemCost item_list = 13; * @return whether the itemList field is set */ public boolean hasItemList() { @@ -85,7 +85,7 @@ public boolean hasItemList() { } /** - * repeated .ItemCost item_list = 7; + * repeated .ItemCost item_list = 13; * @return this */ public PromoteAvatarCsReq clearItemList() { @@ -95,7 +95,7 @@ public PromoteAvatarCsReq clearItemList() { } /** - * repeated .ItemCost item_list = 7; + * repeated .ItemCost item_list = 13; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -109,7 +109,7 @@ public RepeatedMessage getItemList() { } /** - * repeated .ItemCost item_list = 7; + * repeated .ItemCost item_list = 13; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -123,7 +123,7 @@ public RepeatedMessage getMutableItemList() { } /** - * repeated .ItemCost item_list = 7; + * repeated .ItemCost item_list = 13; * @param value the itemList to add * @return this */ @@ -134,7 +134,7 @@ public PromoteAvatarCsReq addItemList(final ItemCostOuterClass.ItemCost value) { } /** - * repeated .ItemCost item_list = 7; + * repeated .ItemCost item_list = 13; * @param values the itemList to add * @return this */ @@ -210,12 +210,12 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(baseAvatarId); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < itemList.length(); i++) { - output.writeRawByte((byte) 58); + output.writeRawByte((byte) 106); output.writeMessageNoTag(itemList.get(i)); } } @@ -240,16 +240,16 @@ public PromoteAvatarCsReq mergeFrom(final ProtoSource input) throws IOException int tag = input.readTag(); while (true) { switch (tag) { - case 112: { + case 56: { // baseAvatarId baseAvatarId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 58) { + if (tag != 106) { break; } } - case 58: { + case 106: { // itemList tag = input.readRepeatedMessage(itemList, tag); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/PromoteEquipmentCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/PromoteEquipmentCsReqOuterClass.java index 33a969290..421c83ca7 100644 --- a/src/generated/main/emu/lunarcore/proto/PromoteEquipmentCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/PromoteEquipmentCsReqOuterClass.java @@ -19,12 +19,12 @@ public static final class PromoteEquipmentCsReq extends ProtoMessageoptional uint32 equipment_unique_id = 7; + * optional uint32 equipment_unique_id = 13; */ private int equipmentUniqueId; /** - * optional .ItemCostList item_cost_list = 2; + * optional .ItemCostList item_cost_list = 12; */ private final ItemCostListOuterClass.ItemCostList itemCostList = ItemCostListOuterClass.ItemCostList.newInstance(); @@ -39,7 +39,7 @@ public static PromoteEquipmentCsReq newInstance() { } /** - * optional uint32 equipment_unique_id = 7; + * optional uint32 equipment_unique_id = 13; * @return whether the equipmentUniqueId field is set */ public boolean hasEquipmentUniqueId() { @@ -47,7 +47,7 @@ public boolean hasEquipmentUniqueId() { } /** - * optional uint32 equipment_unique_id = 7; + * optional uint32 equipment_unique_id = 13; * @return this */ public PromoteEquipmentCsReq clearEquipmentUniqueId() { @@ -57,7 +57,7 @@ public PromoteEquipmentCsReq clearEquipmentUniqueId() { } /** - * optional uint32 equipment_unique_id = 7; + * optional uint32 equipment_unique_id = 13; * @return the equipmentUniqueId */ public int getEquipmentUniqueId() { @@ -65,7 +65,7 @@ public int getEquipmentUniqueId() { } /** - * optional uint32 equipment_unique_id = 7; + * optional uint32 equipment_unique_id = 13; * @param value the equipmentUniqueId to set * @return this */ @@ -76,7 +76,7 @@ public PromoteEquipmentCsReq setEquipmentUniqueId(final int value) { } /** - * optional .ItemCostList item_cost_list = 2; + * optional .ItemCostList item_cost_list = 12; * @return whether the itemCostList field is set */ public boolean hasItemCostList() { @@ -84,7 +84,7 @@ public boolean hasItemCostList() { } /** - * optional .ItemCostList item_cost_list = 2; + * optional .ItemCostList item_cost_list = 12; * @return this */ public PromoteEquipmentCsReq clearItemCostList() { @@ -94,7 +94,7 @@ public PromoteEquipmentCsReq clearItemCostList() { } /** - * optional .ItemCostList item_cost_list = 2; + * optional .ItemCostList item_cost_list = 12; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -108,7 +108,7 @@ public ItemCostListOuterClass.ItemCostList getItemCostList() { } /** - * optional .ItemCostList item_cost_list = 2; + * optional .ItemCostList item_cost_list = 12; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -122,7 +122,7 @@ public ItemCostListOuterClass.ItemCostList getMutableItemCostList() { } /** - * optional .ItemCostList item_cost_list = 2; + * optional .ItemCostList item_cost_list = 12; * @param value the itemCostList to set * @return this */ @@ -198,11 +198,11 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(equipmentUniqueId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 18); + output.writeRawByte((byte) 98); output.writeMessageNoTag(itemCostList); } } @@ -226,16 +226,16 @@ public PromoteEquipmentCsReq mergeFrom(final ProtoSource input) throws IOExcepti int tag = input.readTag(); while (true) { switch (tag) { - case 56: { + case 104: { // equipmentUniqueId equipmentUniqueId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 18) { + if (tag != 98) { break; } } - case 18: { + case 98: { // itemCostList input.readMessage(itemCostList); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/PropExtraInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/PropExtraInfoOuterClass.java index 2d551d050..8a824ae2f 100644 --- a/src/generated/main/emu/lunarcore/proto/PropExtraInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/PropExtraInfoOuterClass.java @@ -19,16 +19,7 @@ public static final class PropExtraInfo extends ProtoMessage impl private static final long serialVersionUID = 0L; /** - * 
-     * CIJCHJHMFPM chess_rogue_info = 7;
-     *
- * - * optional .PropAeonInfo aeon_info = 3; - */ - private final PropAeonInfoOuterClass.PropAeonInfo aeonInfo = PropAeonInfoOuterClass.PropAeonInfo.newInstance(); - - /** - * optional .PropRogueInfo rogue_info = 11; + * optional .PropRogueInfo rogue_info = 2; */ private final PropRogueInfoOuterClass.PropRogueInfo rogueInfo = PropRogueInfoOuterClass.PropRogueInfo.newInstance(); @@ -43,102 +34,25 @@ public static PropExtraInfo newInstance() { } /** - * 
-     * CIJCHJHMFPM chess_rogue_info = 7;
-     *
- * - * optional .PropAeonInfo aeon_info = 3; - * @return whether the aeonInfo field is set - */ - public boolean hasAeonInfo() { - return (bitField0_ & 0x00000001) != 0; - } - - /** - * 
-     * CIJCHJHMFPM chess_rogue_info = 7;
-     *
- * - * optional .PropAeonInfo aeon_info = 3; - * @return this - */ - public PropExtraInfo clearAeonInfo() { - bitField0_ &= ~0x00000001; - aeonInfo.clear(); - return this; - } - - /** - * 
-     * CIJCHJHMFPM chess_rogue_info = 7;
-     *
- * - * optional .PropAeonInfo aeon_info = 3; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * Use {@link #getMutableAeonInfo()} if you want to modify it. - * - * @return internal storage object for reading - */ - public PropAeonInfoOuterClass.PropAeonInfo getAeonInfo() { - return aeonInfo; - } - - /** - * 
-     * CIJCHJHMFPM chess_rogue_info = 7;
-     *
- * - * optional .PropAeonInfo aeon_info = 3; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public PropAeonInfoOuterClass.PropAeonInfo getMutableAeonInfo() { - bitField0_ |= 0x00000001; - return aeonInfo; - } - - /** - * 
-     * CIJCHJHMFPM chess_rogue_info = 7;
-     *
- * - * optional .PropAeonInfo aeon_info = 3; - * @param value the aeonInfo to set - * @return this - */ - public PropExtraInfo setAeonInfo(final PropAeonInfoOuterClass.PropAeonInfo value) { - bitField0_ |= 0x00000001; - aeonInfo.copyFrom(value); - return this; - } - - /** - * optional .PropRogueInfo rogue_info = 11; + * optional .PropRogueInfo rogue_info = 2; * @return whether the rogueInfo field is set */ public boolean hasRogueInfo() { - return (bitField0_ & 0x00000002) != 0; + return (bitField0_ & 0x00000001) != 0; } /** - * optional .PropRogueInfo rogue_info = 11; + * optional .PropRogueInfo rogue_info = 2; * @return this */ public PropExtraInfo clearRogueInfo() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; rogueInfo.clear(); return this; } /** - * optional .PropRogueInfo rogue_info = 11; + * optional .PropRogueInfo rogue_info = 2; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -152,7 +66,7 @@ public PropRogueInfoOuterClass.PropRogueInfo getRogueInfo() { } /** - * optional .PropRogueInfo rogue_info = 11; + * optional .PropRogueInfo rogue_info = 2; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -161,17 +75,17 @@ public PropRogueInfoOuterClass.PropRogueInfo getRogueInfo() { * @return internal storage object for modifications */ public PropRogueInfoOuterClass.PropRogueInfo getMutableRogueInfo() { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; return rogueInfo; } /** - * optional .PropRogueInfo rogue_info = 11; + * optional .PropRogueInfo rogue_info = 2; * @param value the rogueInfo to set * @return this */ public PropExtraInfo setRogueInfo(final PropRogueInfoOuterClass.PropRogueInfo value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; rogueInfo.copyFrom(value); return this; } @@ -181,7 +95,6 @@ public PropExtraInfo copyFrom(final PropExtraInfo other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - aeonInfo.copyFrom(other.aeonInfo); rogueInfo.copyFrom(other.rogueInfo); } return this; @@ -193,9 +106,6 @@ public PropExtraInfo mergeFrom(final PropExtraInfo other) { return this; } cachedSize = -1; - if (other.hasAeonInfo()) { - getMutableAeonInfo().mergeFrom(other.aeonInfo); - } if (other.hasRogueInfo()) { getMutableRogueInfo().mergeFrom(other.rogueInfo); } @@ -209,7 +119,6 @@ public PropExtraInfo clear() { } cachedSize = -1; bitField0_ = 0; - aeonInfo.clear(); rogueInfo.clear(); return this; } @@ -221,7 +130,6 @@ public PropExtraInfo clearQuick() { } cachedSize = -1; bitField0_ = 0; - aeonInfo.clearQuick(); rogueInfo.clearQuick(); return this; } @@ -236,18 +144,13 @@ public boolean equals(Object o) { } PropExtraInfo other = (PropExtraInfo) o; return bitField0_ == other.bitField0_ - && (!hasAeonInfo() || aeonInfo.equals(other.aeonInfo)) && (!hasRogueInfo() || rogueInfo.equals(other.rogueInfo)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 26); - output.writeMessageNoTag(aeonInfo); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 90); + output.writeRawByte((byte) 18); output.writeMessageNoTag(rogueInfo); } } @@ -256,9 +159,6 @@ public void writeTo(final ProtoSink output) throws IOException { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(aeonInfo); - } - if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(rogueInfo); } return size; @@ -271,19 +171,10 @@ public PropExtraInfo mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 26: { - // aeonInfo - input.readMessage(aeonInfo); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 90) { - break; - } - } - case 90: { + case 18: { // rogueInfo input.readMessage(rogueInfo); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 0) { break; @@ -307,9 +198,6 @@ public PropExtraInfo mergeFrom(final ProtoSource input) throws IOException { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeMessage(FieldNames.aeonInfo, aeonInfo); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeMessage(FieldNames.rogueInfo, rogueInfo); } output.endObject(); @@ -322,24 +210,12 @@ public PropExtraInfo mergeFrom(final JsonSource input) throws IOException { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -20823983: - case -625367446: { - if (input.isAtField(FieldNames.aeonInfo)) { - if (!input.trySkipNullValue()) { - input.readMessage(aeonInfo); - bitField0_ |= 0x00000001; - } - } else { - input.skipUnknownField(); - } - break; - } case 655808936: case -1124583437: { if (input.isAtField(FieldNames.rogueInfo)) { if (!input.trySkipNullValue()) { input.readMessage(rogueInfo); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; } } else { input.skipUnknownField(); @@ -398,8 +274,6 @@ public PropExtraInfo create() { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName aeonInfo = FieldName.forField("aeonInfo", "aeon_info"); - static final FieldName rogueInfo = FieldName.forField("rogueInfo", "rogue_info"); } } diff --git a/src/generated/main/emu/lunarcore/proto/QuestOuterClass.java b/src/generated/main/emu/lunarcore/proto/QuestOuterClass.java index 32ebc87c0..cd140dc2e 100644 --- a/src/generated/main/emu/lunarcore/proto/QuestOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/QuestOuterClass.java @@ -20,19 +20,19 @@ public static final class Quest extends ProtoMessage implements Cloneable private static final long serialVersionUID = 0L; /** - * optional int64 finish_time = 12; + * optional int64 finish_time = 4; */ private long finishTime; /** - * optional uint32 progress = 8; + * optional uint32 id = 5; */ - private int progress; + private int id; /** - * optional uint32 id = 11; + * optional uint32 progress = 6; */ - private int id; + private int progress; /** * optional .QuestStatus status = 13; @@ -40,9 +40,9 @@ public static final class Quest extends ProtoMessage implements Cloneable private int status; /** - * repeated uint32 taken_achievement_level_list = 3; + * repeated uint32 IOIPJKJIHJB = 15; */ - private final RepeatedInt takenAchievementLevelList = RepeatedInt.newEmptyInstance(); + private final RepeatedInt iOIPJKJIHJB = RepeatedInt.newEmptyInstance(); private Quest() { } @@ -55,7 +55,7 @@ public static Quest newInstance() { } /** - * optional int64 finish_time = 12; + * optional int64 finish_time = 4; * @return whether the finishTime field is set */ public boolean hasFinishTime() { @@ -63,7 +63,7 @@ public boolean hasFinishTime() { } /** - * optional int64 finish_time = 12; + * optional int64 finish_time = 4; * @return this */ public Quest clearFinishTime() { @@ -73,7 +73,7 @@ public Quest clearFinishTime() { } /** - * optional int64 finish_time = 12; + * optional int64 finish_time = 4; * @return the finishTime */ public long getFinishTime() { @@ -81,7 +81,7 @@ public long getFinishTime() { } /** - * optional int64 finish_time = 12; + * optional int64 finish_time = 4; * @param value the finishTime to set * @return this */ @@ -92,76 +92,76 @@ public Quest setFinishTime(final long value) { } /** - * optional uint32 progress = 8; - * @return whether the progress field is set + * optional uint32 id = 5; + * @return whether the id field is set */ - public boolean hasProgress() { + public boolean hasId() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 progress = 8; + * optional uint32 id = 5; * @return this */ - public Quest clearProgress() { + public Quest clearId() { bitField0_ &= ~0x00000002; - progress = 0; + id = 0; return this; } /** - * optional uint32 progress = 8; - * @return the progress + * optional uint32 id = 5; + * @return the id */ - public int getProgress() { - return progress; + public int getId() { + return id; } /** - * optional uint32 progress = 8; - * @param value the progress to set + * optional uint32 id = 5; + * @param value the id to set * @return this */ - public Quest setProgress(final int value) { + public Quest setId(final int value) { bitField0_ |= 0x00000002; - progress = value; + id = value; return this; } /** - * optional uint32 id = 11; - * @return whether the id field is set + * optional uint32 progress = 6; + * @return whether the progress field is set */ - public boolean hasId() { + public boolean hasProgress() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 id = 11; + * optional uint32 progress = 6; * @return this */ - public Quest clearId() { + public Quest clearProgress() { bitField0_ &= ~0x00000004; - id = 0; + progress = 0; return this; } /** - * optional uint32 id = 11; - * @return the id + * optional uint32 progress = 6; + * @return the progress */ - public int getId() { - return id; + public int getProgress() { + return progress; } /** - * optional uint32 id = 11; - * @param value the id to set + * optional uint32 progress = 6; + * @param value the progress to set * @return this */ - public Quest setId(final int value) { + public Quest setProgress(final int value) { bitField0_ |= 0x00000004; - id = value; + progress = value; return this; } @@ -228,39 +228,39 @@ public Quest setStatus(final QuestStatusOuterClass.QuestStatus value) { } /** - * repeated uint32 taken_achievement_level_list = 3; - * @return whether the takenAchievementLevelList field is set + * repeated uint32 IOIPJKJIHJB = 15; + * @return whether the iOIPJKJIHJB field is set */ - public boolean hasTakenAchievementLevelList() { + public boolean hasIOIPJKJIHJB() { return (bitField0_ & 0x00000010) != 0; } /** - * repeated uint32 taken_achievement_level_list = 3; + * repeated uint32 IOIPJKJIHJB = 15; * @return this */ - public Quest clearTakenAchievementLevelList() { + public Quest clearIOIPJKJIHJB() { bitField0_ &= ~0x00000010; - takenAchievementLevelList.clear(); + iOIPJKJIHJB.clear(); return this; } /** - * repeated uint32 taken_achievement_level_list = 3; + * repeated uint32 IOIPJKJIHJB = 15; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. * - * Use {@link #getMutableTakenAchievementLevelList()} if you want to modify it. + * Use {@link #getMutableIOIPJKJIHJB()} if you want to modify it. * * @return internal storage object for reading */ - public RepeatedInt getTakenAchievementLevelList() { - return takenAchievementLevelList; + public RepeatedInt getIOIPJKJIHJB() { + return iOIPJKJIHJB; } /** - * repeated uint32 taken_achievement_level_list = 3; + * repeated uint32 IOIPJKJIHJB = 15; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -268,30 +268,30 @@ public RepeatedInt getTakenAchievementLevelList() { * * @return internal storage object for modifications */ - public RepeatedInt getMutableTakenAchievementLevelList() { + public RepeatedInt getMutableIOIPJKJIHJB() { bitField0_ |= 0x00000010; - return takenAchievementLevelList; + return iOIPJKJIHJB; } /** - * repeated uint32 taken_achievement_level_list = 3; - * @param value the takenAchievementLevelList to add + * repeated uint32 IOIPJKJIHJB = 15; + * @param value the iOIPJKJIHJB to add * @return this */ - public Quest addTakenAchievementLevelList(final int value) { + public Quest addIOIPJKJIHJB(final int value) { bitField0_ |= 0x00000010; - takenAchievementLevelList.add(value); + iOIPJKJIHJB.add(value); return this; } /** - * repeated uint32 taken_achievement_level_list = 3; - * @param values the takenAchievementLevelList to add + * repeated uint32 IOIPJKJIHJB = 15; + * @param values the iOIPJKJIHJB to add * @return this */ - public Quest addAllTakenAchievementLevelList(final int... values) { + public Quest addAllIOIPJKJIHJB(final int... values) { bitField0_ |= 0x00000010; - takenAchievementLevelList.addAll(values); + iOIPJKJIHJB.addAll(values); return this; } @@ -301,10 +301,10 @@ public Quest copyFrom(final Quest other) { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; finishTime = other.finishTime; - progress = other.progress; id = other.id; + progress = other.progress; status = other.status; - takenAchievementLevelList.copyFrom(other.takenAchievementLevelList); + iOIPJKJIHJB.copyFrom(other.iOIPJKJIHJB); } return this; } @@ -318,17 +318,17 @@ public Quest mergeFrom(final Quest other) { if (other.hasFinishTime()) { setFinishTime(other.finishTime); } - if (other.hasProgress()) { - setProgress(other.progress); - } if (other.hasId()) { setId(other.id); } + if (other.hasProgress()) { + setProgress(other.progress); + } if (other.hasStatus()) { setStatusValue(other.status); } - if (other.hasTakenAchievementLevelList()) { - getMutableTakenAchievementLevelList().addAll(other.takenAchievementLevelList); + if (other.hasIOIPJKJIHJB()) { + getMutableIOIPJKJIHJB().addAll(other.iOIPJKJIHJB); } return this; } @@ -341,10 +341,10 @@ public Quest clear() { cachedSize = -1; bitField0_ = 0; finishTime = 0L; - progress = 0; id = 0; + progress = 0; status = 0; - takenAchievementLevelList.clear(); + iOIPJKJIHJB.clear(); return this; } @@ -355,7 +355,7 @@ public Quest clearQuick() { } cachedSize = -1; bitField0_ = 0; - takenAchievementLevelList.clear(); + iOIPJKJIHJB.clear(); return this; } @@ -370,34 +370,34 @@ public boolean equals(Object o) { Quest other = (Quest) o; return bitField0_ == other.bitField0_ && (!hasFinishTime() || finishTime == other.finishTime) - && (!hasProgress() || progress == other.progress) && (!hasId() || id == other.id) + && (!hasProgress() || progress == other.progress) && (!hasStatus() || status == other.status) - && (!hasTakenAchievementLevelList() || takenAchievementLevelList.equals(other.takenAchievementLevelList)); + && (!hasIOIPJKJIHJB() || iOIPJKJIHJB.equals(other.iOIPJKJIHJB)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 32); output.writeInt64NoTag(finishTime); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 64); - output.writeUInt32NoTag(progress); + output.writeRawByte((byte) 40); + output.writeUInt32NoTag(id); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 88); - output.writeUInt32NoTag(id); + output.writeRawByte((byte) 48); + output.writeUInt32NoTag(progress); } if ((bitField0_ & 0x00000008) != 0) { output.writeRawByte((byte) 104); output.writeEnumNoTag(status); } if ((bitField0_ & 0x00000010) != 0) { - for (int i = 0; i < takenAchievementLevelList.length(); i++) { - output.writeRawByte((byte) 24); - output.writeUInt32NoTag(takenAchievementLevelList.array()[i]); + for (int i = 0; i < iOIPJKJIHJB.length(); i++) { + output.writeRawByte((byte) 120); + output.writeUInt32NoTag(iOIPJKJIHJB.array()[i]); } } } @@ -409,16 +409,16 @@ protected int computeSerializedSize() { size += 1 + ProtoSink.computeInt64SizeNoTag(finishTime); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(progress); + size += 1 + ProtoSink.computeUInt32SizeNoTag(id); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(id); + size += 1 + ProtoSink.computeUInt32SizeNoTag(progress); } if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeEnumSizeNoTag(status); } if ((bitField0_ & 0x00000010) != 0) { - size += (1 * takenAchievementLevelList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(takenAchievementLevelList); + size += (1 * iOIPJKJIHJB.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(iOIPJKJIHJB); } return size; } @@ -430,27 +430,27 @@ public Quest mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 96: { + case 32: { // finishTime finishTime = input.readInt64(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 64) { + if (tag != 40) { break; } } - case 64: { - // progress - progress = input.readUInt32(); + case 40: { + // id + id = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 88) { + if (tag != 48) { break; } } - case 88: { - // id - id = input.readUInt32(); + case 48: { + // progress + progress = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 104) { @@ -465,13 +465,13 @@ public Quest mergeFrom(final ProtoSource input) throws IOException { bitField0_ |= 0x00000008; } tag = input.readTag(); - if (tag != 26) { + if (tag != 122) { break; } } - case 26: { - // takenAchievementLevelList [packed=true] - input.readPackedUInt32(takenAchievementLevelList, tag); + case 122: { + // iOIPJKJIHJB [packed=true] + input.readPackedUInt32(iOIPJKJIHJB, tag); bitField0_ |= 0x00000010; tag = input.readTag(); if (tag != 0) { @@ -488,9 +488,9 @@ public Quest mergeFrom(final ProtoSource input) throws IOException { tag = input.readTag(); break; } - case 24: { - // takenAchievementLevelList [packed=false] - tag = input.readRepeatedUInt32(takenAchievementLevelList, tag); + case 120: { + // iOIPJKJIHJB [packed=false] + tag = input.readRepeatedUInt32(iOIPJKJIHJB, tag); bitField0_ |= 0x00000010; break; } @@ -505,16 +505,16 @@ public void writeTo(final JsonSink output) throws IOException { output.writeInt64(FieldNames.finishTime, finishTime); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.progress, progress); + output.writeUInt32(FieldNames.id, id); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.id, id); + output.writeUInt32(FieldNames.progress, progress); } if ((bitField0_ & 0x00000008) != 0) { output.writeEnum(FieldNames.status, status, QuestStatusOuterClass.QuestStatus.converter()); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRepeatedUInt32(FieldNames.takenAchievementLevelList, takenAchievementLevelList); + output.writeRepeatedUInt32(FieldNames.iOIPJKJIHJB, iOIPJKJIHJB); } output.endObject(); } @@ -538,10 +538,10 @@ public Quest mergeFrom(final JsonSource input) throws IOException { } break; } - case -1001078227: { - if (input.isAtField(FieldNames.progress)) { + case 3355: { + if (input.isAtField(FieldNames.id)) { if (!input.trySkipNullValue()) { - progress = input.readUInt32(); + id = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -549,10 +549,10 @@ public Quest mergeFrom(final JsonSource input) throws IOException { } break; } - case 3355: { - if (input.isAtField(FieldNames.id)) { + case -1001078227: { + if (input.isAtField(FieldNames.progress)) { if (!input.trySkipNullValue()) { - id = input.readUInt32(); + progress = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -576,11 +576,10 @@ public Quest mergeFrom(final JsonSource input) throws IOException { } break; } - case 149879610: - case 1076639233: { - if (input.isAtField(FieldNames.takenAchievementLevelList)) { + case 1686124499: { + if (input.isAtField(FieldNames.iOIPJKJIHJB)) { if (!input.trySkipNullValue()) { - input.readRepeatedUInt32(takenAchievementLevelList); + input.readRepeatedUInt32(iOIPJKJIHJB); bitField0_ |= 0x00000010; } } else { @@ -642,13 +641,13 @@ public Quest create() { static class FieldNames { static final FieldName finishTime = FieldName.forField("finishTime", "finish_time"); - static final FieldName progress = FieldName.forField("progress"); - static final FieldName id = FieldName.forField("id"); + static final FieldName progress = FieldName.forField("progress"); + static final FieldName status = FieldName.forField("status"); - static final FieldName takenAchievementLevelList = FieldName.forField("takenAchievementLevelList", "taken_achievement_level_list"); + static final FieldName iOIPJKJIHJB = FieldName.forField("IOIPJKJIHJB"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/QuitLineupCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/QuitLineupCsReqOuterClass.java index 86894037f..26343298b 100644 --- a/src/generated/main/emu/lunarcore/proto/QuitLineupCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/QuitLineupCsReqOuterClass.java @@ -19,32 +19,32 @@ public static final class QuitLineupCsReq extends ProtoMessage private static final long serialVersionUID = 0L; /** - * optional uint32 index = 1; + * optional uint32 base_avatar_id = 2; */ - private int index; + private int baseAvatarId; /** - * optional uint32 plane_id = 5; + * optional uint32 plane_id = 7; */ private int planeId; /** - * optional uint32 base_avatar_id = 7; + * optional uint32 index = 13; */ - private int baseAvatarId; + private int index; /** - * optional .AvatarType avatar_type = 6; + * optional .AvatarType avatar_type = 8; */ private int avatarType; /** - * optional .ExtraLineupType extra_lineup_type = 8; + * optional .ExtraLineupType extra_lineup_type = 14; */ private int extraLineupType; /** - * optional bool is_virtual = 2; + * optional bool is_virtual = 5; */ private boolean isVirtual; @@ -59,44 +59,44 @@ public static QuitLineupCsReq newInstance() { } /** - * optional uint32 index = 1; - * @return whether the index field is set + * optional uint32 base_avatar_id = 2; + * @return whether the baseAvatarId field is set */ - public boolean hasIndex() { + public boolean hasBaseAvatarId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 index = 1; + * optional uint32 base_avatar_id = 2; * @return this */ - public QuitLineupCsReq clearIndex() { + public QuitLineupCsReq clearBaseAvatarId() { bitField0_ &= ~0x00000001; - index = 0; + baseAvatarId = 0; return this; } /** - * optional uint32 index = 1; - * @return the index + * optional uint32 base_avatar_id = 2; + * @return the baseAvatarId */ - public int getIndex() { - return index; + public int getBaseAvatarId() { + return baseAvatarId; } /** - * optional uint32 index = 1; - * @param value the index to set + * optional uint32 base_avatar_id = 2; + * @param value the baseAvatarId to set * @return this */ - public QuitLineupCsReq setIndex(final int value) { + public QuitLineupCsReq setBaseAvatarId(final int value) { bitField0_ |= 0x00000001; - index = value; + baseAvatarId = value; return this; } /** - * optional uint32 plane_id = 5; + * optional uint32 plane_id = 7; * @return whether the planeId field is set */ public boolean hasPlaneId() { @@ -104,7 +104,7 @@ public boolean hasPlaneId() { } /** - * optional uint32 plane_id = 5; + * optional uint32 plane_id = 7; * @return this */ public QuitLineupCsReq clearPlaneId() { @@ -114,7 +114,7 @@ public QuitLineupCsReq clearPlaneId() { } /** - * optional uint32 plane_id = 5; + * optional uint32 plane_id = 7; * @return the planeId */ public int getPlaneId() { @@ -122,7 +122,7 @@ public int getPlaneId() { } /** - * optional uint32 plane_id = 5; + * optional uint32 plane_id = 7; * @param value the planeId to set * @return this */ @@ -133,44 +133,44 @@ public QuitLineupCsReq setPlaneId(final int value) { } /** - * optional uint32 base_avatar_id = 7; - * @return whether the baseAvatarId field is set + * optional uint32 index = 13; + * @return whether the index field is set */ - public boolean hasBaseAvatarId() { + public boolean hasIndex() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 base_avatar_id = 7; + * optional uint32 index = 13; * @return this */ - public QuitLineupCsReq clearBaseAvatarId() { + public QuitLineupCsReq clearIndex() { bitField0_ &= ~0x00000004; - baseAvatarId = 0; + index = 0; return this; } /** - * optional uint32 base_avatar_id = 7; - * @return the baseAvatarId + * optional uint32 index = 13; + * @return the index */ - public int getBaseAvatarId() { - return baseAvatarId; + public int getIndex() { + return index; } /** - * optional uint32 base_avatar_id = 7; - * @param value the baseAvatarId to set + * optional uint32 index = 13; + * @param value the index to set * @return this */ - public QuitLineupCsReq setBaseAvatarId(final int value) { + public QuitLineupCsReq setIndex(final int value) { bitField0_ |= 0x00000004; - baseAvatarId = value; + index = value; return this; } /** - * optional .AvatarType avatar_type = 6; + * optional .AvatarType avatar_type = 8; * @return whether the avatarType field is set */ public boolean hasAvatarType() { @@ -178,7 +178,7 @@ public boolean hasAvatarType() { } /** - * optional .AvatarType avatar_type = 6; + * optional .AvatarType avatar_type = 8; * @return this */ public QuitLineupCsReq clearAvatarType() { @@ -188,7 +188,7 @@ public QuitLineupCsReq clearAvatarType() { } /** - * optional .AvatarType avatar_type = 6; + * optional .AvatarType avatar_type = 8; * @return the avatarType */ public AvatarTypeOuterClass.AvatarType getAvatarType() { @@ -221,7 +221,7 @@ public QuitLineupCsReq setAvatarTypeValue(final int value) { } /** - * optional .AvatarType avatar_type = 6; + * optional .AvatarType avatar_type = 8; * @param value the avatarType to set * @return this */ @@ -232,7 +232,7 @@ public QuitLineupCsReq setAvatarType(final AvatarTypeOuterClass.AvatarType value } /** - * optional .ExtraLineupType extra_lineup_type = 8; + * optional .ExtraLineupType extra_lineup_type = 14; * @return whether the extraLineupType field is set */ public boolean hasExtraLineupType() { @@ -240,7 +240,7 @@ public boolean hasExtraLineupType() { } /** - * optional .ExtraLineupType extra_lineup_type = 8; + * optional .ExtraLineupType extra_lineup_type = 14; * @return this */ public QuitLineupCsReq clearExtraLineupType() { @@ -250,7 +250,7 @@ public QuitLineupCsReq clearExtraLineupType() { } /** - * optional .ExtraLineupType extra_lineup_type = 8; + * optional .ExtraLineupType extra_lineup_type = 14; * @return the extraLineupType */ public ExtraLineupTypeOuterClass.ExtraLineupType getExtraLineupType() { @@ -283,7 +283,7 @@ public QuitLineupCsReq setExtraLineupTypeValue(final int value) { } /** - * optional .ExtraLineupType extra_lineup_type = 8; + * optional .ExtraLineupType extra_lineup_type = 14; * @param value the extraLineupType to set * @return this */ @@ -295,7 +295,7 @@ public QuitLineupCsReq setExtraLineupType( } /** - * optional bool is_virtual = 2; + * optional bool is_virtual = 5; * @return whether the isVirtual field is set */ public boolean hasIsVirtual() { @@ -303,7 +303,7 @@ public boolean hasIsVirtual() { } /** - * optional bool is_virtual = 2; + * optional bool is_virtual = 5; * @return this */ public QuitLineupCsReq clearIsVirtual() { @@ -313,7 +313,7 @@ public QuitLineupCsReq clearIsVirtual() { } /** - * optional bool is_virtual = 2; + * optional bool is_virtual = 5; * @return the isVirtual */ public boolean getIsVirtual() { @@ -321,7 +321,7 @@ public boolean getIsVirtual() { } /** - * optional bool is_virtual = 2; + * optional bool is_virtual = 5; * @param value the isVirtual to set * @return this */ @@ -336,9 +336,9 @@ public QuitLineupCsReq copyFrom(final QuitLineupCsReq other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - index = other.index; - planeId = other.planeId; baseAvatarId = other.baseAvatarId; + planeId = other.planeId; + index = other.index; avatarType = other.avatarType; extraLineupType = other.extraLineupType; isVirtual = other.isVirtual; @@ -352,14 +352,14 @@ public QuitLineupCsReq mergeFrom(final QuitLineupCsReq other) { return this; } cachedSize = -1; - if (other.hasIndex()) { - setIndex(other.index); + if (other.hasBaseAvatarId()) { + setBaseAvatarId(other.baseAvatarId); } if (other.hasPlaneId()) { setPlaneId(other.planeId); } - if (other.hasBaseAvatarId()) { - setBaseAvatarId(other.baseAvatarId); + if (other.hasIndex()) { + setIndex(other.index); } if (other.hasAvatarType()) { setAvatarTypeValue(other.avatarType); @@ -380,9 +380,9 @@ public QuitLineupCsReq clear() { } cachedSize = -1; bitField0_ = 0; - index = 0; - planeId = 0; baseAvatarId = 0; + planeId = 0; + index = 0; avatarType = 0; extraLineupType = 0; isVirtual = false; @@ -409,9 +409,9 @@ public boolean equals(Object o) { } QuitLineupCsReq other = (QuitLineupCsReq) o; return bitField0_ == other.bitField0_ - && (!hasIndex() || index == other.index) - && (!hasPlaneId() || planeId == other.planeId) && (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId) + && (!hasPlaneId() || planeId == other.planeId) + && (!hasIndex() || index == other.index) && (!hasAvatarType() || avatarType == other.avatarType) && (!hasExtraLineupType() || extraLineupType == other.extraLineupType) && (!hasIsVirtual() || isVirtual == other.isVirtual); @@ -420,27 +420,27 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); - output.writeUInt32NoTag(index); + output.writeRawByte((byte) 16); + output.writeUInt32NoTag(baseAvatarId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(planeId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 56); - output.writeUInt32NoTag(baseAvatarId); + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(index); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 64); output.writeEnumNoTag(avatarType); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 112); output.writeEnumNoTag(extraLineupType); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 40); output.writeBoolNoTag(isVirtual); } } @@ -449,13 +449,13 @@ public void writeTo(final ProtoSink output) throws IOException { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(index); + size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId); } if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(planeId); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(index); } if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeEnumSizeNoTag(avatarType); @@ -476,34 +476,34 @@ public QuitLineupCsReq mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { - // index - index = input.readUInt32(); + case 16: { + // baseAvatarId + baseAvatarId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 40) { + if (tag != 56) { break; } } - case 40: { + case 56: { // planeId planeId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 56) { + if (tag != 104) { break; } } - case 56: { - // baseAvatarId - baseAvatarId = input.readUInt32(); + case 104: { + // index + index = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 48) { + if (tag != 64) { break; } } - case 48: { + case 64: { // avatarType final int value = input.readInt32(); if (AvatarTypeOuterClass.AvatarType.forNumber(value) != null) { @@ -511,11 +511,11 @@ public QuitLineupCsReq mergeFrom(final ProtoSource input) throws IOException { bitField0_ |= 0x00000008; } tag = input.readTag(); - if (tag != 64) { + if (tag != 112) { break; } } - case 64: { + case 112: { // extraLineupType final int value = input.readInt32(); if (ExtraLineupTypeOuterClass.ExtraLineupType.forNumber(value) != null) { @@ -523,11 +523,11 @@ public QuitLineupCsReq mergeFrom(final ProtoSource input) throws IOException { bitField0_ |= 0x00000010; } tag = input.readTag(); - if (tag != 16) { + if (tag != 40) { break; } } - case 16: { + case 40: { // isVirtual isVirtual = input.readBool(); bitField0_ |= 0x00000020; @@ -554,13 +554,13 @@ public QuitLineupCsReq mergeFrom(final ProtoSource input) throws IOException { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.index, index); + output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId); } if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.planeId, planeId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId); + output.writeUInt32(FieldNames.index, index); } if ((bitField0_ & 0x00000008) != 0) { output.writeEnum(FieldNames.avatarType, avatarType, AvatarTypeOuterClass.AvatarType.converter()); @@ -581,10 +581,11 @@ public QuitLineupCsReq mergeFrom(final JsonSource input) throws IOException { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 100346066: { - if (input.isAtField(FieldNames.index)) { + case 118022725: + case -1756826157: { + if (input.isAtField(FieldNames.baseAvatarId)) { if (!input.trySkipNullValue()) { - index = input.readUInt32(); + baseAvatarId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -604,11 +605,10 @@ public QuitLineupCsReq mergeFrom(final JsonSource input) throws IOException { } break; } - case 118022725: - case -1756826157: { - if (input.isAtField(FieldNames.baseAvatarId)) { + case 100346066: { + if (input.isAtField(FieldNames.index)) { if (!input.trySkipNullValue()) { - baseAvatarId = input.readUInt32(); + index = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -715,11 +715,11 @@ public QuitLineupCsReq create() { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName index = FieldName.forField("index"); + static final FieldName baseAvatarId = FieldName.forField("baseAvatarId", "base_avatar_id"); static final FieldName planeId = FieldName.forField("planeId", "plane_id"); - static final FieldName baseAvatarId = FieldName.forField("baseAvatarId", "base_avatar_id"); + static final FieldName index = FieldName.forField("index"); static final FieldName avatarType = FieldName.forField("avatarType", "avatar_type"); diff --git a/src/generated/main/emu/lunarcore/proto/RankUpAvatarCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/RankUpAvatarCsReqOuterClass.java index 4f4d6d74c..1255872d1 100644 --- a/src/generated/main/emu/lunarcore/proto/RankUpAvatarCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RankUpAvatarCsReqOuterClass.java @@ -19,12 +19,12 @@ public static final class RankUpAvatarCsReq extends ProtoMessageoptional uint32 rank = 6; + * optional uint32 rank = 10; */ private int rank; /** - * optional uint32 base_avatar_id = 10; + * optional uint32 base_avatar_id = 15; */ private int baseAvatarId; @@ -44,7 +44,7 @@ public static RankUpAvatarCsReq newInstance() { } /** - * optional uint32 rank = 6; + * optional uint32 rank = 10; * @return whether the rank field is set */ public boolean hasRank() { @@ -52,7 +52,7 @@ public boolean hasRank() { } /** - * optional uint32 rank = 6; + * optional uint32 rank = 10; * @return this */ public RankUpAvatarCsReq clearRank() { @@ -62,7 +62,7 @@ public RankUpAvatarCsReq clearRank() { } /** - * optional uint32 rank = 6; + * optional uint32 rank = 10; * @return the rank */ public int getRank() { @@ -70,7 +70,7 @@ public int getRank() { } /** - * optional uint32 rank = 6; + * optional uint32 rank = 10; * @param value the rank to set * @return this */ @@ -81,7 +81,7 @@ public RankUpAvatarCsReq setRank(final int value) { } /** - * optional uint32 base_avatar_id = 10; + * optional uint32 base_avatar_id = 15; * @return whether the baseAvatarId field is set */ public boolean hasBaseAvatarId() { @@ -89,7 +89,7 @@ public boolean hasBaseAvatarId() { } /** - * optional uint32 base_avatar_id = 10; + * optional uint32 base_avatar_id = 15; * @return this */ public RankUpAvatarCsReq clearBaseAvatarId() { @@ -99,7 +99,7 @@ public RankUpAvatarCsReq clearBaseAvatarId() { } /** - * optional uint32 base_avatar_id = 10; + * optional uint32 base_avatar_id = 15; * @return the baseAvatarId */ public int getBaseAvatarId() { @@ -107,7 +107,7 @@ public int getBaseAvatarId() { } /** - * optional uint32 base_avatar_id = 10; + * optional uint32 base_avatar_id = 15; * @param value the baseAvatarId to set * @return this */ @@ -246,11 +246,11 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(rank); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(baseAvatarId); } if ((bitField0_ & 0x00000004) != 0) { @@ -281,16 +281,16 @@ public RankUpAvatarCsReq mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 48: { + case 80: { // rank rank = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 80) { + if (tag != 120) { break; } } - case 80: { + case 120: { // baseAvatarId baseAvatarId = input.readUInt32(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/RankUpEquipmentCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/RankUpEquipmentCsReqOuterClass.java index 5d70ff792..e174410ef 100644 --- a/src/generated/main/emu/lunarcore/proto/RankUpEquipmentCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RankUpEquipmentCsReqOuterClass.java @@ -19,12 +19,12 @@ public static final class RankUpEquipmentCsReq extends ProtoMessageoptional uint32 equipment_unique_id = 1; + * optional uint32 equipment_unique_id = 10; */ private int equipmentUniqueId; /** - * optional .ItemCostList item_cost_list = 9; + * optional .ItemCostList item_cost_list = 4; */ private final ItemCostListOuterClass.ItemCostList itemCostList = ItemCostListOuterClass.ItemCostList.newInstance(); @@ -39,7 +39,7 @@ public static RankUpEquipmentCsReq newInstance() { } /** - * optional uint32 equipment_unique_id = 1; + * optional uint32 equipment_unique_id = 10; * @return whether the equipmentUniqueId field is set */ public boolean hasEquipmentUniqueId() { @@ -47,7 +47,7 @@ public boolean hasEquipmentUniqueId() { } /** - * optional uint32 equipment_unique_id = 1; + * optional uint32 equipment_unique_id = 10; * @return this */ public RankUpEquipmentCsReq clearEquipmentUniqueId() { @@ -57,7 +57,7 @@ public RankUpEquipmentCsReq clearEquipmentUniqueId() { } /** - * optional uint32 equipment_unique_id = 1; + * optional uint32 equipment_unique_id = 10; * @return the equipmentUniqueId */ public int getEquipmentUniqueId() { @@ -65,7 +65,7 @@ public int getEquipmentUniqueId() { } /** - * optional uint32 equipment_unique_id = 1; + * optional uint32 equipment_unique_id = 10; * @param value the equipmentUniqueId to set * @return this */ @@ -76,7 +76,7 @@ public RankUpEquipmentCsReq setEquipmentUniqueId(final int value) { } /** - * optional .ItemCostList item_cost_list = 9; + * optional .ItemCostList item_cost_list = 4; * @return whether the itemCostList field is set */ public boolean hasItemCostList() { @@ -84,7 +84,7 @@ public boolean hasItemCostList() { } /** - * optional .ItemCostList item_cost_list = 9; + * optional .ItemCostList item_cost_list = 4; * @return this */ public RankUpEquipmentCsReq clearItemCostList() { @@ -94,7 +94,7 @@ public RankUpEquipmentCsReq clearItemCostList() { } /** - * optional .ItemCostList item_cost_list = 9; + * optional .ItemCostList item_cost_list = 4; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -108,7 +108,7 @@ public ItemCostListOuterClass.ItemCostList getItemCostList() { } /** - * optional .ItemCostList item_cost_list = 9; + * optional .ItemCostList item_cost_list = 4; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -122,7 +122,7 @@ public ItemCostListOuterClass.ItemCostList getMutableItemCostList() { } /** - * optional .ItemCostList item_cost_list = 9; + * optional .ItemCostList item_cost_list = 4; * @param value the itemCostList to set * @return this */ @@ -198,11 +198,11 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(equipmentUniqueId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 74); + output.writeRawByte((byte) 34); output.writeMessageNoTag(itemCostList); } } @@ -226,16 +226,16 @@ public RankUpEquipmentCsReq mergeFrom(final ProtoSource input) throws IOExceptio int tag = input.readTag(); while (true) { switch (tag) { - case 8: { + case 80: { // equipmentUniqueId equipmentUniqueId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 74) { + if (tag != 34) { break; } } - case 74: { + case 34: { // itemCostList input.readMessage(itemCostList); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/ReEnterLastElementStageCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/ReEnterLastElementStageCsReqOuterClass.java index c2077b73f..48ba93274 100644 --- a/src/generated/main/emu/lunarcore/proto/ReEnterLastElementStageCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ReEnterLastElementStageCsReqOuterClass.java @@ -19,7 +19,7 @@ public static final class ReEnterLastElementStageCsReq extends ProtoMessageoptional uint32 stage_id = 4; + * optional uint32 stage_id = 12; */ private int stageId; @@ -34,7 +34,7 @@ public static ReEnterLastElementStageCsReq newInstance() { } /** - * optional uint32 stage_id = 4; + * optional uint32 stage_id = 12; * @return whether the stageId field is set */ public boolean hasStageId() { @@ -42,7 +42,7 @@ public boolean hasStageId() { } /** - * optional uint32 stage_id = 4; + * optional uint32 stage_id = 12; * @return this */ public ReEnterLastElementStageCsReq clearStageId() { @@ -52,7 +52,7 @@ public ReEnterLastElementStageCsReq clearStageId() { } /** - * optional uint32 stage_id = 4; + * optional uint32 stage_id = 12; * @return the stageId */ public int getStageId() { @@ -60,7 +60,7 @@ public int getStageId() { } /** - * optional uint32 stage_id = 4; + * optional uint32 stage_id = 12; * @param value the stageId to set * @return this */ @@ -129,7 +129,7 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(stageId); } } @@ -150,7 +150,7 @@ public ReEnterLastElementStageCsReq mergeFrom(final ProtoSource input) throws IO int tag = input.readTag(); while (true) { switch (tag) { - case 32: { + case 96: { // stageId stageId = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/ReEnterLastElementStageScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/ReEnterLastElementStageScRspOuterClass.java index 13154b6b7..be4122429 100644 --- a/src/generated/main/emu/lunarcore/proto/ReEnterLastElementStageScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ReEnterLastElementStageScRspOuterClass.java @@ -19,17 +19,17 @@ public static final class ReEnterLastElementStageScRsp extends ProtoMessageoptional uint32 retcode = 3; + * optional uint32 stage_id = 3; */ - private int retcode; + private int stageId; /** - * optional uint32 stage_id = 10; + * optional uint32 retcode = 7; */ - private int stageId; + private int retcode; /** - * optional .SceneBattleInfo battle_info = 15; + * optional .SceneBattleInfo battle_info = 11; */ private final SceneBattleInfoOuterClass.SceneBattleInfo battleInfo = SceneBattleInfoOuterClass.SceneBattleInfo.newInstance(); @@ -44,81 +44,81 @@ public static ReEnterLastElementStageScRsp newInstance() { } /** - * optional uint32 retcode = 3; - * @return whether the retcode field is set + * optional uint32 stage_id = 3; + * @return whether the stageId field is set */ - public boolean hasRetcode() { + public boolean hasStageId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 retcode = 3; + * optional uint32 stage_id = 3; * @return this */ - public ReEnterLastElementStageScRsp clearRetcode() { + public ReEnterLastElementStageScRsp clearStageId() { bitField0_ &= ~0x00000001; - retcode = 0; + stageId = 0; return this; } /** - * optional uint32 retcode = 3; - * @return the retcode + * optional uint32 stage_id = 3; + * @return the stageId */ - public int getRetcode() { - return retcode; + public int getStageId() { + return stageId; } /** - * optional uint32 retcode = 3; - * @param value the retcode to set + * optional uint32 stage_id = 3; + * @param value the stageId to set * @return this */ - public ReEnterLastElementStageScRsp setRetcode(final int value) { + public ReEnterLastElementStageScRsp setStageId(final int value) { bitField0_ |= 0x00000001; - retcode = value; + stageId = value; return this; } /** - * optional uint32 stage_id = 10; - * @return whether the stageId field is set + * optional uint32 retcode = 7; + * @return whether the retcode field is set */ - public boolean hasStageId() { + public boolean hasRetcode() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 stage_id = 10; + * optional uint32 retcode = 7; * @return this */ - public ReEnterLastElementStageScRsp clearStageId() { + public ReEnterLastElementStageScRsp clearRetcode() { bitField0_ &= ~0x00000002; - stageId = 0; + retcode = 0; return this; } /** - * optional uint32 stage_id = 10; - * @return the stageId + * optional uint32 retcode = 7; + * @return the retcode */ - public int getStageId() { - return stageId; + public int getRetcode() { + return retcode; } /** - * optional uint32 stage_id = 10; - * @param value the stageId to set + * optional uint32 retcode = 7; + * @param value the retcode to set * @return this */ - public ReEnterLastElementStageScRsp setStageId(final int value) { + public ReEnterLastElementStageScRsp setRetcode(final int value) { bitField0_ |= 0x00000002; - stageId = value; + retcode = value; return this; } /** - * optional .SceneBattleInfo battle_info = 15; + * optional .SceneBattleInfo battle_info = 11; * @return whether the battleInfo field is set */ public boolean hasBattleInfo() { @@ -126,7 +126,7 @@ public boolean hasBattleInfo() { } /** - * optional .SceneBattleInfo battle_info = 15; + * optional .SceneBattleInfo battle_info = 11; * @return this */ public ReEnterLastElementStageScRsp clearBattleInfo() { @@ -136,7 +136,7 @@ public ReEnterLastElementStageScRsp clearBattleInfo() { } /** - * optional .SceneBattleInfo battle_info = 15; + * optional .SceneBattleInfo battle_info = 11; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -150,7 +150,7 @@ public SceneBattleInfoOuterClass.SceneBattleInfo getBattleInfo() { } /** - * optional .SceneBattleInfo battle_info = 15; + * optional .SceneBattleInfo battle_info = 11; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -164,7 +164,7 @@ public SceneBattleInfoOuterClass.SceneBattleInfo getMutableBattleInfo() { } /** - * optional .SceneBattleInfo battle_info = 15; + * optional .SceneBattleInfo battle_info = 11; * @param value the battleInfo to set * @return this */ @@ -180,8 +180,8 @@ public ReEnterLastElementStageScRsp copyFrom(final ReEnterLastElementStageScRsp cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - retcode = other.retcode; stageId = other.stageId; + retcode = other.retcode; battleInfo.copyFrom(other.battleInfo); } return this; @@ -193,12 +193,12 @@ public ReEnterLastElementStageScRsp mergeFrom(final ReEnterLastElementStageScRsp return this; } cachedSize = -1; - if (other.hasRetcode()) { - setRetcode(other.retcode); - } if (other.hasStageId()) { setStageId(other.stageId); } + if (other.hasRetcode()) { + setRetcode(other.retcode); + } if (other.hasBattleInfo()) { getMutableBattleInfo().mergeFrom(other.battleInfo); } @@ -212,8 +212,8 @@ public ReEnterLastElementStageScRsp clear() { } cachedSize = -1; bitField0_ = 0; - retcode = 0; stageId = 0; + retcode = 0; battleInfo.clear(); return this; } @@ -239,8 +239,8 @@ public boolean equals(Object o) { } ReEnterLastElementStageScRsp other = (ReEnterLastElementStageScRsp) o; return bitField0_ == other.bitField0_ - && (!hasRetcode() || retcode == other.retcode) && (!hasStageId() || stageId == other.stageId) + && (!hasRetcode() || retcode == other.retcode) && (!hasBattleInfo() || battleInfo.equals(other.battleInfo)); } @@ -248,14 +248,14 @@ public boolean equals(Object o) { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { output.writeRawByte((byte) 24); - output.writeUInt32NoTag(retcode); + output.writeUInt32NoTag(stageId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 80); - output.writeUInt32NoTag(stageId); + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 122); + output.writeRawByte((byte) 90); output.writeMessageNoTag(battleInfo); } } @@ -264,10 +264,10 @@ public void writeTo(final ProtoSink output) throws IOException { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(stageId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(stageId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(battleInfo); @@ -283,24 +283,24 @@ public ReEnterLastElementStageScRsp mergeFrom(final ProtoSource input) throws IO while (true) { switch (tag) { case 24: { - // retcode - retcode = input.readUInt32(); + // stageId + stageId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 80) { + if (tag != 56) { break; } } - case 80: { - // stageId - stageId = input.readUInt32(); + case 56: { + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 122) { + if (tag != 90) { break; } } - case 122: { + case 90: { // battleInfo input.readMessage(battleInfo); bitField0_ |= 0x00000004; @@ -327,10 +327,10 @@ public ReEnterLastElementStageScRsp mergeFrom(final ProtoSource input) throws IO public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.stageId, stageId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.stageId, stageId); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000004) != 0) { output.writeMessage(FieldNames.battleInfo, battleInfo); @@ -345,10 +345,11 @@ public ReEnterLastElementStageScRsp mergeFrom(final JsonSource input) throws IOE } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case -1897528135: + case 1306191356: { + if (input.isAtField(FieldNames.stageId)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + stageId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -356,11 +357,10 @@ public ReEnterLastElementStageScRsp mergeFrom(final JsonSource input) throws IOE } break; } - case -1897528135: - case 1306191356: { - if (input.isAtField(FieldNames.stageId)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - stageId = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -435,10 +435,10 @@ public ReEnterLastElementStageScRsp create() { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName stageId = FieldName.forField("stageId", "stage_id"); + static final FieldName retcode = FieldName.forField("retcode"); + static final FieldName battleInfo = FieldName.forField("battleInfo", "battle_info"); } } diff --git a/src/generated/main/emu/lunarcore/proto/RefreshTriggerByClientCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/RefreshTriggerByClientCsReqOuterClass.java index 1e681b613..fcea76298 100644 --- a/src/generated/main/emu/lunarcore/proto/RefreshTriggerByClientCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RefreshTriggerByClientCsReqOuterClass.java @@ -21,7 +21,7 @@ public static final class RefreshTriggerByClientCsReq extends ProtoMessageoptional uint32 trigger_entity_id = 4; + * optional uint32 trigger_entity_id = 14; */ private int triggerEntityId; @@ -31,12 +31,12 @@ public static final class RefreshTriggerByClientCsReq extends ProtoMessageoptional string trigger_name = 3; + * optional string trigger_name = 4; */ private final Utf8String triggerName = Utf8String.newEmptyInstance(); /** - * repeated uint32 trigger_target_id_list = 12; + * repeated uint32 trigger_target_id_list = 15; */ private final RepeatedInt triggerTargetIdList = RepeatedInt.newEmptyInstance(); @@ -51,7 +51,7 @@ public static RefreshTriggerByClientCsReq newInstance() { } /** - * optional uint32 trigger_entity_id = 4; + * optional uint32 trigger_entity_id = 14; * @return whether the triggerEntityId field is set */ public boolean hasTriggerEntityId() { @@ -59,7 +59,7 @@ public boolean hasTriggerEntityId() { } /** - * optional uint32 trigger_entity_id = 4; + * optional uint32 trigger_entity_id = 14; * @return this */ public RefreshTriggerByClientCsReq clearTriggerEntityId() { @@ -69,7 +69,7 @@ public RefreshTriggerByClientCsReq clearTriggerEntityId() { } /** - * optional uint32 trigger_entity_id = 4; + * optional uint32 trigger_entity_id = 14; * @return the triggerEntityId */ public int getTriggerEntityId() { @@ -77,7 +77,7 @@ public int getTriggerEntityId() { } /** - * optional uint32 trigger_entity_id = 4; + * optional uint32 trigger_entity_id = 14; * @param value the triggerEntityId to set * @return this */ @@ -146,7 +146,7 @@ public RefreshTriggerByClientCsReq setTriggerMotion( } /** - * optional string trigger_name = 3; + * optional string trigger_name = 4; * @return whether the triggerName field is set */ public boolean hasTriggerName() { @@ -154,7 +154,7 @@ public boolean hasTriggerName() { } /** - * optional string trigger_name = 3; + * optional string trigger_name = 4; * @return this */ public RefreshTriggerByClientCsReq clearTriggerName() { @@ -164,7 +164,7 @@ public RefreshTriggerByClientCsReq clearTriggerName() { } /** - * optional string trigger_name = 3; + * optional string trigger_name = 4; * @return the triggerName */ public String getTriggerName() { @@ -172,7 +172,7 @@ public String getTriggerName() { } /** - * optional string trigger_name = 3; + * optional string trigger_name = 4; * @return internal {@code Utf8String} representation of triggerName for reading */ public Utf8String getTriggerNameBytes() { @@ -180,7 +180,7 @@ public Utf8String getTriggerNameBytes() { } /** - * optional string trigger_name = 3; + * optional string trigger_name = 4; * @return internal {@code Utf8String} representation of triggerName for modifications */ public Utf8String getMutableTriggerNameBytes() { @@ -189,7 +189,7 @@ public Utf8String getMutableTriggerNameBytes() { } /** - * optional string trigger_name = 3; + * optional string trigger_name = 4; * @param value the triggerName to set * @return this */ @@ -200,7 +200,7 @@ public RefreshTriggerByClientCsReq setTriggerName(final CharSequence value) { } /** - * optional string trigger_name = 3; + * optional string trigger_name = 4; * @param value the triggerName to set * @return this */ @@ -211,7 +211,7 @@ public RefreshTriggerByClientCsReq setTriggerName(final Utf8String value) { } /** - * repeated uint32 trigger_target_id_list = 12; + * repeated uint32 trigger_target_id_list = 15; * @return whether the triggerTargetIdList field is set */ public boolean hasTriggerTargetIdList() { @@ -219,7 +219,7 @@ public boolean hasTriggerTargetIdList() { } /** - * repeated uint32 trigger_target_id_list = 12; + * repeated uint32 trigger_target_id_list = 15; * @return this */ public RefreshTriggerByClientCsReq clearTriggerTargetIdList() { @@ -229,7 +229,7 @@ public RefreshTriggerByClientCsReq clearTriggerTargetIdList() { } /** - * repeated uint32 trigger_target_id_list = 12; + * repeated uint32 trigger_target_id_list = 15; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -243,7 +243,7 @@ public RepeatedInt getTriggerTargetIdList() { } /** - * repeated uint32 trigger_target_id_list = 12; + * repeated uint32 trigger_target_id_list = 15; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -257,7 +257,7 @@ public RepeatedInt getMutableTriggerTargetIdList() { } /** - * repeated uint32 trigger_target_id_list = 12; + * repeated uint32 trigger_target_id_list = 15; * @param value the triggerTargetIdList to add * @return this */ @@ -268,7 +268,7 @@ public RefreshTriggerByClientCsReq addTriggerTargetIdList(final int value) { } /** - * repeated uint32 trigger_target_id_list = 12; + * repeated uint32 trigger_target_id_list = 15; * @param values the triggerTargetIdList to add * @return this */ @@ -358,7 +358,7 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(triggerEntityId); } if ((bitField0_ & 0x00000002) != 0) { @@ -366,12 +366,12 @@ public void writeTo(final ProtoSink output) throws IOException { output.writeMessageNoTag(triggerMotion); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 26); + output.writeRawByte((byte) 34); output.writeStringNoTag(triggerName); } if ((bitField0_ & 0x00000008) != 0) { for (int i = 0; i < triggerTargetIdList.length(); i++) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(triggerTargetIdList.array()[i]); } } @@ -402,7 +402,7 @@ public RefreshTriggerByClientCsReq mergeFrom(final ProtoSource input) throws IOE int tag = input.readTag(); while (true) { switch (tag) { - case 32: { + case 112: { // triggerEntityId triggerEntityId = input.readUInt32(); bitField0_ |= 0x00000001; @@ -416,20 +416,20 @@ public RefreshTriggerByClientCsReq mergeFrom(final ProtoSource input) throws IOE input.readMessage(triggerMotion); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 26) { + if (tag != 34) { break; } } - case 26: { + case 34: { // triggerName input.readString(triggerName); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 98) { + if (tag != 122) { break; } } - case 98: { + case 122: { // triggerTargetIdList [packed=true] input.readPackedUInt32(triggerTargetIdList, tag); bitField0_ |= 0x00000008; @@ -448,7 +448,7 @@ public RefreshTriggerByClientCsReq mergeFrom(final ProtoSource input) throws IOE tag = input.readTag(); break; } - case 96: { + case 120: { // triggerTargetIdList [packed=false] tag = input.readRepeatedUInt32(triggerTargetIdList, tag); bitField0_ |= 0x00000008; diff --git a/src/generated/main/emu/lunarcore/proto/RefreshTriggerByClientScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/RefreshTriggerByClientScNotifyOuterClass.java index 8d9b98f25..a2f602566 100644 --- a/src/generated/main/emu/lunarcore/proto/RefreshTriggerByClientScNotifyOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RefreshTriggerByClientScNotifyOuterClass.java @@ -21,17 +21,17 @@ public static final class RefreshTriggerByClientScNotify extends ProtoMessageoptional uint32 trigger_entity_id = 4; + * optional uint32 trigger_entity_id = 7; */ private int triggerEntityId; /** - * optional string trigger_name = 14; + * optional string trigger_name = 1; */ private final Utf8String triggerName = Utf8String.newEmptyInstance(); /** - * repeated uint32 trigger_target_id_list = 15; + * repeated uint32 trigger_target_id_list = 5; */ private final RepeatedInt triggerTargetIdList = RepeatedInt.newEmptyInstance(); @@ -46,7 +46,7 @@ public static RefreshTriggerByClientScNotify newInstance() { } /** - * optional uint32 trigger_entity_id = 4; + * optional uint32 trigger_entity_id = 7; * @return whether the triggerEntityId field is set */ public boolean hasTriggerEntityId() { @@ -54,7 +54,7 @@ public boolean hasTriggerEntityId() { } /** - * optional uint32 trigger_entity_id = 4; + * optional uint32 trigger_entity_id = 7; * @return this */ public RefreshTriggerByClientScNotify clearTriggerEntityId() { @@ -64,7 +64,7 @@ public RefreshTriggerByClientScNotify clearTriggerEntityId() { } /** - * optional uint32 trigger_entity_id = 4; + * optional uint32 trigger_entity_id = 7; * @return the triggerEntityId */ public int getTriggerEntityId() { @@ -72,7 +72,7 @@ public int getTriggerEntityId() { } /** - * optional uint32 trigger_entity_id = 4; + * optional uint32 trigger_entity_id = 7; * @param value the triggerEntityId to set * @return this */ @@ -83,7 +83,7 @@ public RefreshTriggerByClientScNotify setTriggerEntityId(final int value) { } /** - * optional string trigger_name = 14; + * optional string trigger_name = 1; * @return whether the triggerName field is set */ public boolean hasTriggerName() { @@ -91,7 +91,7 @@ public boolean hasTriggerName() { } /** - * optional string trigger_name = 14; + * optional string trigger_name = 1; * @return this */ public RefreshTriggerByClientScNotify clearTriggerName() { @@ -101,7 +101,7 @@ public RefreshTriggerByClientScNotify clearTriggerName() { } /** - * optional string trigger_name = 14; + * optional string trigger_name = 1; * @return the triggerName */ public String getTriggerName() { @@ -109,7 +109,7 @@ public String getTriggerName() { } /** - * optional string trigger_name = 14; + * optional string trigger_name = 1; * @return internal {@code Utf8String} representation of triggerName for reading */ public Utf8String getTriggerNameBytes() { @@ -117,7 +117,7 @@ public Utf8String getTriggerNameBytes() { } /** - * optional string trigger_name = 14; + * optional string trigger_name = 1; * @return internal {@code Utf8String} representation of triggerName for modifications */ public Utf8String getMutableTriggerNameBytes() { @@ -126,7 +126,7 @@ public Utf8String getMutableTriggerNameBytes() { } /** - * optional string trigger_name = 14; + * optional string trigger_name = 1; * @param value the triggerName to set * @return this */ @@ -137,7 +137,7 @@ public RefreshTriggerByClientScNotify setTriggerName(final CharSequence value) { } /** - * optional string trigger_name = 14; + * optional string trigger_name = 1; * @param value the triggerName to set * @return this */ @@ -148,7 +148,7 @@ public RefreshTriggerByClientScNotify setTriggerName(final Utf8String value) { } /** - * repeated uint32 trigger_target_id_list = 15; + * repeated uint32 trigger_target_id_list = 5; * @return whether the triggerTargetIdList field is set */ public boolean hasTriggerTargetIdList() { @@ -156,7 +156,7 @@ public boolean hasTriggerTargetIdList() { } /** - * repeated uint32 trigger_target_id_list = 15; + * repeated uint32 trigger_target_id_list = 5; * @return this */ public RefreshTriggerByClientScNotify clearTriggerTargetIdList() { @@ -166,7 +166,7 @@ public RefreshTriggerByClientScNotify clearTriggerTargetIdList() { } /** - * repeated uint32 trigger_target_id_list = 15; + * repeated uint32 trigger_target_id_list = 5; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -180,7 +180,7 @@ public RepeatedInt getTriggerTargetIdList() { } /** - * repeated uint32 trigger_target_id_list = 15; + * repeated uint32 trigger_target_id_list = 5; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -194,7 +194,7 @@ public RepeatedInt getMutableTriggerTargetIdList() { } /** - * repeated uint32 trigger_target_id_list = 15; + * repeated uint32 trigger_target_id_list = 5; * @param value the triggerTargetIdList to add * @return this */ @@ -205,7 +205,7 @@ public RefreshTriggerByClientScNotify addTriggerTargetIdList(final int value) { } /** - * repeated uint32 trigger_target_id_list = 15; + * repeated uint32 trigger_target_id_list = 5; * @param values the triggerTargetIdList to add * @return this */ @@ -288,16 +288,16 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(triggerEntityId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 114); + output.writeRawByte((byte) 10); output.writeStringNoTag(triggerName); } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < triggerTargetIdList.length(); i++) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(triggerTargetIdList.array()[i]); } } @@ -325,25 +325,25 @@ public RefreshTriggerByClientScNotify mergeFrom(final ProtoSource input) throws int tag = input.readTag(); while (true) { switch (tag) { - case 32: { + case 56: { // triggerEntityId triggerEntityId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 114) { + if (tag != 10) { break; } } - case 114: { + case 10: { // triggerName input.readString(triggerName); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 122) { + if (tag != 42) { break; } } - case 122: { + case 42: { // triggerTargetIdList [packed=true] input.readPackedUInt32(triggerTargetIdList, tag); bitField0_ |= 0x00000004; @@ -362,7 +362,7 @@ public RefreshTriggerByClientScNotify mergeFrom(final ProtoSource input) throws tag = input.readTag(); break; } - case 120: { + case 40: { // triggerTargetIdList [packed=false] tag = input.readRepeatedUInt32(triggerTargetIdList, tag); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/RefreshTriggerByClientScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/RefreshTriggerByClientScRspOuterClass.java index 303d185f0..5015395be 100644 --- a/src/generated/main/emu/lunarcore/proto/RefreshTriggerByClientScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RefreshTriggerByClientScRspOuterClass.java @@ -20,22 +20,22 @@ public static final class RefreshTriggerByClientScRsp extends ProtoMessageoptional uint32 retcode = 10; + * optional uint32 trigger_entity_id = 5; */ - private int retcode; + private int triggerEntityId; /** - * optional uint32 trigger_entity_id = 13; + * optional uint32 retcode = 6; */ - private int triggerEntityId; + private int retcode; /** - * optional bool refresh_trigger = 8; + * optional bool refresh_trigger = 11; */ private boolean refreshTrigger; /** - * optional string trigger_name = 12; + * optional string trigger_name = 9; */ private final Utf8String triggerName = Utf8String.newEmptyInstance(); @@ -50,81 +50,81 @@ public static RefreshTriggerByClientScRsp newInstance() { } /** - * optional uint32 retcode = 10; - * @return whether the retcode field is set + * optional uint32 trigger_entity_id = 5; + * @return whether the triggerEntityId field is set */ - public boolean hasRetcode() { + public boolean hasTriggerEntityId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 retcode = 10; + * optional uint32 trigger_entity_id = 5; * @return this */ - public RefreshTriggerByClientScRsp clearRetcode() { + public RefreshTriggerByClientScRsp clearTriggerEntityId() { bitField0_ &= ~0x00000001; - retcode = 0; + triggerEntityId = 0; return this; } /** - * optional uint32 retcode = 10; - * @return the retcode + * optional uint32 trigger_entity_id = 5; + * @return the triggerEntityId */ - public int getRetcode() { - return retcode; + public int getTriggerEntityId() { + return triggerEntityId; } /** - * optional uint32 retcode = 10; - * @param value the retcode to set + * optional uint32 trigger_entity_id = 5; + * @param value the triggerEntityId to set * @return this */ - public RefreshTriggerByClientScRsp setRetcode(final int value) { + public RefreshTriggerByClientScRsp setTriggerEntityId(final int value) { bitField0_ |= 0x00000001; - retcode = value; + triggerEntityId = value; return this; } /** - * optional uint32 trigger_entity_id = 13; - * @return whether the triggerEntityId field is set + * optional uint32 retcode = 6; + * @return whether the retcode field is set */ - public boolean hasTriggerEntityId() { + public boolean hasRetcode() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 trigger_entity_id = 13; + * optional uint32 retcode = 6; * @return this */ - public RefreshTriggerByClientScRsp clearTriggerEntityId() { + public RefreshTriggerByClientScRsp clearRetcode() { bitField0_ &= ~0x00000002; - triggerEntityId = 0; + retcode = 0; return this; } /** - * optional uint32 trigger_entity_id = 13; - * @return the triggerEntityId + * optional uint32 retcode = 6; + * @return the retcode */ - public int getTriggerEntityId() { - return triggerEntityId; + public int getRetcode() { + return retcode; } /** - * optional uint32 trigger_entity_id = 13; - * @param value the triggerEntityId to set + * optional uint32 retcode = 6; + * @param value the retcode to set * @return this */ - public RefreshTriggerByClientScRsp setTriggerEntityId(final int value) { + public RefreshTriggerByClientScRsp setRetcode(final int value) { bitField0_ |= 0x00000002; - triggerEntityId = value; + retcode = value; return this; } /** - * optional bool refresh_trigger = 8; + * optional bool refresh_trigger = 11; * @return whether the refreshTrigger field is set */ public boolean hasRefreshTrigger() { @@ -132,7 +132,7 @@ public boolean hasRefreshTrigger() { } /** - * optional bool refresh_trigger = 8; + * optional bool refresh_trigger = 11; * @return this */ public RefreshTriggerByClientScRsp clearRefreshTrigger() { @@ -142,7 +142,7 @@ public RefreshTriggerByClientScRsp clearRefreshTrigger() { } /** - * optional bool refresh_trigger = 8; + * optional bool refresh_trigger = 11; * @return the refreshTrigger */ public boolean getRefreshTrigger() { @@ -150,7 +150,7 @@ public boolean getRefreshTrigger() { } /** - * optional bool refresh_trigger = 8; + * optional bool refresh_trigger = 11; * @param value the refreshTrigger to set * @return this */ @@ -161,7 +161,7 @@ public RefreshTriggerByClientScRsp setRefreshTrigger(final boolean value) { } /** - * optional string trigger_name = 12; + * optional string trigger_name = 9; * @return whether the triggerName field is set */ public boolean hasTriggerName() { @@ -169,7 +169,7 @@ public boolean hasTriggerName() { } /** - * optional string trigger_name = 12; + * optional string trigger_name = 9; * @return this */ public RefreshTriggerByClientScRsp clearTriggerName() { @@ -179,7 +179,7 @@ public RefreshTriggerByClientScRsp clearTriggerName() { } /** - * optional string trigger_name = 12; + * optional string trigger_name = 9; * @return the triggerName */ public String getTriggerName() { @@ -187,7 +187,7 @@ public String getTriggerName() { } /** - * optional string trigger_name = 12; + * optional string trigger_name = 9; * @return internal {@code Utf8String} representation of triggerName for reading */ public Utf8String getTriggerNameBytes() { @@ -195,7 +195,7 @@ public Utf8String getTriggerNameBytes() { } /** - * optional string trigger_name = 12; + * optional string trigger_name = 9; * @return internal {@code Utf8String} representation of triggerName for modifications */ public Utf8String getMutableTriggerNameBytes() { @@ -204,7 +204,7 @@ public Utf8String getMutableTriggerNameBytes() { } /** - * optional string trigger_name = 12; + * optional string trigger_name = 9; * @param value the triggerName to set * @return this */ @@ -215,7 +215,7 @@ public RefreshTriggerByClientScRsp setTriggerName(final CharSequence value) { } /** - * optional string trigger_name = 12; + * optional string trigger_name = 9; * @param value the triggerName to set * @return this */ @@ -230,8 +230,8 @@ public RefreshTriggerByClientScRsp copyFrom(final RefreshTriggerByClientScRsp ot cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - retcode = other.retcode; triggerEntityId = other.triggerEntityId; + retcode = other.retcode; refreshTrigger = other.refreshTrigger; triggerName.copyFrom(other.triggerName); } @@ -244,12 +244,12 @@ public RefreshTriggerByClientScRsp mergeFrom(final RefreshTriggerByClientScRsp o return this; } cachedSize = -1; - if (other.hasRetcode()) { - setRetcode(other.retcode); - } if (other.hasTriggerEntityId()) { setTriggerEntityId(other.triggerEntityId); } + if (other.hasRetcode()) { + setRetcode(other.retcode); + } if (other.hasRefreshTrigger()) { setRefreshTrigger(other.refreshTrigger); } @@ -266,8 +266,8 @@ public RefreshTriggerByClientScRsp clear() { } cachedSize = -1; bitField0_ = 0; - retcode = 0; triggerEntityId = 0; + retcode = 0; refreshTrigger = false; triggerName.clear(); return this; @@ -294,8 +294,8 @@ public boolean equals(Object o) { } RefreshTriggerByClientScRsp other = (RefreshTriggerByClientScRsp) o; return bitField0_ == other.bitField0_ - && (!hasRetcode() || retcode == other.retcode) && (!hasTriggerEntityId() || triggerEntityId == other.triggerEntityId) + && (!hasRetcode() || retcode == other.retcode) && (!hasRefreshTrigger() || refreshTrigger == other.refreshTrigger) && (!hasTriggerName() || triggerName.equals(other.triggerName)); } @@ -303,19 +303,19 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 80); - output.writeUInt32NoTag(retcode); + output.writeRawByte((byte) 40); + output.writeUInt32NoTag(triggerEntityId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 104); - output.writeUInt32NoTag(triggerEntityId); + output.writeRawByte((byte) 48); + output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 88); output.writeBoolNoTag(refreshTrigger); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 98); + output.writeRawByte((byte) 74); output.writeStringNoTag(triggerName); } } @@ -324,10 +324,10 @@ public void writeTo(final ProtoSink output) throws IOException { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(triggerEntityId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(triggerEntityId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { size += 2; @@ -345,34 +345,34 @@ public RefreshTriggerByClientScRsp mergeFrom(final ProtoSource input) throws IOE int tag = input.readTag(); while (true) { switch (tag) { - case 80: { - // retcode - retcode = input.readUInt32(); + case 40: { + // triggerEntityId + triggerEntityId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 104) { + if (tag != 48) { break; } } - case 104: { - // triggerEntityId - triggerEntityId = input.readUInt32(); + case 48: { + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 64) { + if (tag != 88) { break; } } - case 64: { + case 88: { // refreshTrigger refreshTrigger = input.readBool(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 98) { + if (tag != 74) { break; } } - case 98: { + case 74: { // triggerName input.readString(triggerName); bitField0_ |= 0x00000008; @@ -399,10 +399,10 @@ public RefreshTriggerByClientScRsp mergeFrom(final ProtoSource input) throws IOE public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.triggerEntityId, triggerEntityId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.triggerEntityId, triggerEntityId); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000004) != 0) { output.writeBool(FieldNames.refreshTrigger, refreshTrigger); @@ -420,10 +420,11 @@ public RefreshTriggerByClientScRsp mergeFrom(final JsonSource input) throws IOEx } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case 242025014: + case -2081789648: { + if (input.isAtField(FieldNames.triggerEntityId)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + triggerEntityId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -431,11 +432,10 @@ public RefreshTriggerByClientScRsp mergeFrom(final JsonSource input) throws IOEx } break; } - case 242025014: - case -2081789648: { - if (input.isAtField(FieldNames.triggerEntityId)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - triggerEntityId = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -521,10 +521,10 @@ public RefreshTriggerByClientScRsp create() { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName triggerEntityId = FieldName.forField("triggerEntityId", "trigger_entity_id"); + static final FieldName retcode = FieldName.forField("retcode"); + static final FieldName refreshTrigger = FieldName.forField("refreshTrigger", "refresh_trigger"); static final FieldName triggerName = FieldName.forField("triggerName", "trigger_name"); diff --git a/src/generated/main/emu/lunarcore/proto/RelicArchiveOuterClass.java b/src/generated/main/emu/lunarcore/proto/RelicArchiveOuterClass.java index f6a392e49..a59c059ee 100644 --- a/src/generated/main/emu/lunarcore/proto/RelicArchiveOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RelicArchiveOuterClass.java @@ -24,7 +24,7 @@ public static final class RelicArchive extends ProtoMessage implem private int slot; /** - * optional uint32 relic_id = 12; + * optional uint32 relic_id = 7; */ private int relicId; @@ -76,7 +76,7 @@ public RelicArchive setSlot(final int value) { } /** - * optional uint32 relic_id = 12; + * optional uint32 relic_id = 7; * @return whether the relicId field is set */ public boolean hasRelicId() { @@ -84,7 +84,7 @@ public boolean hasRelicId() { } /** - * optional uint32 relic_id = 12; + * optional uint32 relic_id = 7; * @return this */ public RelicArchive clearRelicId() { @@ -94,7 +94,7 @@ public RelicArchive clearRelicId() { } /** - * optional uint32 relic_id = 12; + * optional uint32 relic_id = 7; * @return the relicId */ public int getRelicId() { @@ -102,7 +102,7 @@ public int getRelicId() { } /** - * optional uint32 relic_id = 12; + * optional uint32 relic_id = 7; * @param value the relicId to set * @return this */ @@ -181,7 +181,7 @@ public void writeTo(final ProtoSink output) throws IOException { output.writeUInt32NoTag(slot); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(relicId); } } @@ -210,11 +210,11 @@ public RelicArchive mergeFrom(final ProtoSource input) throws IOException { slot = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 96) { + if (tag != 56) { break; } } - case 96: { + case 56: { // relicId relicId = input.readUInt32(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/RelicOuterClass.java b/src/generated/main/emu/lunarcore/proto/RelicOuterClass.java index 307d5ed7f..0024c3ada 100644 --- a/src/generated/main/emu/lunarcore/proto/RelicOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RelicOuterClass.java @@ -20,42 +20,42 @@ public static final class Relic extends ProtoMessage implements Cloneable private static final long serialVersionUID = 0L; /** - * optional uint32 exp = 3; + * optional uint32 tid = 2; */ - private int exp; + private int tid; /** - * optional uint32 main_affix_id = 4; + * optional uint32 level = 3; */ - private int mainAffixId; + private int level; /** - * optional uint32 base_avatar_id = 5; + * optional uint32 unique_id = 5; */ - private int baseAvatarId; + private int uniqueId; /** - * optional uint32 unique_id = 9; + * optional uint32 base_avatar_id = 7; */ - private int uniqueId; + private int baseAvatarId; /** - * optional uint32 tid = 12; + * optional uint32 exp = 10; */ - private int tid; + private int exp; /** - * optional uint32 level = 15; + * optional uint32 main_affix_id = 14; */ - private int level; + private int mainAffixId; /** - * optional bool is_protected = 13; + * optional bool is_protected = 11; */ private boolean isProtected; /** - * repeated .RelicAffix sub_affix_list = 10; + * repeated .RelicAffix sub_affix_list = 8; */ private final RepeatedMessage subAffixList = RepeatedMessage.newEmptyInstance(RelicAffixOuterClass.RelicAffix.getFactory()); @@ -70,229 +70,229 @@ public static Relic newInstance() { } /** - * optional uint32 exp = 3; - * @return whether the exp field is set + * optional uint32 tid = 2; + * @return whether the tid field is set */ - public boolean hasExp() { + public boolean hasTid() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 exp = 3; + * optional uint32 tid = 2; * @return this */ - public Relic clearExp() { + public Relic clearTid() { bitField0_ &= ~0x00000001; - exp = 0; + tid = 0; return this; } /** - * optional uint32 exp = 3; - * @return the exp + * optional uint32 tid = 2; + * @return the tid */ - public int getExp() { - return exp; + public int getTid() { + return tid; } /** - * optional uint32 exp = 3; - * @param value the exp to set + * optional uint32 tid = 2; + * @param value the tid to set * @return this */ - public Relic setExp(final int value) { + public Relic setTid(final int value) { bitField0_ |= 0x00000001; - exp = value; + tid = value; return this; } /** - * optional uint32 main_affix_id = 4; - * @return whether the mainAffixId field is set + * optional uint32 level = 3; + * @return whether the level field is set */ - public boolean hasMainAffixId() { + public boolean hasLevel() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 main_affix_id = 4; + * optional uint32 level = 3; * @return this */ - public Relic clearMainAffixId() { + public Relic clearLevel() { bitField0_ &= ~0x00000002; - mainAffixId = 0; + level = 0; return this; } /** - * optional uint32 main_affix_id = 4; - * @return the mainAffixId + * optional uint32 level = 3; + * @return the level */ - public int getMainAffixId() { - return mainAffixId; + public int getLevel() { + return level; } /** - * optional uint32 main_affix_id = 4; - * @param value the mainAffixId to set + * optional uint32 level = 3; + * @param value the level to set * @return this */ - public Relic setMainAffixId(final int value) { + public Relic setLevel(final int value) { bitField0_ |= 0x00000002; - mainAffixId = value; + level = value; return this; } /** - * optional uint32 base_avatar_id = 5; - * @return whether the baseAvatarId field is set + * optional uint32 unique_id = 5; + * @return whether the uniqueId field is set */ - public boolean hasBaseAvatarId() { + public boolean hasUniqueId() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 base_avatar_id = 5; + * optional uint32 unique_id = 5; * @return this */ - public Relic clearBaseAvatarId() { + public Relic clearUniqueId() { bitField0_ &= ~0x00000004; - baseAvatarId = 0; + uniqueId = 0; return this; } /** - * optional uint32 base_avatar_id = 5; - * @return the baseAvatarId + * optional uint32 unique_id = 5; + * @return the uniqueId */ - public int getBaseAvatarId() { - return baseAvatarId; + public int getUniqueId() { + return uniqueId; } /** - * optional uint32 base_avatar_id = 5; - * @param value the baseAvatarId to set + * optional uint32 unique_id = 5; + * @param value the uniqueId to set * @return this */ - public Relic setBaseAvatarId(final int value) { + public Relic setUniqueId(final int value) { bitField0_ |= 0x00000004; - baseAvatarId = value; + uniqueId = value; return this; } /** - * optional uint32 unique_id = 9; - * @return whether the uniqueId field is set + * optional uint32 base_avatar_id = 7; + * @return whether the baseAvatarId field is set */ - public boolean hasUniqueId() { + public boolean hasBaseAvatarId() { return (bitField0_ & 0x00000008) != 0; } /** - * optional uint32 unique_id = 9; + * optional uint32 base_avatar_id = 7; * @return this */ - public Relic clearUniqueId() { + public Relic clearBaseAvatarId() { bitField0_ &= ~0x00000008; - uniqueId = 0; + baseAvatarId = 0; return this; } /** - * optional uint32 unique_id = 9; - * @return the uniqueId + * optional uint32 base_avatar_id = 7; + * @return the baseAvatarId */ - public int getUniqueId() { - return uniqueId; + public int getBaseAvatarId() { + return baseAvatarId; } /** - * optional uint32 unique_id = 9; - * @param value the uniqueId to set + * optional uint32 base_avatar_id = 7; + * @param value the baseAvatarId to set * @return this */ - public Relic setUniqueId(final int value) { + public Relic setBaseAvatarId(final int value) { bitField0_ |= 0x00000008; - uniqueId = value; + baseAvatarId = value; return this; } /** - * optional uint32 tid = 12; - * @return whether the tid field is set + * optional uint32 exp = 10; + * @return whether the exp field is set */ - public boolean hasTid() { + public boolean hasExp() { return (bitField0_ & 0x00000010) != 0; } /** - * optional uint32 tid = 12; + * optional uint32 exp = 10; * @return this */ - public Relic clearTid() { + public Relic clearExp() { bitField0_ &= ~0x00000010; - tid = 0; + exp = 0; return this; } /** - * optional uint32 tid = 12; - * @return the tid + * optional uint32 exp = 10; + * @return the exp */ - public int getTid() { - return tid; + public int getExp() { + return exp; } /** - * optional uint32 tid = 12; - * @param value the tid to set + * optional uint32 exp = 10; + * @param value the exp to set * @return this */ - public Relic setTid(final int value) { + public Relic setExp(final int value) { bitField0_ |= 0x00000010; - tid = value; + exp = value; return this; } /** - * optional uint32 level = 15; - * @return whether the level field is set + * optional uint32 main_affix_id = 14; + * @return whether the mainAffixId field is set */ - public boolean hasLevel() { + public boolean hasMainAffixId() { return (bitField0_ & 0x00000020) != 0; } /** - * optional uint32 level = 15; + * optional uint32 main_affix_id = 14; * @return this */ - public Relic clearLevel() { + public Relic clearMainAffixId() { bitField0_ &= ~0x00000020; - level = 0; + mainAffixId = 0; return this; } /** - * optional uint32 level = 15; - * @return the level + * optional uint32 main_affix_id = 14; + * @return the mainAffixId */ - public int getLevel() { - return level; + public int getMainAffixId() { + return mainAffixId; } /** - * optional uint32 level = 15; - * @param value the level to set + * optional uint32 main_affix_id = 14; + * @param value the mainAffixId to set * @return this */ - public Relic setLevel(final int value) { + public Relic setMainAffixId(final int value) { bitField0_ |= 0x00000020; - level = value; + mainAffixId = value; return this; } /** - * optional bool is_protected = 13; + * optional bool is_protected = 11; * @return whether the isProtected field is set */ public boolean hasIsProtected() { @@ -300,7 +300,7 @@ public boolean hasIsProtected() { } /** - * optional bool is_protected = 13; + * optional bool is_protected = 11; * @return this */ public Relic clearIsProtected() { @@ -310,7 +310,7 @@ public Relic clearIsProtected() { } /** - * optional bool is_protected = 13; + * optional bool is_protected = 11; * @return the isProtected */ public boolean getIsProtected() { @@ -318,7 +318,7 @@ public boolean getIsProtected() { } /** - * optional bool is_protected = 13; + * optional bool is_protected = 11; * @param value the isProtected to set * @return this */ @@ -329,7 +329,7 @@ public Relic setIsProtected(final boolean value) { } /** - * repeated .RelicAffix sub_affix_list = 10; + * repeated .RelicAffix sub_affix_list = 8; * @return whether the subAffixList field is set */ public boolean hasSubAffixList() { @@ -337,7 +337,7 @@ public boolean hasSubAffixList() { } /** - * repeated .RelicAffix sub_affix_list = 10; + * repeated .RelicAffix sub_affix_list = 8; * @return this */ public Relic clearSubAffixList() { @@ -347,7 +347,7 @@ public Relic clearSubAffixList() { } /** - * repeated .RelicAffix sub_affix_list = 10; + * repeated .RelicAffix sub_affix_list = 8; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -361,7 +361,7 @@ public RepeatedMessage getSubAffixList() { } /** - * repeated .RelicAffix sub_affix_list = 10; + * repeated .RelicAffix sub_affix_list = 8; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -375,7 +375,7 @@ public RepeatedMessage getMutableSubAffixList() } /** - * repeated .RelicAffix sub_affix_list = 10; + * repeated .RelicAffix sub_affix_list = 8; * @param value the subAffixList to add * @return this */ @@ -386,7 +386,7 @@ public Relic addSubAffixList(final RelicAffixOuterClass.RelicAffix value) { } /** - * repeated .RelicAffix sub_affix_list = 10; + * repeated .RelicAffix sub_affix_list = 8; * @param values the subAffixList to add * @return this */ @@ -401,12 +401,12 @@ public Relic copyFrom(final Relic other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - exp = other.exp; - mainAffixId = other.mainAffixId; - baseAvatarId = other.baseAvatarId; - uniqueId = other.uniqueId; tid = other.tid; level = other.level; + uniqueId = other.uniqueId; + baseAvatarId = other.baseAvatarId; + exp = other.exp; + mainAffixId = other.mainAffixId; isProtected = other.isProtected; subAffixList.copyFrom(other.subAffixList); } @@ -419,23 +419,23 @@ public Relic mergeFrom(final Relic other) { return this; } cachedSize = -1; - if (other.hasExp()) { - setExp(other.exp); - } - if (other.hasMainAffixId()) { - setMainAffixId(other.mainAffixId); + if (other.hasTid()) { + setTid(other.tid); } - if (other.hasBaseAvatarId()) { - setBaseAvatarId(other.baseAvatarId); + if (other.hasLevel()) { + setLevel(other.level); } if (other.hasUniqueId()) { setUniqueId(other.uniqueId); } - if (other.hasTid()) { - setTid(other.tid); + if (other.hasBaseAvatarId()) { + setBaseAvatarId(other.baseAvatarId); } - if (other.hasLevel()) { - setLevel(other.level); + if (other.hasExp()) { + setExp(other.exp); + } + if (other.hasMainAffixId()) { + setMainAffixId(other.mainAffixId); } if (other.hasIsProtected()) { setIsProtected(other.isProtected); @@ -453,12 +453,12 @@ public Relic clear() { } cachedSize = -1; bitField0_ = 0; - exp = 0; - mainAffixId = 0; - baseAvatarId = 0; - uniqueId = 0; tid = 0; level = 0; + uniqueId = 0; + baseAvatarId = 0; + exp = 0; + mainAffixId = 0; isProtected = false; subAffixList.clear(); return this; @@ -485,12 +485,12 @@ public boolean equals(Object o) { } Relic other = (Relic) o; return bitField0_ == other.bitField0_ - && (!hasExp() || exp == other.exp) - && (!hasMainAffixId() || mainAffixId == other.mainAffixId) - && (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId) - && (!hasUniqueId() || uniqueId == other.uniqueId) && (!hasTid() || tid == other.tid) && (!hasLevel() || level == other.level) + && (!hasUniqueId() || uniqueId == other.uniqueId) + && (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId) + && (!hasExp() || exp == other.exp) + && (!hasMainAffixId() || mainAffixId == other.mainAffixId) && (!hasIsProtected() || isProtected == other.isProtected) && (!hasSubAffixList() || subAffixList.equals(other.subAffixList)); } @@ -498,36 +498,36 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); - output.writeUInt32NoTag(exp); + output.writeRawByte((byte) 16); + output.writeUInt32NoTag(tid); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 32); - output.writeUInt32NoTag(mainAffixId); + output.writeRawByte((byte) 24); + output.writeUInt32NoTag(level); } if ((bitField0_ & 0x00000004) != 0) { output.writeRawByte((byte) 40); - output.writeUInt32NoTag(baseAvatarId); + output.writeUInt32NoTag(uniqueId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 72); - output.writeUInt32NoTag(uniqueId); + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(baseAvatarId); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 96); - output.writeUInt32NoTag(tid); + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(exp); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 120); - output.writeUInt32NoTag(level); + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(mainAffixId); } if ((bitField0_ & 0x00000040) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 88); output.writeBoolNoTag(isProtected); } if ((bitField0_ & 0x00000080) != 0) { for (int i = 0; i < subAffixList.length(); i++) { - output.writeRawByte((byte) 82); + output.writeRawByte((byte) 66); output.writeMessageNoTag(subAffixList.get(i)); } } @@ -537,22 +537,22 @@ public void writeTo(final ProtoSink output) throws IOException { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(exp); + size += 1 + ProtoSink.computeUInt32SizeNoTag(tid); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(mainAffixId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(level); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(uniqueId); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(uniqueId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId); } if ((bitField0_ & 0x00000010) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(tid); + size += 1 + ProtoSink.computeUInt32SizeNoTag(exp); } if ((bitField0_ & 0x00000020) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(level); + size += 1 + ProtoSink.computeUInt32SizeNoTag(mainAffixId); } if ((bitField0_ & 0x00000040) != 0) { size += 2; @@ -570,18 +570,18 @@ public Relic mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { - // exp - exp = input.readUInt32(); + case 16: { + // tid + tid = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 32) { + if (tag != 24) { break; } } - case 32: { - // mainAffixId - mainAffixId = input.readUInt32(); + case 24: { + // level + level = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 40) { @@ -589,51 +589,51 @@ public Relic mergeFrom(final ProtoSource input) throws IOException { } } case 40: { - // baseAvatarId - baseAvatarId = input.readUInt32(); + // uniqueId + uniqueId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 72) { + if (tag != 56) { break; } } - case 72: { - // uniqueId - uniqueId = input.readUInt32(); + case 56: { + // baseAvatarId + baseAvatarId = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 96) { + if (tag != 80) { break; } } - case 96: { - // tid - tid = input.readUInt32(); + case 80: { + // exp + exp = input.readUInt32(); bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 120) { + if (tag != 112) { break; } } - case 120: { - // level - level = input.readUInt32(); + case 112: { + // mainAffixId + mainAffixId = input.readUInt32(); bitField0_ |= 0x00000020; tag = input.readTag(); - if (tag != 104) { + if (tag != 88) { break; } } - case 104: { + case 88: { // isProtected isProtected = input.readBool(); bitField0_ |= 0x00000040; tag = input.readTag(); - if (tag != 82) { + if (tag != 66) { break; } } - case 82: { + case 66: { // subAffixList tag = input.readRepeatedMessage(subAffixList, tag); bitField0_ |= 0x00000080; @@ -659,22 +659,22 @@ public Relic mergeFrom(final ProtoSource input) throws IOException { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.exp, exp); + output.writeUInt32(FieldNames.tid, tid); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.mainAffixId, mainAffixId); + output.writeUInt32(FieldNames.level, level); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId); + output.writeUInt32(FieldNames.uniqueId, uniqueId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.uniqueId, uniqueId); + output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId); } if ((bitField0_ & 0x00000010) != 0) { - output.writeUInt32(FieldNames.tid, tid); + output.writeUInt32(FieldNames.exp, exp); } if ((bitField0_ & 0x00000020) != 0) { - output.writeUInt32(FieldNames.level, level); + output.writeUInt32(FieldNames.mainAffixId, mainAffixId); } if ((bitField0_ & 0x00000040) != 0) { output.writeBool(FieldNames.isProtected, isProtected); @@ -692,10 +692,10 @@ public Relic mergeFrom(final JsonSource input) throws IOException { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 100893: { - if (input.isAtField(FieldNames.exp)) { + case 114831: { + if (input.isAtField(FieldNames.tid)) { if (!input.trySkipNullValue()) { - exp = input.readUInt32(); + tid = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -703,11 +703,10 @@ public Relic mergeFrom(final JsonSource input) throws IOException { } break; } - case -1973876974: - case -1426712144: { - if (input.isAtField(FieldNames.mainAffixId)) { + case 102865796: { + if (input.isAtField(FieldNames.level)) { if (!input.trySkipNullValue()) { - mainAffixId = input.readUInt32(); + level = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -715,11 +714,11 @@ public Relic mergeFrom(final JsonSource input) throws IOException { } break; } - case 118022725: - case -1756826157: { - if (input.isAtField(FieldNames.baseAvatarId)) { + case -294460212: + case -538310583: { + if (input.isAtField(FieldNames.uniqueId)) { if (!input.trySkipNullValue()) { - baseAvatarId = input.readUInt32(); + uniqueId = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -727,11 +726,11 @@ public Relic mergeFrom(final JsonSource input) throws IOException { } break; } - case -294460212: - case -538310583: { - if (input.isAtField(FieldNames.uniqueId)) { + case 118022725: + case -1756826157: { + if (input.isAtField(FieldNames.baseAvatarId)) { if (!input.trySkipNullValue()) { - uniqueId = input.readUInt32(); + baseAvatarId = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -739,10 +738,10 @@ public Relic mergeFrom(final JsonSource input) throws IOException { } break; } - case 114831: { - if (input.isAtField(FieldNames.tid)) { + case 100893: { + if (input.isAtField(FieldNames.exp)) { if (!input.trySkipNullValue()) { - tid = input.readUInt32(); + exp = input.readUInt32(); bitField0_ |= 0x00000010; } } else { @@ -750,10 +749,11 @@ public Relic mergeFrom(final JsonSource input) throws IOException { } break; } - case 102865796: { - if (input.isAtField(FieldNames.level)) { + case -1973876974: + case -1426712144: { + if (input.isAtField(FieldNames.mainAffixId)) { if (!input.trySkipNullValue()) { - level = input.readUInt32(); + mainAffixId = input.readUInt32(); bitField0_ |= 0x00000020; } } else { @@ -837,17 +837,17 @@ public Relic create() { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName exp = FieldName.forField("exp"); - - static final FieldName mainAffixId = FieldName.forField("mainAffixId", "main_affix_id"); + static final FieldName tid = FieldName.forField("tid"); - static final FieldName baseAvatarId = FieldName.forField("baseAvatarId", "base_avatar_id"); + static final FieldName level = FieldName.forField("level"); static final FieldName uniqueId = FieldName.forField("uniqueId", "unique_id"); - static final FieldName tid = FieldName.forField("tid"); + static final FieldName baseAvatarId = FieldName.forField("baseAvatarId", "base_avatar_id"); - static final FieldName level = FieldName.forField("level"); + static final FieldName exp = FieldName.forField("exp"); + + static final FieldName mainAffixId = FieldName.forField("mainAffixId", "main_affix_id"); static final FieldName isProtected = FieldName.forField("isProtected", "is_protected"); diff --git a/src/generated/main/emu/lunarcore/proto/RelicParamOuterClass.java b/src/generated/main/emu/lunarcore/proto/RelicParamOuterClass.java index 5bbbbf6b8..c2a496a51 100644 --- a/src/generated/main/emu/lunarcore/proto/RelicParamOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RelicParamOuterClass.java @@ -19,12 +19,12 @@ public static final class RelicParam extends ProtoMessage implements private static final long serialVersionUID = 0L; /** - * optional uint32 slot = 3; + * optional uint32 slot = 8; */ private int slot; /** - * optional uint32 relic_unique_id = 15; + * optional uint32 relic_unique_id = 13; */ private int relicUniqueId; @@ -39,7 +39,7 @@ public static RelicParam newInstance() { } /** - * optional uint32 slot = 3; + * optional uint32 slot = 8; * @return whether the slot field is set */ public boolean hasSlot() { @@ -47,7 +47,7 @@ public boolean hasSlot() { } /** - * optional uint32 slot = 3; + * optional uint32 slot = 8; * @return this */ public RelicParam clearSlot() { @@ -57,7 +57,7 @@ public RelicParam clearSlot() { } /** - * optional uint32 slot = 3; + * optional uint32 slot = 8; * @return the slot */ public int getSlot() { @@ -65,7 +65,7 @@ public int getSlot() { } /** - * optional uint32 slot = 3; + * optional uint32 slot = 8; * @param value the slot to set * @return this */ @@ -76,7 +76,7 @@ public RelicParam setSlot(final int value) { } /** - * optional uint32 relic_unique_id = 15; + * optional uint32 relic_unique_id = 13; * @return whether the relicUniqueId field is set */ public boolean hasRelicUniqueId() { @@ -84,7 +84,7 @@ public boolean hasRelicUniqueId() { } /** - * optional uint32 relic_unique_id = 15; + * optional uint32 relic_unique_id = 13; * @return this */ public RelicParam clearRelicUniqueId() { @@ -94,7 +94,7 @@ public RelicParam clearRelicUniqueId() { } /** - * optional uint32 relic_unique_id = 15; + * optional uint32 relic_unique_id = 13; * @return the relicUniqueId */ public int getRelicUniqueId() { @@ -102,7 +102,7 @@ public int getRelicUniqueId() { } /** - * optional uint32 relic_unique_id = 15; + * optional uint32 relic_unique_id = 13; * @param value the relicUniqueId to set * @return this */ @@ -177,11 +177,11 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(slot); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(relicUniqueId); } } @@ -205,16 +205,16 @@ public RelicParam mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { + case 64: { // slot slot = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 120) { + if (tag != 104) { break; } } - case 120: { + case 104: { // relicUniqueId relicUniqueId = input.readUInt32(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/ReplaceLineupCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/ReplaceLineupCsReqOuterClass.java index b24b0ac2c..84635cf3c 100644 --- a/src/generated/main/emu/lunarcore/proto/ReplaceLineupCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ReplaceLineupCsReqOuterClass.java @@ -20,19 +20,19 @@ public static final class ReplaceLineupCsReq extends ProtoMessageoptional uint32 index = 9; + * optional uint32 plane_id = 3; */ - private int index; + private int planeId; /** - * optional uint32 leader_slot = 10; + * optional uint32 index = 7; */ - private int leaderSlot; + private int index; /** - * optional uint32 plane_id = 12; + * optional uint32 leader_slot = 14; */ - private int planeId; + private int leaderSlot; /** * optional .ExtraLineupType extra_lineup_type = 4; @@ -40,12 +40,12 @@ public static final class ReplaceLineupCsReq extends ProtoMessageoptional bool is_virtual = 5; + * optional bool is_virtual = 8; */ private boolean isVirtual; /** - * repeated .LineupSlotData slots = 11; + * repeated .LineupSlotData slots = 1; */ private final RepeatedMessage slots = RepeatedMessage.newEmptyInstance(LineupSlotDataOuterClass.LineupSlotData.getFactory()); @@ -60,113 +60,113 @@ public static ReplaceLineupCsReq newInstance() { } /** - * optional uint32 index = 9; - * @return whether the index field is set + * optional uint32 plane_id = 3; + * @return whether the planeId field is set */ - public boolean hasIndex() { + public boolean hasPlaneId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 index = 9; + * optional uint32 plane_id = 3; * @return this */ - public ReplaceLineupCsReq clearIndex() { + public ReplaceLineupCsReq clearPlaneId() { bitField0_ &= ~0x00000001; - index = 0; + planeId = 0; return this; } /** - * optional uint32 index = 9; - * @return the index + * optional uint32 plane_id = 3; + * @return the planeId */ - public int getIndex() { - return index; + public int getPlaneId() { + return planeId; } /** - * optional uint32 index = 9; - * @param value the index to set + * optional uint32 plane_id = 3; + * @param value the planeId to set * @return this */ - public ReplaceLineupCsReq setIndex(final int value) { + public ReplaceLineupCsReq setPlaneId(final int value) { bitField0_ |= 0x00000001; - index = value; + planeId = value; return this; } /** - * optional uint32 leader_slot = 10; - * @return whether the leaderSlot field is set + * optional uint32 index = 7; + * @return whether the index field is set */ - public boolean hasLeaderSlot() { + public boolean hasIndex() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 leader_slot = 10; + * optional uint32 index = 7; * @return this */ - public ReplaceLineupCsReq clearLeaderSlot() { + public ReplaceLineupCsReq clearIndex() { bitField0_ &= ~0x00000002; - leaderSlot = 0; + index = 0; return this; } /** - * optional uint32 leader_slot = 10; - * @return the leaderSlot + * optional uint32 index = 7; + * @return the index */ - public int getLeaderSlot() { - return leaderSlot; + public int getIndex() { + return index; } /** - * optional uint32 leader_slot = 10; - * @param value the leaderSlot to set + * optional uint32 index = 7; + * @param value the index to set * @return this */ - public ReplaceLineupCsReq setLeaderSlot(final int value) { + public ReplaceLineupCsReq setIndex(final int value) { bitField0_ |= 0x00000002; - leaderSlot = value; + index = value; return this; } /** - * optional uint32 plane_id = 12; - * @return whether the planeId field is set + * optional uint32 leader_slot = 14; + * @return whether the leaderSlot field is set */ - public boolean hasPlaneId() { + public boolean hasLeaderSlot() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 plane_id = 12; + * optional uint32 leader_slot = 14; * @return this */ - public ReplaceLineupCsReq clearPlaneId() { + public ReplaceLineupCsReq clearLeaderSlot() { bitField0_ &= ~0x00000004; - planeId = 0; + leaderSlot = 0; return this; } /** - * optional uint32 plane_id = 12; - * @return the planeId + * optional uint32 leader_slot = 14; + * @return the leaderSlot */ - public int getPlaneId() { - return planeId; + public int getLeaderSlot() { + return leaderSlot; } /** - * optional uint32 plane_id = 12; - * @param value the planeId to set + * optional uint32 leader_slot = 14; + * @param value the leaderSlot to set * @return this */ - public ReplaceLineupCsReq setPlaneId(final int value) { + public ReplaceLineupCsReq setLeaderSlot(final int value) { bitField0_ |= 0x00000004; - planeId = value; + leaderSlot = value; return this; } @@ -234,7 +234,7 @@ public ReplaceLineupCsReq setExtraLineupType( } /** - * optional bool is_virtual = 5; + * optional bool is_virtual = 8; * @return whether the isVirtual field is set */ public boolean hasIsVirtual() { @@ -242,7 +242,7 @@ public boolean hasIsVirtual() { } /** - * optional bool is_virtual = 5; + * optional bool is_virtual = 8; * @return this */ public ReplaceLineupCsReq clearIsVirtual() { @@ -252,7 +252,7 @@ public ReplaceLineupCsReq clearIsVirtual() { } /** - * optional bool is_virtual = 5; + * optional bool is_virtual = 8; * @return the isVirtual */ public boolean getIsVirtual() { @@ -260,7 +260,7 @@ public boolean getIsVirtual() { } /** - * optional bool is_virtual = 5; + * optional bool is_virtual = 8; * @param value the isVirtual to set * @return this */ @@ -271,7 +271,7 @@ public ReplaceLineupCsReq setIsVirtual(final boolean value) { } /** - * repeated .LineupSlotData slots = 11; + * repeated .LineupSlotData slots = 1; * @return whether the slots field is set */ public boolean hasSlots() { @@ -279,7 +279,7 @@ public boolean hasSlots() { } /** - * repeated .LineupSlotData slots = 11; + * repeated .LineupSlotData slots = 1; * @return this */ public ReplaceLineupCsReq clearSlots() { @@ -289,7 +289,7 @@ public ReplaceLineupCsReq clearSlots() { } /** - * repeated .LineupSlotData slots = 11; + * repeated .LineupSlotData slots = 1; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -303,7 +303,7 @@ public RepeatedMessage getSlots() { } /** - * repeated .LineupSlotData slots = 11; + * repeated .LineupSlotData slots = 1; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -317,7 +317,7 @@ public RepeatedMessage getMutableSlots( } /** - * repeated .LineupSlotData slots = 11; + * repeated .LineupSlotData slots = 1; * @param value the slots to add * @return this */ @@ -328,7 +328,7 @@ public ReplaceLineupCsReq addSlots(final LineupSlotDataOuterClass.LineupSlotData } /** - * repeated .LineupSlotData slots = 11; + * repeated .LineupSlotData slots = 1; * @param values the slots to add * @return this */ @@ -343,9 +343,9 @@ public ReplaceLineupCsReq copyFrom(final ReplaceLineupCsReq other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; + planeId = other.planeId; index = other.index; leaderSlot = other.leaderSlot; - planeId = other.planeId; extraLineupType = other.extraLineupType; isVirtual = other.isVirtual; slots.copyFrom(other.slots); @@ -359,15 +359,15 @@ public ReplaceLineupCsReq mergeFrom(final ReplaceLineupCsReq other) { return this; } cachedSize = -1; + if (other.hasPlaneId()) { + setPlaneId(other.planeId); + } if (other.hasIndex()) { setIndex(other.index); } if (other.hasLeaderSlot()) { setLeaderSlot(other.leaderSlot); } - if (other.hasPlaneId()) { - setPlaneId(other.planeId); - } if (other.hasExtraLineupType()) { setExtraLineupTypeValue(other.extraLineupType); } @@ -387,9 +387,9 @@ public ReplaceLineupCsReq clear() { } cachedSize = -1; bitField0_ = 0; + planeId = 0; index = 0; leaderSlot = 0; - planeId = 0; extraLineupType = 0; isVirtual = false; slots.clear(); @@ -417,9 +417,9 @@ public boolean equals(Object o) { } ReplaceLineupCsReq other = (ReplaceLineupCsReq) o; return bitField0_ == other.bitField0_ + && (!hasPlaneId() || planeId == other.planeId) && (!hasIndex() || index == other.index) && (!hasLeaderSlot() || leaderSlot == other.leaderSlot) - && (!hasPlaneId() || planeId == other.planeId) && (!hasExtraLineupType() || extraLineupType == other.extraLineupType) && (!hasIsVirtual() || isVirtual == other.isVirtual) && (!hasSlots() || slots.equals(other.slots)); @@ -428,28 +428,28 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 72); - output.writeUInt32NoTag(index); + output.writeRawByte((byte) 24); + output.writeUInt32NoTag(planeId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 80); - output.writeUInt32NoTag(leaderSlot); + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(index); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 96); - output.writeUInt32NoTag(planeId); + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(leaderSlot); } if ((bitField0_ & 0x00000008) != 0) { output.writeRawByte((byte) 32); output.writeEnumNoTag(extraLineupType); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 64); output.writeBoolNoTag(isVirtual); } if ((bitField0_ & 0x00000020) != 0) { for (int i = 0; i < slots.length(); i++) { - output.writeRawByte((byte) 90); + output.writeRawByte((byte) 10); output.writeMessageNoTag(slots.get(i)); } } @@ -459,13 +459,13 @@ public void writeTo(final ProtoSink output) throws IOException { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(index); + size += 1 + ProtoSink.computeUInt32SizeNoTag(planeId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(leaderSlot); + size += 1 + ProtoSink.computeUInt32SizeNoTag(index); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(planeId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(leaderSlot); } if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeEnumSizeNoTag(extraLineupType); @@ -486,27 +486,27 @@ public ReplaceLineupCsReq mergeFrom(final ProtoSource input) throws IOException int tag = input.readTag(); while (true) { switch (tag) { - case 72: { - // index - index = input.readUInt32(); + case 24: { + // planeId + planeId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 80) { + if (tag != 56) { break; } } - case 80: { - // leaderSlot - leaderSlot = input.readUInt32(); + case 56: { + // index + index = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 96) { + if (tag != 112) { break; } } - case 96: { - // planeId - planeId = input.readUInt32(); + case 112: { + // leaderSlot + leaderSlot = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 32) { @@ -521,20 +521,20 @@ public ReplaceLineupCsReq mergeFrom(final ProtoSource input) throws IOException bitField0_ |= 0x00000008; } tag = input.readTag(); - if (tag != 40) { + if (tag != 64) { break; } } - case 40: { + case 64: { // isVirtual isVirtual = input.readBool(); bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 90) { + if (tag != 10) { break; } } - case 90: { + case 10: { // slots tag = input.readRepeatedMessage(slots, tag); bitField0_ |= 0x00000020; @@ -560,13 +560,13 @@ public ReplaceLineupCsReq mergeFrom(final ProtoSource input) throws IOException public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.index, index); + output.writeUInt32(FieldNames.planeId, planeId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.leaderSlot, leaderSlot); + output.writeUInt32(FieldNames.index, index); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.planeId, planeId); + output.writeUInt32(FieldNames.leaderSlot, leaderSlot); } if ((bitField0_ & 0x00000008) != 0) { output.writeEnum(FieldNames.extraLineupType, extraLineupType, ExtraLineupTypeOuterClass.ExtraLineupType.converter()); @@ -587,10 +587,11 @@ public ReplaceLineupCsReq mergeFrom(final JsonSource input) throws IOException { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 100346066: { - if (input.isAtField(FieldNames.index)) { + case -493896553: + case 1869097438: { + if (input.isAtField(FieldNames.planeId)) { if (!input.trySkipNullValue()) { - index = input.readUInt32(); + planeId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -598,11 +599,10 @@ public ReplaceLineupCsReq mergeFrom(final JsonSource input) throws IOException { } break; } - case 1191442087: - case -1708713100: { - if (input.isAtField(FieldNames.leaderSlot)) { + case 100346066: { + if (input.isAtField(FieldNames.index)) { if (!input.trySkipNullValue()) { - leaderSlot = input.readUInt32(); + index = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -610,11 +610,11 @@ public ReplaceLineupCsReq mergeFrom(final JsonSource input) throws IOException { } break; } - case -493896553: - case 1869097438: { - if (input.isAtField(FieldNames.planeId)) { + case 1191442087: + case -1708713100: { + if (input.isAtField(FieldNames.leaderSlot)) { if (!input.trySkipNullValue()) { - planeId = input.readUInt32(); + leaderSlot = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -715,12 +715,12 @@ public ReplaceLineupCsReq create() { * Contains name constants used for serializing JSON */ static class FieldNames { + static final FieldName planeId = FieldName.forField("planeId", "plane_id"); + static final FieldName index = FieldName.forField("index"); static final FieldName leaderSlot = FieldName.forField("leaderSlot", "leader_slot"); - static final FieldName planeId = FieldName.forField("planeId", "plane_id"); - static final FieldName extraLineupType = FieldName.forField("extraLineupType", "extra_lineup_type"); static final FieldName isVirtual = FieldName.forField("isVirtual", "is_virtual"); diff --git a/src/generated/main/emu/lunarcore/proto/ReserveStaminaExchangeCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/ReserveStaminaExchangeCsReqOuterClass.java index e476f3fd6..4b55217ba 100644 --- a/src/generated/main/emu/lunarcore/proto/ReserveStaminaExchangeCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ReserveStaminaExchangeCsReqOuterClass.java @@ -19,7 +19,7 @@ public static final class ReserveStaminaExchangeCsReq extends ProtoMessageoptional uint32 num = 7; + * optional uint32 num = 15; */ private int num; @@ -34,7 +34,7 @@ public static ReserveStaminaExchangeCsReq newInstance() { } /** - * optional uint32 num = 7; + * optional uint32 num = 15; * @return whether the num field is set */ public boolean hasNum() { @@ -42,7 +42,7 @@ public boolean hasNum() { } /** - * optional uint32 num = 7; + * optional uint32 num = 15; * @return this */ public ReserveStaminaExchangeCsReq clearNum() { @@ -52,7 +52,7 @@ public ReserveStaminaExchangeCsReq clearNum() { } /** - * optional uint32 num = 7; + * optional uint32 num = 15; * @return the num */ public int getNum() { @@ -60,7 +60,7 @@ public int getNum() { } /** - * optional uint32 num = 7; + * optional uint32 num = 15; * @param value the num to set * @return this */ @@ -129,7 +129,7 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(num); } } @@ -150,7 +150,7 @@ public ReserveStaminaExchangeCsReq mergeFrom(final ProtoSource input) throws IOE int tag = input.readTag(); while (true) { switch (tag) { - case 56: { + case 120: { // num num = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/ReserveStaminaExchangeScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/ReserveStaminaExchangeScRspOuterClass.java index 0a5cdfdf1..b6dbb4836 100644 --- a/src/generated/main/emu/lunarcore/proto/ReserveStaminaExchangeScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ReserveStaminaExchangeScRspOuterClass.java @@ -19,12 +19,12 @@ public static final class ReserveStaminaExchangeScRsp extends ProtoMessageoptional uint32 retcode = 3; + * optional uint32 retcode = 5; */ private int retcode; /** - * optional uint32 num = 4; + * optional uint32 num = 9; */ private int num; @@ -39,7 +39,7 @@ public static ReserveStaminaExchangeScRsp newInstance() { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 5; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public boolean hasRetcode() { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 5; * @return this */ public ReserveStaminaExchangeScRsp clearRetcode() { @@ -57,7 +57,7 @@ public ReserveStaminaExchangeScRsp clearRetcode() { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 5; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public int getRetcode() { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 5; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public ReserveStaminaExchangeScRsp setRetcode(final int value) { } /** - * optional uint32 num = 4; + * optional uint32 num = 9; * @return whether the num field is set */ public boolean hasNum() { @@ -84,7 +84,7 @@ public boolean hasNum() { } /** - * optional uint32 num = 4; + * optional uint32 num = 9; * @return this */ public ReserveStaminaExchangeScRsp clearNum() { @@ -94,7 +94,7 @@ public ReserveStaminaExchangeScRsp clearNum() { } /** - * optional uint32 num = 4; + * optional uint32 num = 9; * @return the num */ public int getNum() { @@ -102,7 +102,7 @@ public int getNum() { } /** - * optional uint32 num = 4; + * optional uint32 num = 9; * @param value the num to set * @return this */ @@ -177,11 +177,11 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(num); } } @@ -205,16 +205,16 @@ public ReserveStaminaExchangeScRsp mergeFrom(final ProtoSource input) throws IOE int tag = input.readTag(); while (true) { switch (tag) { - case 24: { + case 40: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 32) { + if (tag != 72) { break; } } - case 32: { + case 72: { // num num = input.readUInt32(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/RevcMsgScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/RevcMsgScNotifyOuterClass.java index d87098354..e23ba6b99 100644 --- a/src/generated/main/emu/lunarcore/proto/RevcMsgScNotifyOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RevcMsgScNotifyOuterClass.java @@ -20,9 +20,9 @@ public static final class RevcMsgScNotify extends ProtoMessage private static final long serialVersionUID = 0L; /** - * optional uint32 emote = 2; + * optional uint32 from_uid = 4; */ - private int emote; + private int fromUid; /** * optional uint32 to_uid = 11; @@ -30,22 +30,22 @@ public static final class RevcMsgScNotify extends ProtoMessage private int toUid; /** - * optional uint32 from_uid = 15; + * optional uint32 emote = 14; */ - private int fromUid; + private int emote; /** - * optional .ChatType chat_type = 1; + * optional .ChatType chat_type = 13; */ private int chatType; /** - * optional .MsgType msg_type = 12; + * optional .MsgType msg_type = 15; */ private int msgType; /** - * optional string text = 4; + * optional string text = 8; */ private final Utf8String text = Utf8String.newEmptyInstance(); @@ -60,39 +60,39 @@ public static RevcMsgScNotify newInstance() { } /** - * optional uint32 emote = 2; - * @return whether the emote field is set + * optional uint32 from_uid = 4; + * @return whether the fromUid field is set */ - public boolean hasEmote() { + public boolean hasFromUid() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 emote = 2; + * optional uint32 from_uid = 4; * @return this */ - public RevcMsgScNotify clearEmote() { + public RevcMsgScNotify clearFromUid() { bitField0_ &= ~0x00000001; - emote = 0; + fromUid = 0; return this; } /** - * optional uint32 emote = 2; - * @return the emote + * optional uint32 from_uid = 4; + * @return the fromUid */ - public int getEmote() { - return emote; + public int getFromUid() { + return fromUid; } /** - * optional uint32 emote = 2; - * @param value the emote to set + * optional uint32 from_uid = 4; + * @param value the fromUid to set * @return this */ - public RevcMsgScNotify setEmote(final int value) { + public RevcMsgScNotify setFromUid(final int value) { bitField0_ |= 0x00000001; - emote = value; + fromUid = value; return this; } @@ -134,44 +134,44 @@ public RevcMsgScNotify setToUid(final int value) { } /** - * optional uint32 from_uid = 15; - * @return whether the fromUid field is set + * optional uint32 emote = 14; + * @return whether the emote field is set */ - public boolean hasFromUid() { + public boolean hasEmote() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 from_uid = 15; + * optional uint32 emote = 14; * @return this */ - public RevcMsgScNotify clearFromUid() { + public RevcMsgScNotify clearEmote() { bitField0_ &= ~0x00000004; - fromUid = 0; + emote = 0; return this; } /** - * optional uint32 from_uid = 15; - * @return the fromUid + * optional uint32 emote = 14; + * @return the emote */ - public int getFromUid() { - return fromUid; + public int getEmote() { + return emote; } /** - * optional uint32 from_uid = 15; - * @param value the fromUid to set + * optional uint32 emote = 14; + * @param value the emote to set * @return this */ - public RevcMsgScNotify setFromUid(final int value) { + public RevcMsgScNotify setEmote(final int value) { bitField0_ |= 0x00000004; - fromUid = value; + emote = value; return this; } /** - * optional .ChatType chat_type = 1; + * optional .ChatType chat_type = 13; * @return whether the chatType field is set */ public boolean hasChatType() { @@ -179,7 +179,7 @@ public boolean hasChatType() { } /** - * optional .ChatType chat_type = 1; + * optional .ChatType chat_type = 13; * @return this */ public RevcMsgScNotify clearChatType() { @@ -189,7 +189,7 @@ public RevcMsgScNotify clearChatType() { } /** - * optional .ChatType chat_type = 1; + * optional .ChatType chat_type = 13; * @return the chatType */ public ChatTypeOuterClass.ChatType getChatType() { @@ -222,7 +222,7 @@ public RevcMsgScNotify setChatTypeValue(final int value) { } /** - * optional .ChatType chat_type = 1; + * optional .ChatType chat_type = 13; * @param value the chatType to set * @return this */ @@ -233,7 +233,7 @@ public RevcMsgScNotify setChatType(final ChatTypeOuterClass.ChatType value) { } /** - * optional .MsgType msg_type = 12; + * optional .MsgType msg_type = 15; * @return whether the msgType field is set */ public boolean hasMsgType() { @@ -241,7 +241,7 @@ public boolean hasMsgType() { } /** - * optional .MsgType msg_type = 12; + * optional .MsgType msg_type = 15; * @return this */ public RevcMsgScNotify clearMsgType() { @@ -251,7 +251,7 @@ public RevcMsgScNotify clearMsgType() { } /** - * optional .MsgType msg_type = 12; + * optional .MsgType msg_type = 15; * @return the msgType */ public MsgTypeOuterClass.MsgType getMsgType() { @@ -284,7 +284,7 @@ public RevcMsgScNotify setMsgTypeValue(final int value) { } /** - * optional .MsgType msg_type = 12; + * optional .MsgType msg_type = 15; * @param value the msgType to set * @return this */ @@ -295,7 +295,7 @@ public RevcMsgScNotify setMsgType(final MsgTypeOuterClass.MsgType value) { } /** - * optional string text = 4; + * optional string text = 8; * @return whether the text field is set */ public boolean hasText() { @@ -303,7 +303,7 @@ public boolean hasText() { } /** - * optional string text = 4; + * optional string text = 8; * @return this */ public RevcMsgScNotify clearText() { @@ -313,7 +313,7 @@ public RevcMsgScNotify clearText() { } /** - * optional string text = 4; + * optional string text = 8; * @return the text */ public String getText() { @@ -321,7 +321,7 @@ public String getText() { } /** - * optional string text = 4; + * optional string text = 8; * @return internal {@code Utf8String} representation of text for reading */ public Utf8String getTextBytes() { @@ -329,7 +329,7 @@ public Utf8String getTextBytes() { } /** - * optional string text = 4; + * optional string text = 8; * @return internal {@code Utf8String} representation of text for modifications */ public Utf8String getMutableTextBytes() { @@ -338,7 +338,7 @@ public Utf8String getMutableTextBytes() { } /** - * optional string text = 4; + * optional string text = 8; * @param value the text to set * @return this */ @@ -349,7 +349,7 @@ public RevcMsgScNotify setText(final CharSequence value) { } /** - * optional string text = 4; + * optional string text = 8; * @param value the text to set * @return this */ @@ -364,9 +364,9 @@ public RevcMsgScNotify copyFrom(final RevcMsgScNotify other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - emote = other.emote; - toUid = other.toUid; fromUid = other.fromUid; + toUid = other.toUid; + emote = other.emote; chatType = other.chatType; msgType = other.msgType; text.copyFrom(other.text); @@ -380,14 +380,14 @@ public RevcMsgScNotify mergeFrom(final RevcMsgScNotify other) { return this; } cachedSize = -1; - if (other.hasEmote()) { - setEmote(other.emote); + if (other.hasFromUid()) { + setFromUid(other.fromUid); } if (other.hasToUid()) { setToUid(other.toUid); } - if (other.hasFromUid()) { - setFromUid(other.fromUid); + if (other.hasEmote()) { + setEmote(other.emote); } if (other.hasChatType()) { setChatTypeValue(other.chatType); @@ -408,9 +408,9 @@ public RevcMsgScNotify clear() { } cachedSize = -1; bitField0_ = 0; - emote = 0; - toUid = 0; fromUid = 0; + toUid = 0; + emote = 0; chatType = 0; msgType = 0; text.clear(); @@ -438,9 +438,9 @@ public boolean equals(Object o) { } RevcMsgScNotify other = (RevcMsgScNotify) o; return bitField0_ == other.bitField0_ - && (!hasEmote() || emote == other.emote) - && (!hasToUid() || toUid == other.toUid) && (!hasFromUid() || fromUid == other.fromUid) + && (!hasToUid() || toUid == other.toUid) + && (!hasEmote() || emote == other.emote) && (!hasChatType() || chatType == other.chatType) && (!hasMsgType() || msgType == other.msgType) && (!hasText() || text.equals(other.text)); @@ -449,27 +449,27 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); - output.writeUInt32NoTag(emote); + output.writeRawByte((byte) 32); + output.writeUInt32NoTag(fromUid); } if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 88); output.writeUInt32NoTag(toUid); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 120); - output.writeUInt32NoTag(fromUid); + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(emote); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 104); output.writeEnumNoTag(chatType); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 120); output.writeEnumNoTag(msgType); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 34); + output.writeRawByte((byte) 66); output.writeStringNoTag(text); } } @@ -478,13 +478,13 @@ public void writeTo(final ProtoSink output) throws IOException { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(emote); + size += 1 + ProtoSink.computeUInt32SizeNoTag(fromUid); } if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(toUid); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(fromUid); + size += 1 + ProtoSink.computeUInt32SizeNoTag(emote); } if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeEnumSizeNoTag(chatType); @@ -505,9 +505,9 @@ public RevcMsgScNotify mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { - // emote - emote = input.readUInt32(); + case 32: { + // fromUid + fromUid = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 88) { @@ -519,20 +519,20 @@ public RevcMsgScNotify mergeFrom(final ProtoSource input) throws IOException { toUid = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 120) { + if (tag != 112) { break; } } - case 120: { - // fromUid - fromUid = input.readUInt32(); + case 112: { + // emote + emote = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 8) { + if (tag != 104) { break; } } - case 8: { + case 104: { // chatType final int value = input.readInt32(); if (ChatTypeOuterClass.ChatType.forNumber(value) != null) { @@ -540,11 +540,11 @@ public RevcMsgScNotify mergeFrom(final ProtoSource input) throws IOException { bitField0_ |= 0x00000008; } tag = input.readTag(); - if (tag != 96) { + if (tag != 120) { break; } } - case 96: { + case 120: { // msgType final int value = input.readInt32(); if (MsgTypeOuterClass.MsgType.forNumber(value) != null) { @@ -552,11 +552,11 @@ public RevcMsgScNotify mergeFrom(final ProtoSource input) throws IOException { bitField0_ |= 0x00000010; } tag = input.readTag(); - if (tag != 34) { + if (tag != 66) { break; } } - case 34: { + case 66: { // text input.readString(text); bitField0_ |= 0x00000020; @@ -583,13 +583,13 @@ public RevcMsgScNotify mergeFrom(final ProtoSource input) throws IOException { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.emote, emote); + output.writeUInt32(FieldNames.fromUid, fromUid); } if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.toUid, toUid); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.fromUid, fromUid); + output.writeUInt32(FieldNames.emote, emote); } if ((bitField0_ & 0x00000008) != 0) { output.writeEnum(FieldNames.chatType, chatType, ChatTypeOuterClass.ChatType.converter()); @@ -610,10 +610,11 @@ public RevcMsgScNotify mergeFrom(final JsonSource input) throws IOException { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 96633208: { - if (input.isAtField(FieldNames.emote)) { + case -594338746: + case -1244322245: { + if (input.isAtField(FieldNames.fromUid)) { if (!input.trySkipNullValue()) { - emote = input.readUInt32(); + fromUid = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -633,11 +634,10 @@ public RevcMsgScNotify mergeFrom(final JsonSource input) throws IOException { } break; } - case -594338746: - case -1244322245: { - if (input.isAtField(FieldNames.fromUid)) { + case 96633208: { + if (input.isAtField(FieldNames.emote)) { if (!input.trySkipNullValue()) { - fromUid = input.readUInt32(); + emote = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -743,11 +743,11 @@ public RevcMsgScNotify create() { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName emote = FieldName.forField("emote"); + static final FieldName fromUid = FieldName.forField("fromUid", "from_uid"); static final FieldName toUid = FieldName.forField("toUid", "to_uid"); - static final FieldName fromUid = FieldName.forField("fromUid", "from_uid"); + static final FieldName emote = FieldName.forField("emote"); static final FieldName chatType = FieldName.forField("chatType", "chat_type"); diff --git a/src/generated/main/emu/lunarcore/proto/RogueAeonInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueAeonInfoOuterClass.java index 082e04b11..a3d683ed4 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueAeonInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueAeonInfoOuterClass.java @@ -20,16 +20,28 @@ public static final class RogueAeonInfo extends ProtoMessage impl private static final long serialVersionUID = 0L; /** - * optional uint32 unlock_aeon_enhance_num = 14; + * 
+     *  3
+     *
+ * + * optional uint32 JPEBPGIEGPO = 14; */ - private int unlockAeonEnhanceNum; + private int jPEBPGIEGPO; /** + * 
+     *  9
+     *
+ * * optional uint32 unlock_aeon_num = 15; */ private int unlockAeonNum; /** + * 
+     *  guess
+     *
+ * * optional bool is_unlocked = 1; */ private boolean isUnlocked; @@ -50,43 +62,63 @@ public static RogueAeonInfo newInstance() { } /** - * optional uint32 unlock_aeon_enhance_num = 14; - * @return whether the unlockAeonEnhanceNum field is set + * 
+     *  3
+     *
+ * + * optional uint32 JPEBPGIEGPO = 14; + * @return whether the jPEBPGIEGPO field is set */ - public boolean hasUnlockAeonEnhanceNum() { + public boolean hasJPEBPGIEGPO() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 unlock_aeon_enhance_num = 14; + * 
+     *  3
+     *
+ * + * optional uint32 JPEBPGIEGPO = 14; * @return this */ - public RogueAeonInfo clearUnlockAeonEnhanceNum() { + public RogueAeonInfo clearJPEBPGIEGPO() { bitField0_ &= ~0x00000001; - unlockAeonEnhanceNum = 0; + jPEBPGIEGPO = 0; return this; } /** - * optional uint32 unlock_aeon_enhance_num = 14; - * @return the unlockAeonEnhanceNum + * 
+     *  3
+     *
+ * + * optional uint32 JPEBPGIEGPO = 14; + * @return the jPEBPGIEGPO */ - public int getUnlockAeonEnhanceNum() { - return unlockAeonEnhanceNum; + public int getJPEBPGIEGPO() { + return jPEBPGIEGPO; } /** - * optional uint32 unlock_aeon_enhance_num = 14; - * @param value the unlockAeonEnhanceNum to set + * 
+     *  3
+     *
+ * + * optional uint32 JPEBPGIEGPO = 14; + * @param value the jPEBPGIEGPO to set * @return this */ - public RogueAeonInfo setUnlockAeonEnhanceNum(final int value) { + public RogueAeonInfo setJPEBPGIEGPO(final int value) { bitField0_ |= 0x00000001; - unlockAeonEnhanceNum = value; + jPEBPGIEGPO = value; return this; } /** + * 
+     *  9
+     *
+ * * optional uint32 unlock_aeon_num = 15; * @return whether the unlockAeonNum field is set */ @@ -95,6 +127,10 @@ public boolean hasUnlockAeonNum() { } /** + * 
+     *  9
+     *
+ * * optional uint32 unlock_aeon_num = 15; * @return this */ @@ -105,6 +141,10 @@ public RogueAeonInfo clearUnlockAeonNum() { } /** + * 
+     *  9
+     *
+ * * optional uint32 unlock_aeon_num = 15; * @return the unlockAeonNum */ @@ -113,6 +153,10 @@ public int getUnlockAeonNum() { } /** + * 
+     *  9
+     *
+ * * optional uint32 unlock_aeon_num = 15; * @param value the unlockAeonNum to set * @return this @@ -124,6 +168,10 @@ public RogueAeonInfo setUnlockAeonNum(final int value) { } /** + * 
+     *  guess
+     *
+ * * optional bool is_unlocked = 1; * @return whether the isUnlocked field is set */ @@ -132,6 +180,10 @@ public boolean hasIsUnlocked() { } /** + * 
+     *  guess
+     *
+ * * optional bool is_unlocked = 1; * @return this */ @@ -142,6 +194,10 @@ public RogueAeonInfo clearIsUnlocked() { } /** + * 
+     *  guess
+     *
+ * * optional bool is_unlocked = 1; * @return the isUnlocked */ @@ -150,6 +206,10 @@ public boolean getIsUnlocked() { } /** + * 
+     *  guess
+     *
+ * * optional bool is_unlocked = 1; * @param value the isUnlocked to set * @return this @@ -233,7 +293,7 @@ public RogueAeonInfo copyFrom(final RogueAeonInfo other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - unlockAeonEnhanceNum = other.unlockAeonEnhanceNum; + jPEBPGIEGPO = other.jPEBPGIEGPO; unlockAeonNum = other.unlockAeonNum; isUnlocked = other.isUnlocked; aeonIdList.copyFrom(other.aeonIdList); @@ -247,8 +307,8 @@ public RogueAeonInfo mergeFrom(final RogueAeonInfo other) { return this; } cachedSize = -1; - if (other.hasUnlockAeonEnhanceNum()) { - setUnlockAeonEnhanceNum(other.unlockAeonEnhanceNum); + if (other.hasJPEBPGIEGPO()) { + setJPEBPGIEGPO(other.jPEBPGIEGPO); } if (other.hasUnlockAeonNum()) { setUnlockAeonNum(other.unlockAeonNum); @@ -269,7 +329,7 @@ public RogueAeonInfo clear() { } cachedSize = -1; bitField0_ = 0; - unlockAeonEnhanceNum = 0; + jPEBPGIEGPO = 0; unlockAeonNum = 0; isUnlocked = false; aeonIdList.clear(); @@ -297,7 +357,7 @@ public boolean equals(Object o) { } RogueAeonInfo other = (RogueAeonInfo) o; return bitField0_ == other.bitField0_ - && (!hasUnlockAeonEnhanceNum() || unlockAeonEnhanceNum == other.unlockAeonEnhanceNum) + && (!hasJPEBPGIEGPO() || jPEBPGIEGPO == other.jPEBPGIEGPO) && (!hasUnlockAeonNum() || unlockAeonNum == other.unlockAeonNum) && (!hasIsUnlocked() || isUnlocked == other.isUnlocked) && (!hasAeonIdList() || aeonIdList.equals(other.aeonIdList)); @@ -307,7 +367,7 @@ public boolean equals(Object o) { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { output.writeRawByte((byte) 112); - output.writeUInt32NoTag(unlockAeonEnhanceNum); + output.writeUInt32NoTag(jPEBPGIEGPO); } if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 120); @@ -329,7 +389,7 @@ public void writeTo(final ProtoSink output) throws IOException { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(unlockAeonEnhanceNum); + size += 1 + ProtoSink.computeUInt32SizeNoTag(jPEBPGIEGPO); } if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(unlockAeonNum); @@ -351,8 +411,8 @@ public RogueAeonInfo mergeFrom(final ProtoSource input) throws IOException { while (true) { switch (tag) { case 112: { - // unlockAeonEnhanceNum - unlockAeonEnhanceNum = input.readUInt32(); + // jPEBPGIEGPO + jPEBPGIEGPO = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 120) { @@ -410,7 +470,7 @@ public RogueAeonInfo mergeFrom(final ProtoSource input) throws IOException { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.unlockAeonEnhanceNum, unlockAeonEnhanceNum); + output.writeUInt32(FieldNames.jPEBPGIEGPO, jPEBPGIEGPO); } if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.unlockAeonNum, unlockAeonNum); @@ -431,11 +491,10 @@ public RogueAeonInfo mergeFrom(final JsonSource input) throws IOException { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1040991167: - case 7773396: { - if (input.isAtField(FieldNames.unlockAeonEnhanceNum)) { + case 617496720: { + if (input.isAtField(FieldNames.jPEBPGIEGPO)) { if (!input.trySkipNullValue()) { - unlockAeonEnhanceNum = input.readUInt32(); + jPEBPGIEGPO = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -531,7 +590,7 @@ public RogueAeonInfo create() { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName unlockAeonEnhanceNum = FieldName.forField("unlockAeonEnhanceNum", "unlock_aeon_enhance_num"); + static final FieldName jPEBPGIEGPO = FieldName.forField("JPEBPGIEGPO"); static final FieldName unlockAeonNum = FieldName.forField("unlockAeonNum", "unlock_aeon_num"); diff --git a/src/generated/main/emu/lunarcore/proto/RogueAeonOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueAeonOuterClass.java index a820c3bc7..df162e325 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueAeonOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueAeonOuterClass.java @@ -18,20 +18,19 @@ public final class RogueAeonOuterClass { public static final class RogueAeon extends ProtoMessage implements Cloneable { private static final long serialVersionUID = 0L; - /** - * optional uint32 aeon_enhance_buff_num = 7; - */ - private int aeonEnhanceBuffNum; - /** * optional uint32 aeon_id = 10; */ private int aeonId; /** - * optional bool is_unlock_aeon = 12; + * 
+     * uint32 aeon_id = 7;  
+     *
+ * + * optional bool is_unlock_enhance_buff = 12; */ - private boolean isUnlockAeon; + private boolean isUnlockEnhanceBuff; private RogueAeon() { } @@ -43,49 +42,12 @@ public static RogueAeon newInstance() { return new RogueAeon(); } - /** - * optional uint32 aeon_enhance_buff_num = 7; - * @return whether the aeonEnhanceBuffNum field is set - */ - public boolean hasAeonEnhanceBuffNum() { - return (bitField0_ & 0x00000001) != 0; - } - - /** - * optional uint32 aeon_enhance_buff_num = 7; - * @return this - */ - public RogueAeon clearAeonEnhanceBuffNum() { - bitField0_ &= ~0x00000001; - aeonEnhanceBuffNum = 0; - return this; - } - - /** - * optional uint32 aeon_enhance_buff_num = 7; - * @return the aeonEnhanceBuffNum - */ - public int getAeonEnhanceBuffNum() { - return aeonEnhanceBuffNum; - } - - /** - * optional uint32 aeon_enhance_buff_num = 7; - * @param value the aeonEnhanceBuffNum to set - * @return this - */ - public RogueAeon setAeonEnhanceBuffNum(final int value) { - bitField0_ |= 0x00000001; - aeonEnhanceBuffNum = value; - return this; - } - /** * optional uint32 aeon_id = 10; * @return whether the aeonId field is set */ public boolean hasAeonId() { - return (bitField0_ & 0x00000002) != 0; + return (bitField0_ & 0x00000001) != 0; } /** @@ -93,7 +55,7 @@ public boolean hasAeonId() { * @return this */ public RogueAeon clearAeonId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; aeonId = 0; return this; } @@ -112,45 +74,61 @@ public int getAeonId() { * @return this */ public RogueAeon setAeonId(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; aeonId = value; return this; } /** - * optional bool is_unlock_aeon = 12; - * @return whether the isUnlockAeon field is set + * 
+     * uint32 aeon_id = 7;  
+     *
+ * + * optional bool is_unlock_enhance_buff = 12; + * @return whether the isUnlockEnhanceBuff field is set */ - public boolean hasIsUnlockAeon() { - return (bitField0_ & 0x00000004) != 0; + public boolean hasIsUnlockEnhanceBuff() { + return (bitField0_ & 0x00000002) != 0; } /** - * optional bool is_unlock_aeon = 12; + * 
+     * uint32 aeon_id = 7;  
+     *
+ * + * optional bool is_unlock_enhance_buff = 12; * @return this */ - public RogueAeon clearIsUnlockAeon() { - bitField0_ &= ~0x00000004; - isUnlockAeon = false; + public RogueAeon clearIsUnlockEnhanceBuff() { + bitField0_ &= ~0x00000002; + isUnlockEnhanceBuff = false; return this; } /** - * optional bool is_unlock_aeon = 12; - * @return the isUnlockAeon + * 
+     * uint32 aeon_id = 7;  
+     *
+ * + * optional bool is_unlock_enhance_buff = 12; + * @return the isUnlockEnhanceBuff */ - public boolean getIsUnlockAeon() { - return isUnlockAeon; + public boolean getIsUnlockEnhanceBuff() { + return isUnlockEnhanceBuff; } /** - * optional bool is_unlock_aeon = 12; - * @param value the isUnlockAeon to set + * 
+     * uint32 aeon_id = 7;  
+     *
+ * + * optional bool is_unlock_enhance_buff = 12; + * @param value the isUnlockEnhanceBuff to set * @return this */ - public RogueAeon setIsUnlockAeon(final boolean value) { - bitField0_ |= 0x00000004; - isUnlockAeon = value; + public RogueAeon setIsUnlockEnhanceBuff(final boolean value) { + bitField0_ |= 0x00000002; + isUnlockEnhanceBuff = value; return this; } @@ -159,9 +137,8 @@ public RogueAeon copyFrom(final RogueAeon other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - aeonEnhanceBuffNum = other.aeonEnhanceBuffNum; aeonId = other.aeonId; - isUnlockAeon = other.isUnlockAeon; + isUnlockEnhanceBuff = other.isUnlockEnhanceBuff; } return this; } @@ -172,14 +149,11 @@ public RogueAeon mergeFrom(final RogueAeon other) { return this; } cachedSize = -1; - if (other.hasAeonEnhanceBuffNum()) { - setAeonEnhanceBuffNum(other.aeonEnhanceBuffNum); - } if (other.hasAeonId()) { setAeonId(other.aeonId); } - if (other.hasIsUnlockAeon()) { - setIsUnlockAeon(other.isUnlockAeon); + if (other.hasIsUnlockEnhanceBuff()) { + setIsUnlockEnhanceBuff(other.isUnlockEnhanceBuff); } return this; } @@ -191,9 +165,8 @@ public RogueAeon clear() { } cachedSize = -1; bitField0_ = 0; - aeonEnhanceBuffNum = 0; aeonId = 0; - isUnlockAeon = false; + isUnlockEnhanceBuff = false; return this; } @@ -217,24 +190,19 @@ public boolean equals(Object o) { } RogueAeon other = (RogueAeon) o; return bitField0_ == other.bitField0_ - && (!hasAeonEnhanceBuffNum() || aeonEnhanceBuffNum == other.aeonEnhanceBuffNum) && (!hasAeonId() || aeonId == other.aeonId) - && (!hasIsUnlockAeon() || isUnlockAeon == other.isUnlockAeon); + && (!hasIsUnlockEnhanceBuff() || isUnlockEnhanceBuff == other.isUnlockEnhanceBuff); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 56); - output.writeUInt32NoTag(aeonEnhanceBuffNum); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 80); output.writeUInt32NoTag(aeonId); } - if ((bitField0_ & 0x00000004) != 0) { + if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 96); - output.writeBoolNoTag(isUnlockAeon); + output.writeBoolNoTag(isUnlockEnhanceBuff); } } @@ -242,12 +210,9 @@ public void writeTo(final ProtoSink output) throws IOException { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(aeonEnhanceBuffNum); - } - if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(aeonId); } - if ((bitField0_ & 0x00000004) != 0) { + if ((bitField0_ & 0x00000002) != 0) { size += 2; } return size; @@ -260,28 +225,19 @@ public RogueAeon mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { - // aeonEnhanceBuffNum - aeonEnhanceBuffNum = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 80) { - break; - } - } case 80: { // aeonId aeonId = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 96) { break; } } case 96: { - // isUnlockAeon - isUnlockAeon = input.readBool(); - bitField0_ |= 0x00000004; + // isUnlockEnhanceBuff + isUnlockEnhanceBuff = input.readBool(); + bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { break; @@ -305,13 +261,10 @@ public RogueAeon mergeFrom(final ProtoSource input) throws IOException { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.aeonEnhanceBuffNum, aeonEnhanceBuffNum); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.aeonId, aeonId); } - if ((bitField0_ & 0x00000004) != 0) { - output.writeBool(FieldNames.isUnlockAeon, isUnlockAeon); + if ((bitField0_ & 0x00000002) != 0) { + output.writeBool(FieldNames.isUnlockEnhanceBuff, isUnlockEnhanceBuff); } output.endObject(); } @@ -323,36 +276,24 @@ public RogueAeon mergeFrom(final JsonSource input) throws IOException { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1533321096: - case 1717887943: { - if (input.isAtField(FieldNames.aeonEnhanceBuffNum)) { - if (!input.trySkipNullValue()) { - aeonEnhanceBuffNum = input.readUInt32(); - bitField0_ |= 0x00000001; - } - } else { - input.skipUnknownField(); - } - break; - } case -1421249154: case -1109029417: { if (input.isAtField(FieldNames.aeonId)) { if (!input.trySkipNullValue()) { aeonId = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; } } else { input.skipUnknownField(); } break; } - case 1311289137: - case 1885168009: { - if (input.isAtField(FieldNames.isUnlockAeon)) { + case -1006386637: + case -118645302: { + if (input.isAtField(FieldNames.isUnlockEnhanceBuff)) { if (!input.trySkipNullValue()) { - isUnlockAeon = input.readBool(); - bitField0_ |= 0x00000004; + isUnlockEnhanceBuff = input.readBool(); + bitField0_ |= 0x00000002; } } else { input.skipUnknownField(); @@ -411,11 +352,9 @@ public RogueAeon create() { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName aeonEnhanceBuffNum = FieldName.forField("aeonEnhanceBuffNum", "aeon_enhance_buff_num"); - static final FieldName aeonId = FieldName.forField("aeonId", "aeon_id"); - static final FieldName isUnlockAeon = FieldName.forField("isUnlockAeon", "is_unlock_aeon"); + static final FieldName isUnlockEnhanceBuff = FieldName.forField("isUnlockEnhanceBuff", "is_unlock_enhance_buff"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/RogueCommonPendingActionOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueCommonPendingActionOuterClass.java index e43b36f44..c0d954816 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueCommonPendingActionOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueCommonPendingActionOuterClass.java @@ -19,9 +19,13 @@ public static final class RogueCommonPendingAction extends ProtoMessageoptional uint32 action_unique_id = 3; + * 
+     *  idk
+     *
+ * + * optional uint32 GLFDHAJPJDF = 3; */ - private int actionUniqueId; + private int gLFDHAJPJDF; /** * optional .RogueAction rogue_action = 7; @@ -39,39 +43,55 @@ public static RogueCommonPendingAction newInstance() { } /** - * optional uint32 action_unique_id = 3; - * @return whether the actionUniqueId field is set + * 
+     *  idk
+     *
+ * + * optional uint32 GLFDHAJPJDF = 3; + * @return whether the gLFDHAJPJDF field is set */ - public boolean hasActionUniqueId() { + public boolean hasGLFDHAJPJDF() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 action_unique_id = 3; + * 
+     *  idk
+     *
+ * + * optional uint32 GLFDHAJPJDF = 3; * @return this */ - public RogueCommonPendingAction clearActionUniqueId() { + public RogueCommonPendingAction clearGLFDHAJPJDF() { bitField0_ &= ~0x00000001; - actionUniqueId = 0; + gLFDHAJPJDF = 0; return this; } /** - * optional uint32 action_unique_id = 3; - * @return the actionUniqueId + * 
+     *  idk
+     *
+ * + * optional uint32 GLFDHAJPJDF = 3; + * @return the gLFDHAJPJDF */ - public int getActionUniqueId() { - return actionUniqueId; + public int getGLFDHAJPJDF() { + return gLFDHAJPJDF; } /** - * optional uint32 action_unique_id = 3; - * @param value the actionUniqueId to set + * 
+     *  idk
+     *
+ * + * optional uint32 GLFDHAJPJDF = 3; + * @param value the gLFDHAJPJDF to set * @return this */ - public RogueCommonPendingAction setActionUniqueId(final int value) { + public RogueCommonPendingAction setGLFDHAJPJDF(final int value) { bitField0_ |= 0x00000001; - actionUniqueId = value; + gLFDHAJPJDF = value; return this; } @@ -137,7 +157,7 @@ public RogueCommonPendingAction copyFrom(final RogueCommonPendingAction other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - actionUniqueId = other.actionUniqueId; + gLFDHAJPJDF = other.gLFDHAJPJDF; rogueAction.copyFrom(other.rogueAction); } return this; @@ -149,8 +169,8 @@ public RogueCommonPendingAction mergeFrom(final RogueCommonPendingAction other) return this; } cachedSize = -1; - if (other.hasActionUniqueId()) { - setActionUniqueId(other.actionUniqueId); + if (other.hasGLFDHAJPJDF()) { + setGLFDHAJPJDF(other.gLFDHAJPJDF); } if (other.hasRogueAction()) { getMutableRogueAction().mergeFrom(other.rogueAction); @@ -165,7 +185,7 @@ public RogueCommonPendingAction clear() { } cachedSize = -1; bitField0_ = 0; - actionUniqueId = 0; + gLFDHAJPJDF = 0; rogueAction.clear(); return this; } @@ -191,7 +211,7 @@ public boolean equals(Object o) { } RogueCommonPendingAction other = (RogueCommonPendingAction) o; return bitField0_ == other.bitField0_ - && (!hasActionUniqueId() || actionUniqueId == other.actionUniqueId) + && (!hasGLFDHAJPJDF() || gLFDHAJPJDF == other.gLFDHAJPJDF) && (!hasRogueAction() || rogueAction.equals(other.rogueAction)); } @@ -199,7 +219,7 @@ public boolean equals(Object o) { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { output.writeRawByte((byte) 24); - output.writeUInt32NoTag(actionUniqueId); + output.writeUInt32NoTag(gLFDHAJPJDF); } if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 58); @@ -211,7 +231,7 @@ public void writeTo(final ProtoSink output) throws IOException { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(actionUniqueId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(gLFDHAJPJDF); } if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(rogueAction); @@ -227,8 +247,8 @@ public RogueCommonPendingAction mergeFrom(final ProtoSource input) throws IOExce while (true) { switch (tag) { case 24: { - // actionUniqueId - actionUniqueId = input.readUInt32(); + // gLFDHAJPJDF + gLFDHAJPJDF = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 58) { @@ -262,7 +282,7 @@ public RogueCommonPendingAction mergeFrom(final ProtoSource input) throws IOExce public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.actionUniqueId, actionUniqueId); + output.writeUInt32(FieldNames.gLFDHAJPJDF, gLFDHAJPJDF); } if ((bitField0_ & 0x00000002) != 0) { output.writeMessage(FieldNames.rogueAction, rogueAction); @@ -277,11 +297,10 @@ public RogueCommonPendingAction mergeFrom(final JsonSource input) throws IOExcep } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -208785118: - case 1003664768: { - if (input.isAtField(FieldNames.actionUniqueId)) { + case 1202020394: { + if (input.isAtField(FieldNames.gLFDHAJPJDF)) { if (!input.trySkipNullValue()) { - actionUniqueId = input.readUInt32(); + gLFDHAJPJDF = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -354,7 +373,7 @@ public RogueCommonPendingAction create() { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName actionUniqueId = FieldName.forField("actionUniqueId", "action_unique_id"); + static final FieldName gLFDHAJPJDF = FieldName.forField("GLFDHAJPJDF"); static final FieldName rogueAction = FieldName.forField("rogueAction", "rogue_action"); } diff --git a/src/generated/main/emu/lunarcore/proto/RogueDialogueEventOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueDialogueEventOuterClass.java index 484318802..7685a4d95 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueDialogueEventOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueDialogueEventOuterClass.java @@ -26,9 +26,9 @@ public static final class RogueDialogueEvent extends ProtoMessageoptional uint32 event_unique_id = 6; + * optional uint32 GBMDBBBMBEJ = 6; */ - private int eventUniqueId; + private int gBMDBBBMBEJ; /** * optional uint32 INJPFALMDHJ = 7; @@ -98,39 +98,39 @@ public RogueDialogueEvent setNpcId(final int value) { } /** - * optional uint32 event_unique_id = 6; - * @return whether the eventUniqueId field is set + * optional uint32 GBMDBBBMBEJ = 6; + * @return whether the gBMDBBBMBEJ field is set */ - public boolean hasEventUniqueId() { + public boolean hasGBMDBBBMBEJ() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 event_unique_id = 6; + * optional uint32 GBMDBBBMBEJ = 6; * @return this */ - public RogueDialogueEvent clearEventUniqueId() { + public RogueDialogueEvent clearGBMDBBBMBEJ() { bitField0_ &= ~0x00000002; - eventUniqueId = 0; + gBMDBBBMBEJ = 0; return this; } /** - * optional uint32 event_unique_id = 6; - * @return the eventUniqueId + * optional uint32 GBMDBBBMBEJ = 6; + * @return the gBMDBBBMBEJ */ - public int getEventUniqueId() { - return eventUniqueId; + public int getGBMDBBBMBEJ() { + return gBMDBBBMBEJ; } /** - * optional uint32 event_unique_id = 6; - * @param value the eventUniqueId to set + * optional uint32 GBMDBBBMBEJ = 6; + * @param value the gBMDBBBMBEJ to set * @return this */ - public RogueDialogueEvent setEventUniqueId(final int value) { + public RogueDialogueEvent setGBMDBBBMBEJ(final int value) { bitField0_ |= 0x00000002; - eventUniqueId = value; + gBMDBBBMBEJ = value; return this; } @@ -354,7 +354,7 @@ public RogueDialogueEvent copyFrom(final RogueDialogueEvent other) { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; npcId = other.npcId; - eventUniqueId = other.eventUniqueId; + gBMDBBBMBEJ = other.gBMDBBBMBEJ; iNJPFALMDHJ = other.iNJPFALMDHJ; gameModeType = other.gameModeType; selectEventId.copyFrom(other.selectEventId); @@ -372,8 +372,8 @@ public RogueDialogueEvent mergeFrom(final RogueDialogueEvent other) { if (other.hasNpcId()) { setNpcId(other.npcId); } - if (other.hasEventUniqueId()) { - setEventUniqueId(other.eventUniqueId); + if (other.hasGBMDBBBMBEJ()) { + setGBMDBBBMBEJ(other.gBMDBBBMBEJ); } if (other.hasINJPFALMDHJ()) { setINJPFALMDHJ(other.iNJPFALMDHJ); @@ -398,7 +398,7 @@ public RogueDialogueEvent clear() { cachedSize = -1; bitField0_ = 0; npcId = 0; - eventUniqueId = 0; + gBMDBBBMBEJ = 0; iNJPFALMDHJ = 0; gameModeType = 0; selectEventId.clear(); @@ -429,7 +429,7 @@ public boolean equals(Object o) { RogueDialogueEvent other = (RogueDialogueEvent) o; return bitField0_ == other.bitField0_ && (!hasNpcId() || npcId == other.npcId) - && (!hasEventUniqueId() || eventUniqueId == other.eventUniqueId) + && (!hasGBMDBBBMBEJ() || gBMDBBBMBEJ == other.gBMDBBBMBEJ) && (!hasINJPFALMDHJ() || iNJPFALMDHJ == other.iNJPFALMDHJ) && (!hasGameModeType() || gameModeType == other.gameModeType) && (!hasSelectEventId() || selectEventId.equals(other.selectEventId)) @@ -444,7 +444,7 @@ public void writeTo(final ProtoSink output) throws IOException { } if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 48); - output.writeUInt32NoTag(eventUniqueId); + output.writeUInt32NoTag(gBMDBBBMBEJ); } if ((bitField0_ & 0x00000004) != 0) { output.writeRawByte((byte) 56); @@ -475,7 +475,7 @@ protected int computeSerializedSize() { size += 1 + ProtoSink.computeUInt32SizeNoTag(npcId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(eventUniqueId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(gBMDBBBMBEJ); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(iNJPFALMDHJ); @@ -509,8 +509,8 @@ public RogueDialogueEvent mergeFrom(final ProtoSource input) throws IOException } } case 48: { - // eventUniqueId - eventUniqueId = input.readUInt32(); + // gBMDBBBMBEJ + gBMDBBBMBEJ = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 56) { @@ -579,7 +579,7 @@ public void writeTo(final JsonSink output) throws IOException { output.writeUInt32(FieldNames.npcId, npcId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.eventUniqueId, eventUniqueId); + output.writeUInt32(FieldNames.gBMDBBBMBEJ, gBMDBBBMBEJ); } if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.iNJPFALMDHJ, iNJPFALMDHJ); @@ -615,11 +615,10 @@ public RogueDialogueEvent mergeFrom(final JsonSource input) throws IOException { } break; } - case 2091680134: - case -157385500: { - if (input.isAtField(FieldNames.eventUniqueId)) { + case -1904002038: { + if (input.isAtField(FieldNames.gBMDBBBMBEJ)) { if (!input.trySkipNullValue()) { - eventUniqueId = input.readUInt32(); + gBMDBBBMBEJ = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -729,7 +728,7 @@ public RogueDialogueEvent create() { static class FieldNames { static final FieldName npcId = FieldName.forField("npcId", "npc_id"); - static final FieldName eventUniqueId = FieldName.forField("eventUniqueId", "event_unique_id"); + static final FieldName gBMDBBBMBEJ = FieldName.forField("GBMDBBBMBEJ"); static final FieldName iNJPFALMDHJ = FieldName.forField("INJPFALMDHJ"); diff --git a/src/generated/main/emu/lunarcore/proto/RogueRoomInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueRoomInfoOuterClass.java deleted file mode 100644 index b418ef0be..000000000 --- a/src/generated/main/emu/lunarcore/proto/RogueRoomInfoOuterClass.java +++ /dev/null @@ -1,494 +0,0 @@ -// Code generated by protocol buffer compiler. Do not edit! -package emu.lunarcore.proto; - -import java.io.IOException; -import us.hebi.quickbuf.FieldName; -import us.hebi.quickbuf.InvalidProtocolBufferException; -import us.hebi.quickbuf.JsonSink; -import us.hebi.quickbuf.JsonSource; -import us.hebi.quickbuf.MessageFactory; -import us.hebi.quickbuf.ProtoMessage; -import us.hebi.quickbuf.ProtoSink; -import us.hebi.quickbuf.ProtoSource; - -public final class RogueRoomInfoOuterClass { - /** - * Protobuf type {@code RogueRoomInfo} - */ - public static final class RogueRoomInfo extends ProtoMessage implements Cloneable { - private static final long serialVersionUID = 0L; - - /** - * optional uint32 site_id = 12; - */ - private int siteId; - - /** - * 
-     * uint32 BNKNFOGGPMG = 6;
-     *
- * - * optional uint32 room_id = 15; - */ - private int roomId; - - /** - * 
-     * IOLBGHALAHK MHIHFPAFLDO = 8;
-     *
- * - * optional .RogueRoomStatus room_status = 13; - */ - private int roomStatus; - - private RogueRoomInfo() { - } - - /** - * @return a new empty instance of {@code RogueRoomInfo} - */ - public static RogueRoomInfo newInstance() { - return new RogueRoomInfo(); - } - - /** - * optional uint32 site_id = 12; - * @return whether the siteId field is set - */ - public boolean hasSiteId() { - return (bitField0_ & 0x00000001) != 0; - } - - /** - * optional uint32 site_id = 12; - * @return this - */ - public RogueRoomInfo clearSiteId() { - bitField0_ &= ~0x00000001; - siteId = 0; - return this; - } - - /** - * optional uint32 site_id = 12; - * @return the siteId - */ - public int getSiteId() { - return siteId; - } - - /** - * optional uint32 site_id = 12; - * @param value the siteId to set - * @return this - */ - public RogueRoomInfo setSiteId(final int value) { - bitField0_ |= 0x00000001; - siteId = value; - return this; - } - - /** - * 
-     * uint32 BNKNFOGGPMG = 6;
-     *
- * - * optional uint32 room_id = 15; - * @return whether the roomId field is set - */ - public boolean hasRoomId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * 
-     * uint32 BNKNFOGGPMG = 6;
-     *
- * - * optional uint32 room_id = 15; - * @return this - */ - public RogueRoomInfo clearRoomId() { - bitField0_ &= ~0x00000002; - roomId = 0; - return this; - } - - /** - * 
-     * uint32 BNKNFOGGPMG = 6;
-     *
- * - * optional uint32 room_id = 15; - * @return the roomId - */ - public int getRoomId() { - return roomId; - } - - /** - * 
-     * uint32 BNKNFOGGPMG = 6;
-     *
- * - * optional uint32 room_id = 15; - * @param value the roomId to set - * @return this - */ - public RogueRoomInfo setRoomId(final int value) { - bitField0_ |= 0x00000002; - roomId = value; - return this; - } - - /** - * 
-     * IOLBGHALAHK MHIHFPAFLDO = 8;
-     *
- * - * optional .RogueRoomStatus room_status = 13; - * @return whether the roomStatus field is set - */ - public boolean hasRoomStatus() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * 
-     * IOLBGHALAHK MHIHFPAFLDO = 8;
-     *
- * - * optional .RogueRoomStatus room_status = 13; - * @return this - */ - public RogueRoomInfo clearRoomStatus() { - bitField0_ &= ~0x00000004; - roomStatus = 0; - return this; - } - - /** - * 
-     * IOLBGHALAHK MHIHFPAFLDO = 8;
-     *
- * - * optional .RogueRoomStatus room_status = 13; - * @return the roomStatus - */ - public RogueRoomStatusOuterClass.RogueRoomStatus getRoomStatus() { - return RogueRoomStatusOuterClass.RogueRoomStatus.forNumber(roomStatus); - } - - /** - * Gets the value of the internal enum store. The result is - * equivalent to {@link RogueRoomInfo#getRoomStatus()}.getNumber(). - * - * @return numeric wire representation - */ - public int getRoomStatusValue() { - return roomStatus; - } - - /** - * Sets the value of the internal enum store. This does not - * do any validity checks, so be sure to use appropriate value - * constants from {@link RogueRoomStatusOuterClass.RogueRoomStatus}. Setting an invalid value - * can cause {@link RogueRoomInfo#getRoomStatus()} to return null - * - * @param value the numeric wire value to set - * @return this - */ - public RogueRoomInfo setRoomStatusValue(final int value) { - bitField0_ |= 0x00000004; - roomStatus = value; - return this; - } - - /** - * 
-     * IOLBGHALAHK MHIHFPAFLDO = 8;
-     *
- * - * optional .RogueRoomStatus room_status = 13; - * @param value the roomStatus to set - * @return this - */ - public RogueRoomInfo setRoomStatus(final RogueRoomStatusOuterClass.RogueRoomStatus value) { - bitField0_ |= 0x00000004; - roomStatus = value.getNumber(); - return this; - } - - @Override - public RogueRoomInfo copyFrom(final RogueRoomInfo other) { - cachedSize = other.cachedSize; - if ((bitField0_ | other.bitField0_) != 0) { - bitField0_ = other.bitField0_; - siteId = other.siteId; - roomId = other.roomId; - roomStatus = other.roomStatus; - } - return this; - } - - @Override - public RogueRoomInfo mergeFrom(final RogueRoomInfo other) { - if (other.isEmpty()) { - return this; - } - cachedSize = -1; - if (other.hasSiteId()) { - setSiteId(other.siteId); - } - if (other.hasRoomId()) { - setRoomId(other.roomId); - } - if (other.hasRoomStatus()) { - setRoomStatusValue(other.roomStatus); - } - return this; - } - - @Override - public RogueRoomInfo clear() { - if (isEmpty()) { - return this; - } - cachedSize = -1; - bitField0_ = 0; - siteId = 0; - roomId = 0; - roomStatus = 0; - return this; - } - - @Override - public RogueRoomInfo clearQuick() { - if (isEmpty()) { - return this; - } - cachedSize = -1; - bitField0_ = 0; - return this; - } - - @Override - public boolean equals(Object o) { - if (o == this) { - return true; - } - if (!(o instanceof RogueRoomInfo)) { - return false; - } - RogueRoomInfo other = (RogueRoomInfo) o; - return bitField0_ == other.bitField0_ - && (!hasSiteId() || siteId == other.siteId) - && (!hasRoomId() || roomId == other.roomId) - && (!hasRoomStatus() || roomStatus == other.roomStatus); - } - - @Override - public void writeTo(final ProtoSink output) throws IOException { - if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 96); - output.writeUInt32NoTag(siteId); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 120); - output.writeUInt32NoTag(roomId); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 104); - output.writeEnumNoTag(roomStatus); - } - } - - @Override - protected int computeSerializedSize() { - int size = 0; - if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(siteId); - } - if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(roomId); - } - if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeEnumSizeNoTag(roomStatus); - } - return size; - } - - @Override - @SuppressWarnings("fallthrough") - public RogueRoomInfo mergeFrom(final ProtoSource input) throws IOException { - // Enabled Fall-Through Optimization (QuickBuffers) - int tag = input.readTag(); - while (true) { - switch (tag) { - case 96: { - // siteId - siteId = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 120) { - break; - } - } - case 120: { - // roomId - roomId = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 104) { - break; - } - } - case 104: { - // roomStatus - final int value = input.readInt32(); - if (RogueRoomStatusOuterClass.RogueRoomStatus.forNumber(value) != null) { - roomStatus = value; - bitField0_ |= 0x00000004; - } - tag = input.readTag(); - if (tag != 0) { - break; - } - } - case 0: { - return this; - } - default: { - if (!input.skipField(tag)) { - return this; - } - tag = input.readTag(); - break; - } - } - } - } - - @Override - public void writeTo(final JsonSink output) throws IOException { - output.beginObject(); - if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.siteId, siteId); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.roomId, roomId); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeEnum(FieldNames.roomStatus, roomStatus, RogueRoomStatusOuterClass.RogueRoomStatus.converter()); - } - output.endObject(); - } - - @Override - public RogueRoomInfo mergeFrom(final JsonSource input) throws IOException { - if (!input.beginObject()) { - return this; - } - while (!input.isAtEnd()) { - switch (input.readFieldHash()) { - case -902090046: - case 2100001043: { - if (input.isAtField(FieldNames.siteId)) { - if (!input.trySkipNullValue()) { - siteId = input.readUInt32(); - bitField0_ |= 0x00000001; - } - } else { - input.skipUnknownField(); - } - break; - } - case -925319338: - case 1379892991: { - if (input.isAtField(FieldNames.roomId)) { - if (!input.trySkipNullValue()) { - roomId = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } - case 926739629: - case 712617942: { - if (input.isAtField(FieldNames.roomStatus)) { - if (!input.trySkipNullValue()) { - final RogueRoomStatusOuterClass.RogueRoomStatus value = input.readEnum(RogueRoomStatusOuterClass.RogueRoomStatus.converter()); - if (value != null) { - roomStatus = value.getNumber(); - bitField0_ |= 0x00000004; - } else { - input.skipUnknownEnumValue(); - } - } - } else { - input.skipUnknownField(); - } - break; - } - default: { - input.skipUnknownField(); - break; - } - } - } - input.endObject(); - return this; - } - - @Override - public RogueRoomInfo clone() { - return new RogueRoomInfo().copyFrom(this); - } - - @Override - public boolean isEmpty() { - return ((bitField0_) == 0); - } - - public static RogueRoomInfo parseFrom(final byte[] data) throws InvalidProtocolBufferException { - return ProtoMessage.mergeFrom(new RogueRoomInfo(), data).checkInitialized(); - } - - public static RogueRoomInfo parseFrom(final ProtoSource input) throws IOException { - return ProtoMessage.mergeFrom(new RogueRoomInfo(), input).checkInitialized(); - } - - public static RogueRoomInfo parseFrom(final JsonSource input) throws IOException { - return ProtoMessage.mergeFrom(new RogueRoomInfo(), input).checkInitialized(); - } - - /** - * @return factory for creating RogueRoomInfo messages - */ - public static MessageFactory getFactory() { - return RogueRoomInfoFactory.INSTANCE; - } - - private enum RogueRoomInfoFactory implements MessageFactory { - INSTANCE; - - @Override - public RogueRoomInfo create() { - return RogueRoomInfo.newInstance(); - } - } - - /** - * Contains name constants used for serializing JSON - */ - static class FieldNames { - static final FieldName siteId = FieldName.forField("siteId", "site_id"); - - static final FieldName roomId = FieldName.forField("roomId", "room_id"); - - static final FieldName roomStatus = FieldName.forField("roomStatus", "room_status"); - } - } -} diff --git a/src/generated/main/emu/lunarcore/proto/RogueUpdateOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueUpdateOuterClass.java deleted file mode 100644 index 0a3470323..000000000 --- a/src/generated/main/emu/lunarcore/proto/RogueUpdateOuterClass.java +++ /dev/null @@ -1,421 +0,0 @@ -// Code generated by protocol buffer compiler. Do not edit! -package emu.lunarcore.proto; - -import java.io.IOException; -import us.hebi.quickbuf.FieldName; -import us.hebi.quickbuf.InvalidProtocolBufferException; -import us.hebi.quickbuf.JsonSink; -import us.hebi.quickbuf.JsonSource; -import us.hebi.quickbuf.MessageFactory; -import us.hebi.quickbuf.ProtoMessage; -import us.hebi.quickbuf.ProtoSink; -import us.hebi.quickbuf.ProtoSource; - -public final class RogueUpdateOuterClass { - /** - * Protobuf type {@code RogueUpdate} - */ - public static final class RogueUpdate extends ProtoMessage implements Cloneable { - private static final long serialVersionUID = 0L; - - /** - * optional uint32 last_common_area_id = 7; - */ - private int lastCommonAreaId; - - /** - * optional uint32 last_rogue_type_id = 8; - */ - private int lastRogueTypeId; - - /** - * optional uint32 rogue_type_id = 12; - */ - private int rogueTypeId; - - private RogueUpdate() { - } - - /** - * @return a new empty instance of {@code RogueUpdate} - */ - public static RogueUpdate newInstance() { - return new RogueUpdate(); - } - - /** - * optional uint32 last_common_area_id = 7; - * @return whether the lastCommonAreaId field is set - */ - public boolean hasLastCommonAreaId() { - return (bitField0_ & 0x00000001) != 0; - } - - /** - * optional uint32 last_common_area_id = 7; - * @return this - */ - public RogueUpdate clearLastCommonAreaId() { - bitField0_ &= ~0x00000001; - lastCommonAreaId = 0; - return this; - } - - /** - * optional uint32 last_common_area_id = 7; - * @return the lastCommonAreaId - */ - public int getLastCommonAreaId() { - return lastCommonAreaId; - } - - /** - * optional uint32 last_common_area_id = 7; - * @param value the lastCommonAreaId to set - * @return this - */ - public RogueUpdate setLastCommonAreaId(final int value) { - bitField0_ |= 0x00000001; - lastCommonAreaId = value; - return this; - } - - /** - * optional uint32 last_rogue_type_id = 8; - * @return whether the lastRogueTypeId field is set - */ - public boolean hasLastRogueTypeId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 last_rogue_type_id = 8; - * @return this - */ - public RogueUpdate clearLastRogueTypeId() { - bitField0_ &= ~0x00000002; - lastRogueTypeId = 0; - return this; - } - - /** - * optional uint32 last_rogue_type_id = 8; - * @return the lastRogueTypeId - */ - public int getLastRogueTypeId() { - return lastRogueTypeId; - } - - /** - * optional uint32 last_rogue_type_id = 8; - * @param value the lastRogueTypeId to set - * @return this - */ - public RogueUpdate setLastRogueTypeId(final int value) { - bitField0_ |= 0x00000002; - lastRogueTypeId = value; - return this; - } - - /** - * optional uint32 rogue_type_id = 12; - * @return whether the rogueTypeId field is set - */ - public boolean hasRogueTypeId() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 rogue_type_id = 12; - * @return this - */ - public RogueUpdate clearRogueTypeId() { - bitField0_ &= ~0x00000004; - rogueTypeId = 0; - return this; - } - - /** - * optional uint32 rogue_type_id = 12; - * @return the rogueTypeId - */ - public int getRogueTypeId() { - return rogueTypeId; - } - - /** - * optional uint32 rogue_type_id = 12; - * @param value the rogueTypeId to set - * @return this - */ - public RogueUpdate setRogueTypeId(final int value) { - bitField0_ |= 0x00000004; - rogueTypeId = value; - return this; - } - - @Override - public RogueUpdate copyFrom(final RogueUpdate other) { - cachedSize = other.cachedSize; - if ((bitField0_ | other.bitField0_) != 0) { - bitField0_ = other.bitField0_; - lastCommonAreaId = other.lastCommonAreaId; - lastRogueTypeId = other.lastRogueTypeId; - rogueTypeId = other.rogueTypeId; - } - return this; - } - - @Override - public RogueUpdate mergeFrom(final RogueUpdate other) { - if (other.isEmpty()) { - return this; - } - cachedSize = -1; - if (other.hasLastCommonAreaId()) { - setLastCommonAreaId(other.lastCommonAreaId); - } - if (other.hasLastRogueTypeId()) { - setLastRogueTypeId(other.lastRogueTypeId); - } - if (other.hasRogueTypeId()) { - setRogueTypeId(other.rogueTypeId); - } - return this; - } - - @Override - public RogueUpdate clear() { - if (isEmpty()) { - return this; - } - cachedSize = -1; - bitField0_ = 0; - lastCommonAreaId = 0; - lastRogueTypeId = 0; - rogueTypeId = 0; - return this; - } - - @Override - public RogueUpdate clearQuick() { - if (isEmpty()) { - return this; - } - cachedSize = -1; - bitField0_ = 0; - return this; - } - - @Override - public boolean equals(Object o) { - if (o == this) { - return true; - } - if (!(o instanceof RogueUpdate)) { - return false; - } - RogueUpdate other = (RogueUpdate) o; - return bitField0_ == other.bitField0_ - && (!hasLastCommonAreaId() || lastCommonAreaId == other.lastCommonAreaId) - && (!hasLastRogueTypeId() || lastRogueTypeId == other.lastRogueTypeId) - && (!hasRogueTypeId() || rogueTypeId == other.rogueTypeId); - } - - @Override - public void writeTo(final ProtoSink output) throws IOException { - if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 56); - output.writeUInt32NoTag(lastCommonAreaId); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 64); - output.writeUInt32NoTag(lastRogueTypeId); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 96); - output.writeUInt32NoTag(rogueTypeId); - } - } - - @Override - protected int computeSerializedSize() { - int size = 0; - if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(lastCommonAreaId); - } - if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(lastRogueTypeId); - } - if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(rogueTypeId); - } - return size; - } - - @Override - @SuppressWarnings("fallthrough") - public RogueUpdate mergeFrom(final ProtoSource input) throws IOException { - // Enabled Fall-Through Optimization (QuickBuffers) - int tag = input.readTag(); - while (true) { - switch (tag) { - case 56: { - // lastCommonAreaId - lastCommonAreaId = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 64) { - break; - } - } - case 64: { - // lastRogueTypeId - lastRogueTypeId = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 96) { - break; - } - } - case 96: { - // rogueTypeId - rogueTypeId = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 0) { - break; - } - } - case 0: { - return this; - } - default: { - if (!input.skipField(tag)) { - return this; - } - tag = input.readTag(); - break; - } - } - } - } - - @Override - public void writeTo(final JsonSink output) throws IOException { - output.beginObject(); - if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.lastCommonAreaId, lastCommonAreaId); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.lastRogueTypeId, lastRogueTypeId); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.rogueTypeId, rogueTypeId); - } - output.endObject(); - } - - @Override - public RogueUpdate mergeFrom(final JsonSource input) throws IOException { - if (!input.beginObject()) { - return this; - } - while (!input.isAtEnd()) { - switch (input.readFieldHash()) { - case -1313973751: - case 2061831298: { - if (input.isAtField(FieldNames.lastCommonAreaId)) { - if (!input.trySkipNullValue()) { - lastCommonAreaId = input.readUInt32(); - bitField0_ |= 0x00000001; - } - } else { - input.skipUnknownField(); - } - break; - } - case 1384811513: - case 1305719026: { - if (input.isAtField(FieldNames.lastRogueTypeId)) { - if (!input.trySkipNullValue()) { - lastRogueTypeId = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } - case -802434961: - case -223704357: { - if (input.isAtField(FieldNames.rogueTypeId)) { - if (!input.trySkipNullValue()) { - rogueTypeId = input.readUInt32(); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } - default: { - input.skipUnknownField(); - break; - } - } - } - input.endObject(); - return this; - } - - @Override - public RogueUpdate clone() { - return new RogueUpdate().copyFrom(this); - } - - @Override - public boolean isEmpty() { - return ((bitField0_) == 0); - } - - public static RogueUpdate parseFrom(final byte[] data) throws InvalidProtocolBufferException { - return ProtoMessage.mergeFrom(new RogueUpdate(), data).checkInitialized(); - } - - public static RogueUpdate parseFrom(final ProtoSource input) throws IOException { - return ProtoMessage.mergeFrom(new RogueUpdate(), input).checkInitialized(); - } - - public static RogueUpdate parseFrom(final JsonSource input) throws IOException { - return ProtoMessage.mergeFrom(new RogueUpdate(), input).checkInitialized(); - } - - /** - * @return factory for creating RogueUpdate messages - */ - public static MessageFactory getFactory() { - return RogueUpdateFactory.INSTANCE; - } - - private enum RogueUpdateFactory implements MessageFactory { - INSTANCE; - - @Override - public RogueUpdate create() { - return RogueUpdate.newInstance(); - } - } - - /** - * Contains name constants used for serializing JSON - */ - static class FieldNames { - static final FieldName lastCommonAreaId = FieldName.forField("lastCommonAreaId", "last_common_area_id"); - - static final FieldName lastRogueTypeId = FieldName.forField("lastRogueTypeId", "last_rogue_type_id"); - - static final FieldName rogueTypeId = FieldName.forField("rogueTypeId", "rogue_type_id"); - } - } -} diff --git a/src/generated/main/emu/lunarcore/proto/RotateMapCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/RotateMapCsReqOuterClass.java new file mode 100644 index 000000000..a4e4d46d2 --- /dev/null +++ b/src/generated/main/emu/lunarcore/proto/RotateMapCsReqOuterClass.java @@ -0,0 +1,1395 @@ +// Code generated by protocol buffer compiler. Do not edit! +package emu.lunarcore.proto; + +import java.io.IOException; +import us.hebi.quickbuf.FieldName; +import us.hebi.quickbuf.InvalidProtocolBufferException; +import us.hebi.quickbuf.JsonSink; +import us.hebi.quickbuf.JsonSource; +import us.hebi.quickbuf.MessageFactory; +import us.hebi.quickbuf.ProtoMessage; +import us.hebi.quickbuf.ProtoSink; +import us.hebi.quickbuf.ProtoSource; +import us.hebi.quickbuf.ProtoUtil; + +public final class RotateMapCsReqOuterClass { + /** + * Protobuf type {@code RotateMapCsReq} + */ + public static final class RotateMapCsReq extends ProtoMessage implements Cloneable { + private static final long serialVersionUID = 0L; + + /** + * optional uint32 unk_int = 8; + */ + private int unkInt; + + /** + * optional uint32 group_id = 11; + */ + private int groupId; + + /** + * optional .MotionInfo motion = 2; + */ + private final MotionInfoOuterClass.MotionInfo motion = MotionInfoOuterClass.MotionInfo.newInstance(); + + /** + * optional .RotateMapCsReq.LHBLGBPKEAL rogue_map = 9; + */ + private final LHBLGBPKEAL rogueMap = LHBLGBPKEAL.newInstance(); + + private RotateMapCsReq() { + } + + /** + * @return a new empty instance of {@code RotateMapCsReq} + */ + public static RotateMapCsReq newInstance() { + return new RotateMapCsReq(); + } + + /** + * optional uint32 unk_int = 8; + * @return whether the unkInt field is set + */ + public boolean hasUnkInt() { + return (bitField0_ & 0x00000001) != 0; + } + + /** + * optional uint32 unk_int = 8; + * @return this + */ + public RotateMapCsReq clearUnkInt() { + bitField0_ &= ~0x00000001; + unkInt = 0; + return this; + } + + /** + * optional uint32 unk_int = 8; + * @return the unkInt + */ + public int getUnkInt() { + return unkInt; + } + + /** + * optional uint32 unk_int = 8; + * @param value the unkInt to set + * @return this + */ + public RotateMapCsReq setUnkInt(final int value) { + bitField0_ |= 0x00000001; + unkInt = value; + return this; + } + + /** + * optional uint32 group_id = 11; + * @return whether the groupId field is set + */ + public boolean hasGroupId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 group_id = 11; + * @return this + */ + public RotateMapCsReq clearGroupId() { + bitField0_ &= ~0x00000002; + groupId = 0; + return this; + } + + /** + * optional uint32 group_id = 11; + * @return the groupId + */ + public int getGroupId() { + return groupId; + } + + /** + * optional uint32 group_id = 11; + * @param value the groupId to set + * @return this + */ + public RotateMapCsReq setGroupId(final int value) { + bitField0_ |= 0x00000002; + groupId = value; + return this; + } + + /** + * optional .MotionInfo motion = 2; + * @return whether the motion field is set + */ + public boolean hasMotion() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional .MotionInfo motion = 2; + * @return this + */ + public RotateMapCsReq clearMotion() { + bitField0_ &= ~0x00000004; + motion.clear(); + return this; + } + + /** + * optional .MotionInfo motion = 2; + * + * This method returns the internal storage object without modifying any has state. + * The returned object should not be modified and be treated as read-only. + * + * Use {@link #getMutableMotion()} if you want to modify it. + * + * @return internal storage object for reading + */ + public MotionInfoOuterClass.MotionInfo getMotion() { + return motion; + } + + /** + * optional .MotionInfo motion = 2; + * + * This method returns the internal storage object and sets the corresponding + * has state. The returned object will become part of this message and its + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public MotionInfoOuterClass.MotionInfo getMutableMotion() { + bitField0_ |= 0x00000004; + return motion; + } + + /** + * optional .MotionInfo motion = 2; + * @param value the motion to set + * @return this + */ + public RotateMapCsReq setMotion(final MotionInfoOuterClass.MotionInfo value) { + bitField0_ |= 0x00000004; + motion.copyFrom(value); + return this; + } + + /** + * optional .RotateMapCsReq.LHBLGBPKEAL rogue_map = 9; + * @return whether the rogueMap field is set + */ + public boolean hasRogueMap() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional .RotateMapCsReq.LHBLGBPKEAL rogue_map = 9; + * @return this + */ + public RotateMapCsReq clearRogueMap() { + bitField0_ &= ~0x00000008; + rogueMap.clear(); + return this; + } + + /** + * optional .RotateMapCsReq.LHBLGBPKEAL rogue_map = 9; + * + * This method returns the internal storage object without modifying any has state. + * The returned object should not be modified and be treated as read-only. + * + * Use {@link #getMutableRogueMap()} if you want to modify it. + * + * @return internal storage object for reading + */ + public LHBLGBPKEAL getRogueMap() { + return rogueMap; + } + + /** + * optional .RotateMapCsReq.LHBLGBPKEAL rogue_map = 9; + * + * This method returns the internal storage object and sets the corresponding + * has state. The returned object will become part of this message and its + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public LHBLGBPKEAL getMutableRogueMap() { + bitField0_ |= 0x00000008; + return rogueMap; + } + + /** + * optional .RotateMapCsReq.LHBLGBPKEAL rogue_map = 9; + * @param value the rogueMap to set + * @return this + */ + public RotateMapCsReq setRogueMap(final LHBLGBPKEAL value) { + bitField0_ |= 0x00000008; + rogueMap.copyFrom(value); + return this; + } + + @Override + public RotateMapCsReq copyFrom(final RotateMapCsReq other) { + cachedSize = other.cachedSize; + if ((bitField0_ | other.bitField0_) != 0) { + bitField0_ = other.bitField0_; + unkInt = other.unkInt; + groupId = other.groupId; + motion.copyFrom(other.motion); + rogueMap.copyFrom(other.rogueMap); + } + return this; + } + + @Override + public RotateMapCsReq mergeFrom(final RotateMapCsReq other) { + if (other.isEmpty()) { + return this; + } + cachedSize = -1; + if (other.hasUnkInt()) { + setUnkInt(other.unkInt); + } + if (other.hasGroupId()) { + setGroupId(other.groupId); + } + if (other.hasMotion()) { + getMutableMotion().mergeFrom(other.motion); + } + if (other.hasRogueMap()) { + getMutableRogueMap().mergeFrom(other.rogueMap); + } + return this; + } + + @Override + public RotateMapCsReq clear() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + unkInt = 0; + groupId = 0; + motion.clear(); + rogueMap.clear(); + return this; + } + + @Override + public RotateMapCsReq clearQuick() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + motion.clearQuick(); + rogueMap.clearQuick(); + return this; + } + + @Override + public boolean equals(Object o) { + if (o == this) { + return true; + } + if (!(o instanceof RotateMapCsReq)) { + return false; + } + RotateMapCsReq other = (RotateMapCsReq) o; + return bitField0_ == other.bitField0_ + && (!hasUnkInt() || unkInt == other.unkInt) + && (!hasGroupId() || groupId == other.groupId) + && (!hasMotion() || motion.equals(other.motion)) + && (!hasRogueMap() || rogueMap.equals(other.rogueMap)); + } + + @Override + public void writeTo(final ProtoSink output) throws IOException { + if ((bitField0_ & 0x00000001) != 0) { + output.writeRawByte((byte) 64); + output.writeUInt32NoTag(unkInt); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 88); + output.writeUInt32NoTag(groupId); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 18); + output.writeMessageNoTag(motion); + } + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 74); + output.writeMessageNoTag(rogueMap); + } + } + + @Override + protected int computeSerializedSize() { + int size = 0; + if ((bitField0_ & 0x00000001) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(unkInt); + } + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(groupId); + } + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeMessageSizeNoTag(motion); + } + if ((bitField0_ & 0x00000008) != 0) { + size += 1 + ProtoSink.computeMessageSizeNoTag(rogueMap); + } + return size; + } + + @Override + @SuppressWarnings("fallthrough") + public RotateMapCsReq mergeFrom(final ProtoSource input) throws IOException { + // Enabled Fall-Through Optimization (QuickBuffers) + int tag = input.readTag(); + while (true) { + switch (tag) { + case 64: { + // unkInt + unkInt = input.readUInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 88) { + break; + } + } + case 88: { + // groupId + groupId = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 18) { + break; + } + } + case 18: { + // motion + input.readMessage(motion); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 74) { + break; + } + } + case 74: { + // rogueMap + input.readMessage(rogueMap); + bitField0_ |= 0x00000008; + tag = input.readTag(); + if (tag != 0) { + break; + } + } + case 0: { + return this; + } + default: { + if (!input.skipField(tag)) { + return this; + } + tag = input.readTag(); + break; + } + } + } + } + + @Override + public void writeTo(final JsonSink output) throws IOException { + output.beginObject(); + if ((bitField0_ & 0x00000001) != 0) { + output.writeUInt32(FieldNames.unkInt, unkInt); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeUInt32(FieldNames.groupId, groupId); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeMessage(FieldNames.motion, motion); + } + if ((bitField0_ & 0x00000008) != 0) { + output.writeMessage(FieldNames.rogueMap, rogueMap); + } + output.endObject(); + } + + @Override + public RotateMapCsReq mergeFrom(final JsonSource input) throws IOException { + if (!input.beginObject()) { + return this; + } + while (!input.isAtEnd()) { + switch (input.readFieldHash()) { + case -840508003: + case -285293790: { + if (input.isAtField(FieldNames.unkInt)) { + if (!input.trySkipNullValue()) { + unkInt = input.readUInt32(); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } + case 293428218: + case 506361563: { + if (input.isAtField(FieldNames.groupId)) { + if (!input.trySkipNullValue()) { + groupId = input.readUInt32(); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + case -1068318794: { + if (input.isAtField(FieldNames.motion)) { + if (!input.trySkipNullValue()) { + input.readMessage(motion); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } + case -394483422: + case 656463223: { + if (input.isAtField(FieldNames.rogueMap)) { + if (!input.trySkipNullValue()) { + input.readMessage(rogueMap); + bitField0_ |= 0x00000008; + } + } else { + input.skipUnknownField(); + } + break; + } + default: { + input.skipUnknownField(); + break; + } + } + } + input.endObject(); + return this; + } + + @Override + public RotateMapCsReq clone() { + return new RotateMapCsReq().copyFrom(this); + } + + @Override + public boolean isEmpty() { + return ((bitField0_) == 0); + } + + public static RotateMapCsReq parseFrom(final byte[] data) throws + InvalidProtocolBufferException { + return ProtoMessage.mergeFrom(new RotateMapCsReq(), data).checkInitialized(); + } + + public static RotateMapCsReq parseFrom(final ProtoSource input) throws IOException { + return ProtoMessage.mergeFrom(new RotateMapCsReq(), input).checkInitialized(); + } + + public static RotateMapCsReq parseFrom(final JsonSource input) throws IOException { + return ProtoMessage.mergeFrom(new RotateMapCsReq(), input).checkInitialized(); + } + + /** + * @return factory for creating RotateMapCsReq messages + */ + public static MessageFactory getFactory() { + return RotateMapCsReqFactory.INSTANCE; + } + + /** + * Protobuf type {@code ICOFBBCMENF} + */ + public static final class ICOFBBCMENF extends ProtoMessage implements Cloneable { + private static final long serialVersionUID = 0L; + + /** + * optional float FAAFKIAENEO = 2; + */ + private float fAAFKIAENEO; + + /** + * optional float y = 3; + */ + private float y; + + /** + * optional float z = 4; + */ + private float z; + + /** + * optional float x = 15; + */ + private float x; + + private ICOFBBCMENF() { + } + + /** + * @return a new empty instance of {@code ICOFBBCMENF} + */ + public static ICOFBBCMENF newInstance() { + return new ICOFBBCMENF(); + } + + /** + * optional float FAAFKIAENEO = 2; + * @return whether the fAAFKIAENEO field is set + */ + public boolean hasFAAFKIAENEO() { + return (bitField0_ & 0x00000001) != 0; + } + + /** + * optional float FAAFKIAENEO = 2; + * @return this + */ + public ICOFBBCMENF clearFAAFKIAENEO() { + bitField0_ &= ~0x00000001; + fAAFKIAENEO = 0F; + return this; + } + + /** + * optional float FAAFKIAENEO = 2; + * @return the fAAFKIAENEO + */ + public float getFAAFKIAENEO() { + return fAAFKIAENEO; + } + + /** + * optional float FAAFKIAENEO = 2; + * @param value the fAAFKIAENEO to set + * @return this + */ + public ICOFBBCMENF setFAAFKIAENEO(final float value) { + bitField0_ |= 0x00000001; + fAAFKIAENEO = value; + return this; + } + + /** + * optional float y = 3; + * @return whether the y field is set + */ + public boolean hasY() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional float y = 3; + * @return this + */ + public ICOFBBCMENF clearY() { + bitField0_ &= ~0x00000002; + y = 0F; + return this; + } + + /** + * optional float y = 3; + * @return the y + */ + public float getY() { + return y; + } + + /** + * optional float y = 3; + * @param value the y to set + * @return this + */ + public ICOFBBCMENF setY(final float value) { + bitField0_ |= 0x00000002; + y = value; + return this; + } + + /** + * optional float z = 4; + * @return whether the z field is set + */ + public boolean hasZ() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional float z = 4; + * @return this + */ + public ICOFBBCMENF clearZ() { + bitField0_ &= ~0x00000004; + z = 0F; + return this; + } + + /** + * optional float z = 4; + * @return the z + */ + public float getZ() { + return z; + } + + /** + * optional float z = 4; + * @param value the z to set + * @return this + */ + public ICOFBBCMENF setZ(final float value) { + bitField0_ |= 0x00000004; + z = value; + return this; + } + + /** + * optional float x = 15; + * @return whether the x field is set + */ + public boolean hasX() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional float x = 15; + * @return this + */ + public ICOFBBCMENF clearX() { + bitField0_ &= ~0x00000008; + x = 0F; + return this; + } + + /** + * optional float x = 15; + * @return the x + */ + public float getX() { + return x; + } + + /** + * optional float x = 15; + * @param value the x to set + * @return this + */ + public ICOFBBCMENF setX(final float value) { + bitField0_ |= 0x00000008; + x = value; + return this; + } + + @Override + public ICOFBBCMENF copyFrom(final ICOFBBCMENF other) { + cachedSize = other.cachedSize; + if ((bitField0_ | other.bitField0_) != 0) { + bitField0_ = other.bitField0_; + fAAFKIAENEO = other.fAAFKIAENEO; + y = other.y; + z = other.z; + x = other.x; + } + return this; + } + + @Override + public ICOFBBCMENF mergeFrom(final ICOFBBCMENF other) { + if (other.isEmpty()) { + return this; + } + cachedSize = -1; + if (other.hasFAAFKIAENEO()) { + setFAAFKIAENEO(other.fAAFKIAENEO); + } + if (other.hasY()) { + setY(other.y); + } + if (other.hasZ()) { + setZ(other.z); + } + if (other.hasX()) { + setX(other.x); + } + return this; + } + + @Override + public ICOFBBCMENF clear() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + fAAFKIAENEO = 0F; + y = 0F; + z = 0F; + x = 0F; + return this; + } + + @Override + public ICOFBBCMENF clearQuick() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + return this; + } + + @Override + public boolean equals(Object o) { + if (o == this) { + return true; + } + if (!(o instanceof ICOFBBCMENF)) { + return false; + } + ICOFBBCMENF other = (ICOFBBCMENF) o; + return bitField0_ == other.bitField0_ + && (!hasFAAFKIAENEO() || ProtoUtil.isEqual(fAAFKIAENEO, other.fAAFKIAENEO)) + && (!hasY() || ProtoUtil.isEqual(y, other.y)) + && (!hasZ() || ProtoUtil.isEqual(z, other.z)) + && (!hasX() || ProtoUtil.isEqual(x, other.x)); + } + + @Override + public void writeTo(final ProtoSink output) throws IOException { + if ((bitField0_ & 0x00000001) != 0) { + output.writeRawByte((byte) 21); + output.writeFloatNoTag(fAAFKIAENEO); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 29); + output.writeFloatNoTag(y); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 37); + output.writeFloatNoTag(z); + } + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 125); + output.writeFloatNoTag(x); + } + } + + @Override + protected int computeSerializedSize() { + int size = 0; + if ((bitField0_ & 0x00000001) != 0) { + size += 5; + } + if ((bitField0_ & 0x00000002) != 0) { + size += 5; + } + if ((bitField0_ & 0x00000004) != 0) { + size += 5; + } + if ((bitField0_ & 0x00000008) != 0) { + size += 5; + } + return size; + } + + @Override + @SuppressWarnings("fallthrough") + public ICOFBBCMENF mergeFrom(final ProtoSource input) throws IOException { + // Enabled Fall-Through Optimization (QuickBuffers) + int tag = input.readTag(); + while (true) { + switch (tag) { + case 21: { + // fAAFKIAENEO + fAAFKIAENEO = input.readFloat(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 29) { + break; + } + } + case 29: { + // y + y = input.readFloat(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 37) { + break; + } + } + case 37: { + // z + z = input.readFloat(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 125) { + break; + } + } + case 125: { + // x + x = input.readFloat(); + bitField0_ |= 0x00000008; + tag = input.readTag(); + if (tag != 0) { + break; + } + } + case 0: { + return this; + } + default: { + if (!input.skipField(tag)) { + return this; + } + tag = input.readTag(); + break; + } + } + } + } + + @Override + public void writeTo(final JsonSink output) throws IOException { + output.beginObject(); + if ((bitField0_ & 0x00000001) != 0) { + output.writeFloat(FieldNames.fAAFKIAENEO, fAAFKIAENEO); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeFloat(FieldNames.y, y); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeFloat(FieldNames.z, z); + } + if ((bitField0_ & 0x00000008) != 0) { + output.writeFloat(FieldNames.x, x); + } + output.endObject(); + } + + @Override + public ICOFBBCMENF mergeFrom(final JsonSource input) throws IOException { + if (!input.beginObject()) { + return this; + } + while (!input.isAtEnd()) { + switch (input.readFieldHash()) { + case -908414442: { + if (input.isAtField(FieldNames.fAAFKIAENEO)) { + if (!input.trySkipNullValue()) { + fAAFKIAENEO = input.readFloat(); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } + case 121: { + if (input.isAtField(FieldNames.y)) { + if (!input.trySkipNullValue()) { + y = input.readFloat(); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + case 122: { + if (input.isAtField(FieldNames.z)) { + if (!input.trySkipNullValue()) { + z = input.readFloat(); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } + case 120: { + if (input.isAtField(FieldNames.x)) { + if (!input.trySkipNullValue()) { + x = input.readFloat(); + bitField0_ |= 0x00000008; + } + } else { + input.skipUnknownField(); + } + break; + } + default: { + input.skipUnknownField(); + break; + } + } + } + input.endObject(); + return this; + } + + @Override + public ICOFBBCMENF clone() { + return new ICOFBBCMENF().copyFrom(this); + } + + @Override + public boolean isEmpty() { + return ((bitField0_) == 0); + } + + public static ICOFBBCMENF parseFrom(final byte[] data) throws InvalidProtocolBufferException { + return ProtoMessage.mergeFrom(new ICOFBBCMENF(), data).checkInitialized(); + } + + public static ICOFBBCMENF parseFrom(final ProtoSource input) throws IOException { + return ProtoMessage.mergeFrom(new ICOFBBCMENF(), input).checkInitialized(); + } + + public static ICOFBBCMENF parseFrom(final JsonSource input) throws IOException { + return ProtoMessage.mergeFrom(new ICOFBBCMENF(), input).checkInitialized(); + } + + /** + * @return factory for creating ICOFBBCMENF messages + */ + public static MessageFactory getFactory() { + return ICOFBBCMENFFactory.INSTANCE; + } + + private enum ICOFBBCMENFFactory implements MessageFactory { + INSTANCE; + + @Override + public ICOFBBCMENF create() { + return ICOFBBCMENF.newInstance(); + } + } + + /** + * Contains name constants used for serializing JSON + */ + static class FieldNames { + static final FieldName fAAFKIAENEO = FieldName.forField("FAAFKIAENEO"); + + static final FieldName y = FieldName.forField("y"); + + static final FieldName z = FieldName.forField("z"); + + static final FieldName x = FieldName.forField("x"); + } + } + + /** + * Protobuf type {@code LHBLGBPKEAL} + */ + public static final class LHBLGBPKEAL extends ProtoMessage implements Cloneable { + private static final long serialVersionUID = 0L; + + /** + * optional .RotateMapCsReq.ICOFBBCMENF JBCABOABIDI = 9; + */ + private final ICOFBBCMENF jBCABOABIDI = ICOFBBCMENF.newInstance(); + + /** + * optional .Vector IENLJAFIBOL = 15; + */ + private final VectorOuterClass.Vector iENLJAFIBOL = VectorOuterClass.Vector.newInstance(); + + private LHBLGBPKEAL() { + } + + /** + * @return a new empty instance of {@code LHBLGBPKEAL} + */ + public static LHBLGBPKEAL newInstance() { + return new LHBLGBPKEAL(); + } + + /** + * optional .RotateMapCsReq.ICOFBBCMENF JBCABOABIDI = 9; + * @return whether the jBCABOABIDI field is set + */ + public boolean hasJBCABOABIDI() { + return (bitField0_ & 0x00000001) != 0; + } + + /** + * optional .RotateMapCsReq.ICOFBBCMENF JBCABOABIDI = 9; + * @return this + */ + public LHBLGBPKEAL clearJBCABOABIDI() { + bitField0_ &= ~0x00000001; + jBCABOABIDI.clear(); + return this; + } + + /** + * optional .RotateMapCsReq.ICOFBBCMENF JBCABOABIDI = 9; + * + * This method returns the internal storage object without modifying any has state. + * The returned object should not be modified and be treated as read-only. + * + * Use {@link #getMutableJBCABOABIDI()} if you want to modify it. + * + * @return internal storage object for reading + */ + public ICOFBBCMENF getJBCABOABIDI() { + return jBCABOABIDI; + } + + /** + * optional .RotateMapCsReq.ICOFBBCMENF JBCABOABIDI = 9; + * + * This method returns the internal storage object and sets the corresponding + * has state. The returned object will become part of this message and its + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public ICOFBBCMENF getMutableJBCABOABIDI() { + bitField0_ |= 0x00000001; + return jBCABOABIDI; + } + + /** + * optional .RotateMapCsReq.ICOFBBCMENF JBCABOABIDI = 9; + * @param value the jBCABOABIDI to set + * @return this + */ + public LHBLGBPKEAL setJBCABOABIDI(final ICOFBBCMENF value) { + bitField0_ |= 0x00000001; + jBCABOABIDI.copyFrom(value); + return this; + } + + /** + * optional .Vector IENLJAFIBOL = 15; + * @return whether the iENLJAFIBOL field is set + */ + public boolean hasIENLJAFIBOL() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional .Vector IENLJAFIBOL = 15; + * @return this + */ + public LHBLGBPKEAL clearIENLJAFIBOL() { + bitField0_ &= ~0x00000002; + iENLJAFIBOL.clear(); + return this; + } + + /** + * optional .Vector IENLJAFIBOL = 15; + * + * This method returns the internal storage object without modifying any has state. + * The returned object should not be modified and be treated as read-only. + * + * Use {@link #getMutableIENLJAFIBOL()} if you want to modify it. + * + * @return internal storage object for reading + */ + public VectorOuterClass.Vector getIENLJAFIBOL() { + return iENLJAFIBOL; + } + + /** + * optional .Vector IENLJAFIBOL = 15; + * + * This method returns the internal storage object and sets the corresponding + * has state. The returned object will become part of this message and its + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public VectorOuterClass.Vector getMutableIENLJAFIBOL() { + bitField0_ |= 0x00000002; + return iENLJAFIBOL; + } + + /** + * optional .Vector IENLJAFIBOL = 15; + * @param value the iENLJAFIBOL to set + * @return this + */ + public LHBLGBPKEAL setIENLJAFIBOL(final VectorOuterClass.Vector value) { + bitField0_ |= 0x00000002; + iENLJAFIBOL.copyFrom(value); + return this; + } + + @Override + public LHBLGBPKEAL copyFrom(final LHBLGBPKEAL other) { + cachedSize = other.cachedSize; + if ((bitField0_ | other.bitField0_) != 0) { + bitField0_ = other.bitField0_; + jBCABOABIDI.copyFrom(other.jBCABOABIDI); + iENLJAFIBOL.copyFrom(other.iENLJAFIBOL); + } + return this; + } + + @Override + public LHBLGBPKEAL mergeFrom(final LHBLGBPKEAL other) { + if (other.isEmpty()) { + return this; + } + cachedSize = -1; + if (other.hasJBCABOABIDI()) { + getMutableJBCABOABIDI().mergeFrom(other.jBCABOABIDI); + } + if (other.hasIENLJAFIBOL()) { + getMutableIENLJAFIBOL().mergeFrom(other.iENLJAFIBOL); + } + return this; + } + + @Override + public LHBLGBPKEAL clear() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + jBCABOABIDI.clear(); + iENLJAFIBOL.clear(); + return this; + } + + @Override + public LHBLGBPKEAL clearQuick() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + jBCABOABIDI.clearQuick(); + iENLJAFIBOL.clearQuick(); + return this; + } + + @Override + public boolean equals(Object o) { + if (o == this) { + return true; + } + if (!(o instanceof LHBLGBPKEAL)) { + return false; + } + LHBLGBPKEAL other = (LHBLGBPKEAL) o; + return bitField0_ == other.bitField0_ + && (!hasJBCABOABIDI() || jBCABOABIDI.equals(other.jBCABOABIDI)) + && (!hasIENLJAFIBOL() || iENLJAFIBOL.equals(other.iENLJAFIBOL)); + } + + @Override + public void writeTo(final ProtoSink output) throws IOException { + if ((bitField0_ & 0x00000001) != 0) { + output.writeRawByte((byte) 74); + output.writeMessageNoTag(jBCABOABIDI); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 122); + output.writeMessageNoTag(iENLJAFIBOL); + } + } + + @Override + protected int computeSerializedSize() { + int size = 0; + if ((bitField0_ & 0x00000001) != 0) { + size += 1 + ProtoSink.computeMessageSizeNoTag(jBCABOABIDI); + } + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeMessageSizeNoTag(iENLJAFIBOL); + } + return size; + } + + @Override + @SuppressWarnings("fallthrough") + public LHBLGBPKEAL mergeFrom(final ProtoSource input) throws IOException { + // Enabled Fall-Through Optimization (QuickBuffers) + int tag = input.readTag(); + while (true) { + switch (tag) { + case 74: { + // jBCABOABIDI + input.readMessage(jBCABOABIDI); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 122) { + break; + } + } + case 122: { + // iENLJAFIBOL + input.readMessage(iENLJAFIBOL); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 0) { + break; + } + } + case 0: { + return this; + } + default: { + if (!input.skipField(tag)) { + return this; + } + tag = input.readTag(); + break; + } + } + } + } + + @Override + public void writeTo(final JsonSink output) throws IOException { + output.beginObject(); + if ((bitField0_ & 0x00000001) != 0) { + output.writeMessage(FieldNames.jBCABOABIDI, jBCABOABIDI); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeMessage(FieldNames.iENLJAFIBOL, iENLJAFIBOL); + } + output.endObject(); + } + + @Override + public LHBLGBPKEAL mergeFrom(final JsonSource input) throws IOException { + if (!input.beginObject()) { + return this; + } + while (!input.isAtEnd()) { + switch (input.readFieldHash()) { + case 1627224650: { + if (input.isAtField(FieldNames.jBCABOABIDI)) { + if (!input.trySkipNullValue()) { + input.readMessage(jBCABOABIDI); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } + case 237656587: { + if (input.isAtField(FieldNames.iENLJAFIBOL)) { + if (!input.trySkipNullValue()) { + input.readMessage(iENLJAFIBOL); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + default: { + input.skipUnknownField(); + break; + } + } + } + input.endObject(); + return this; + } + + @Override + public LHBLGBPKEAL clone() { + return new LHBLGBPKEAL().copyFrom(this); + } + + @Override + public boolean isEmpty() { + return ((bitField0_) == 0); + } + + public static LHBLGBPKEAL parseFrom(final byte[] data) throws InvalidProtocolBufferException { + return ProtoMessage.mergeFrom(new LHBLGBPKEAL(), data).checkInitialized(); + } + + public static LHBLGBPKEAL parseFrom(final ProtoSource input) throws IOException { + return ProtoMessage.mergeFrom(new LHBLGBPKEAL(), input).checkInitialized(); + } + + public static LHBLGBPKEAL parseFrom(final JsonSource input) throws IOException { + return ProtoMessage.mergeFrom(new LHBLGBPKEAL(), input).checkInitialized(); + } + + /** + * @return factory for creating LHBLGBPKEAL messages + */ + public static MessageFactory getFactory() { + return LHBLGBPKEALFactory.INSTANCE; + } + + private enum LHBLGBPKEALFactory implements MessageFactory { + INSTANCE; + + @Override + public LHBLGBPKEAL create() { + return LHBLGBPKEAL.newInstance(); + } + } + + /** + * Contains name constants used for serializing JSON + */ + static class FieldNames { + static final FieldName jBCABOABIDI = FieldName.forField("JBCABOABIDI"); + + static final FieldName iENLJAFIBOL = FieldName.forField("IENLJAFIBOL"); + } + } + + private enum RotateMapCsReqFactory implements MessageFactory { + INSTANCE; + + @Override + public RotateMapCsReq create() { + return RotateMapCsReq.newInstance(); + } + } + + /** + * Contains name constants used for serializing JSON + */ + static class FieldNames { + static final FieldName unkInt = FieldName.forField("unkInt", "unk_int"); + + static final FieldName groupId = FieldName.forField("groupId", "group_id"); + + static final FieldName motion = FieldName.forField("motion"); + + static final FieldName rogueMap = FieldName.forField("rogueMap", "rogue_map"); + } + } +} diff --git a/src/generated/main/emu/lunarcore/proto/RotateMapScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/RotateMapScRspOuterClass.java new file mode 100644 index 000000000..321a0bf5b --- /dev/null +++ b/src/generated/main/emu/lunarcore/proto/RotateMapScRspOuterClass.java @@ -0,0 +1,441 @@ +// Code generated by protocol buffer compiler. Do not edit! +package emu.lunarcore.proto; + +import java.io.IOException; +import us.hebi.quickbuf.FieldName; +import us.hebi.quickbuf.InvalidProtocolBufferException; +import us.hebi.quickbuf.JsonSink; +import us.hebi.quickbuf.JsonSource; +import us.hebi.quickbuf.MessageFactory; +import us.hebi.quickbuf.ProtoMessage; +import us.hebi.quickbuf.ProtoSink; +import us.hebi.quickbuf.ProtoSource; + +public final class RotateMapScRspOuterClass { + /** + * Protobuf type {@code RotateMapScRsp} + */ + public static final class RotateMapScRsp extends ProtoMessage implements Cloneable { + private static final long serialVersionUID = 0L; + + /** + * optional uint32 retcode = 1; + */ + private int retcode; + + /** + * optional uint32 client_pos_version = 14; + */ + private int clientPosVersion; + + /** + * optional .MotionInfo motion = 13; + */ + private final MotionInfoOuterClass.MotionInfo motion = MotionInfoOuterClass.MotionInfo.newInstance(); + + private RotateMapScRsp() { + } + + /** + * @return a new empty instance of {@code RotateMapScRsp} + */ + public static RotateMapScRsp newInstance() { + return new RotateMapScRsp(); + } + + /** + * optional uint32 retcode = 1; + * @return whether the retcode field is set + */ + public boolean hasRetcode() { + return (bitField0_ & 0x00000001) != 0; + } + + /** + * optional uint32 retcode = 1; + * @return this + */ + public RotateMapScRsp clearRetcode() { + bitField0_ &= ~0x00000001; + retcode = 0; + return this; + } + + /** + * optional uint32 retcode = 1; + * @return the retcode + */ + public int getRetcode() { + return retcode; + } + + /** + * optional uint32 retcode = 1; + * @param value the retcode to set + * @return this + */ + public RotateMapScRsp setRetcode(final int value) { + bitField0_ |= 0x00000001; + retcode = value; + return this; + } + + /** + * optional uint32 client_pos_version = 14; + * @return whether the clientPosVersion field is set + */ + public boolean hasClientPosVersion() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 client_pos_version = 14; + * @return this + */ + public RotateMapScRsp clearClientPosVersion() { + bitField0_ &= ~0x00000002; + clientPosVersion = 0; + return this; + } + + /** + * optional uint32 client_pos_version = 14; + * @return the clientPosVersion + */ + public int getClientPosVersion() { + return clientPosVersion; + } + + /** + * optional uint32 client_pos_version = 14; + * @param value the clientPosVersion to set + * @return this + */ + public RotateMapScRsp setClientPosVersion(final int value) { + bitField0_ |= 0x00000002; + clientPosVersion = value; + return this; + } + + /** + * optional .MotionInfo motion = 13; + * @return whether the motion field is set + */ + public boolean hasMotion() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional .MotionInfo motion = 13; + * @return this + */ + public RotateMapScRsp clearMotion() { + bitField0_ &= ~0x00000004; + motion.clear(); + return this; + } + + /** + * optional .MotionInfo motion = 13; + * + * This method returns the internal storage object without modifying any has state. + * The returned object should not be modified and be treated as read-only. + * + * Use {@link #getMutableMotion()} if you want to modify it. + * + * @return internal storage object for reading + */ + public MotionInfoOuterClass.MotionInfo getMotion() { + return motion; + } + + /** + * optional .MotionInfo motion = 13; + * + * This method returns the internal storage object and sets the corresponding + * has state. The returned object will become part of this message and its + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public MotionInfoOuterClass.MotionInfo getMutableMotion() { + bitField0_ |= 0x00000004; + return motion; + } + + /** + * optional .MotionInfo motion = 13; + * @param value the motion to set + * @return this + */ + public RotateMapScRsp setMotion(final MotionInfoOuterClass.MotionInfo value) { + bitField0_ |= 0x00000004; + motion.copyFrom(value); + return this; + } + + @Override + public RotateMapScRsp copyFrom(final RotateMapScRsp other) { + cachedSize = other.cachedSize; + if ((bitField0_ | other.bitField0_) != 0) { + bitField0_ = other.bitField0_; + retcode = other.retcode; + clientPosVersion = other.clientPosVersion; + motion.copyFrom(other.motion); + } + return this; + } + + @Override + public RotateMapScRsp mergeFrom(final RotateMapScRsp other) { + if (other.isEmpty()) { + return this; + } + cachedSize = -1; + if (other.hasRetcode()) { + setRetcode(other.retcode); + } + if (other.hasClientPosVersion()) { + setClientPosVersion(other.clientPosVersion); + } + if (other.hasMotion()) { + getMutableMotion().mergeFrom(other.motion); + } + return this; + } + + @Override + public RotateMapScRsp clear() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + retcode = 0; + clientPosVersion = 0; + motion.clear(); + return this; + } + + @Override + public RotateMapScRsp clearQuick() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + motion.clearQuick(); + return this; + } + + @Override + public boolean equals(Object o) { + if (o == this) { + return true; + } + if (!(o instanceof RotateMapScRsp)) { + return false; + } + RotateMapScRsp other = (RotateMapScRsp) o; + return bitField0_ == other.bitField0_ + && (!hasRetcode() || retcode == other.retcode) + && (!hasClientPosVersion() || clientPosVersion == other.clientPosVersion) + && (!hasMotion() || motion.equals(other.motion)); + } + + @Override + public void writeTo(final ProtoSink output) throws IOException { + if ((bitField0_ & 0x00000001) != 0) { + output.writeRawByte((byte) 8); + output.writeUInt32NoTag(retcode); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(clientPosVersion); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 106); + output.writeMessageNoTag(motion); + } + } + + @Override + protected int computeSerializedSize() { + int size = 0; + if ((bitField0_ & 0x00000001) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + } + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(clientPosVersion); + } + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeMessageSizeNoTag(motion); + } + return size; + } + + @Override + @SuppressWarnings("fallthrough") + public RotateMapScRsp mergeFrom(final ProtoSource input) throws IOException { + // Enabled Fall-Through Optimization (QuickBuffers) + int tag = input.readTag(); + while (true) { + switch (tag) { + case 8: { + // retcode + retcode = input.readUInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 112) { + break; + } + } + case 112: { + // clientPosVersion + clientPosVersion = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 106) { + break; + } + } + case 106: { + // motion + input.readMessage(motion); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 0) { + break; + } + } + case 0: { + return this; + } + default: { + if (!input.skipField(tag)) { + return this; + } + tag = input.readTag(); + break; + } + } + } + } + + @Override + public void writeTo(final JsonSink output) throws IOException { + output.beginObject(); + if ((bitField0_ & 0x00000001) != 0) { + output.writeUInt32(FieldNames.retcode, retcode); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeUInt32(FieldNames.clientPosVersion, clientPosVersion); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeMessage(FieldNames.motion, motion); + } + output.endObject(); + } + + @Override + public RotateMapScRsp mergeFrom(final JsonSource input) throws IOException { + if (!input.beginObject()) { + return this; + } + while (!input.isAtEnd()) { + switch (input.readFieldHash()) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { + if (!input.trySkipNullValue()) { + retcode = input.readUInt32(); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } + case 1787644431: + case 1278860153: { + if (input.isAtField(FieldNames.clientPosVersion)) { + if (!input.trySkipNullValue()) { + clientPosVersion = input.readUInt32(); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + case -1068318794: { + if (input.isAtField(FieldNames.motion)) { + if (!input.trySkipNullValue()) { + input.readMessage(motion); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } + default: { + input.skipUnknownField(); + break; + } + } + } + input.endObject(); + return this; + } + + @Override + public RotateMapScRsp clone() { + return new RotateMapScRsp().copyFrom(this); + } + + @Override + public boolean isEmpty() { + return ((bitField0_) == 0); + } + + public static RotateMapScRsp parseFrom(final byte[] data) throws + InvalidProtocolBufferException { + return ProtoMessage.mergeFrom(new RotateMapScRsp(), data).checkInitialized(); + } + + public static RotateMapScRsp parseFrom(final ProtoSource input) throws IOException { + return ProtoMessage.mergeFrom(new RotateMapScRsp(), input).checkInitialized(); + } + + public static RotateMapScRsp parseFrom(final JsonSource input) throws IOException { + return ProtoMessage.mergeFrom(new RotateMapScRsp(), input).checkInitialized(); + } + + /** + * @return factory for creating RotateMapScRsp messages + */ + public static MessageFactory getFactory() { + return RotateMapScRspFactory.INSTANCE; + } + + private enum RotateMapScRspFactory implements MessageFactory { + INSTANCE; + + @Override + public RotateMapScRsp create() { + return RotateMapScRsp.newInstance(); + } + } + + /** + * Contains name constants used for serializing JSON + */ + static class FieldNames { + static final FieldName retcode = FieldName.forField("retcode"); + + static final FieldName clientPosVersion = FieldName.forField("clientPosVersion", "client_pos_version"); + + static final FieldName motion = FieldName.forField("motion"); + } + } +} diff --git a/src/generated/main/emu/lunarcore/proto/RotaterDataOuterClass.java b/src/generated/main/emu/lunarcore/proto/RotaterDataOuterClass.java new file mode 100644 index 000000000..079e0d76c --- /dev/null +++ b/src/generated/main/emu/lunarcore/proto/RotaterDataOuterClass.java @@ -0,0 +1,420 @@ +// Code generated by protocol buffer compiler. Do not edit! +package emu.lunarcore.proto; + +import java.io.IOException; +import us.hebi.quickbuf.FieldName; +import us.hebi.quickbuf.InvalidProtocolBufferException; +import us.hebi.quickbuf.JsonSink; +import us.hebi.quickbuf.JsonSource; +import us.hebi.quickbuf.MessageFactory; +import us.hebi.quickbuf.ProtoMessage; +import us.hebi.quickbuf.ProtoSink; +import us.hebi.quickbuf.ProtoSource; +import us.hebi.quickbuf.ProtoUtil; + +public final class RotaterDataOuterClass { + /** + * Protobuf type {@code RotaterData} + */ + public static final class RotaterData extends ProtoMessage implements Cloneable { + private static final long serialVersionUID = 0L; + + /** + * optional float GNECDPPELLO = 8; + */ + private float gNECDPPELLO; + + /** + * optional uint32 group_id = 3; + */ + private int groupId; + + /** + * optional uint32 BPFADJDEGHP = 5; + */ + private int bPFADJDEGHP; + + private RotaterData() { + } + + /** + * @return a new empty instance of {@code RotaterData} + */ + public static RotaterData newInstance() { + return new RotaterData(); + } + + /** + * optional float GNECDPPELLO = 8; + * @return whether the gNECDPPELLO field is set + */ + public boolean hasGNECDPPELLO() { + return (bitField0_ & 0x00000001) != 0; + } + + /** + * optional float GNECDPPELLO = 8; + * @return this + */ + public RotaterData clearGNECDPPELLO() { + bitField0_ &= ~0x00000001; + gNECDPPELLO = 0F; + return this; + } + + /** + * optional float GNECDPPELLO = 8; + * @return the gNECDPPELLO + */ + public float getGNECDPPELLO() { + return gNECDPPELLO; + } + + /** + * optional float GNECDPPELLO = 8; + * @param value the gNECDPPELLO to set + * @return this + */ + public RotaterData setGNECDPPELLO(final float value) { + bitField0_ |= 0x00000001; + gNECDPPELLO = value; + return this; + } + + /** + * optional uint32 group_id = 3; + * @return whether the groupId field is set + */ + public boolean hasGroupId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 group_id = 3; + * @return this + */ + public RotaterData clearGroupId() { + bitField0_ &= ~0x00000002; + groupId = 0; + return this; + } + + /** + * optional uint32 group_id = 3; + * @return the groupId + */ + public int getGroupId() { + return groupId; + } + + /** + * optional uint32 group_id = 3; + * @param value the groupId to set + * @return this + */ + public RotaterData setGroupId(final int value) { + bitField0_ |= 0x00000002; + groupId = value; + return this; + } + + /** + * optional uint32 BPFADJDEGHP = 5; + * @return whether the bPFADJDEGHP field is set + */ + public boolean hasBPFADJDEGHP() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 BPFADJDEGHP = 5; + * @return this + */ + public RotaterData clearBPFADJDEGHP() { + bitField0_ &= ~0x00000004; + bPFADJDEGHP = 0; + return this; + } + + /** + * optional uint32 BPFADJDEGHP = 5; + * @return the bPFADJDEGHP + */ + public int getBPFADJDEGHP() { + return bPFADJDEGHP; + } + + /** + * optional uint32 BPFADJDEGHP = 5; + * @param value the bPFADJDEGHP to set + * @return this + */ + public RotaterData setBPFADJDEGHP(final int value) { + bitField0_ |= 0x00000004; + bPFADJDEGHP = value; + return this; + } + + @Override + public RotaterData copyFrom(final RotaterData other) { + cachedSize = other.cachedSize; + if ((bitField0_ | other.bitField0_) != 0) { + bitField0_ = other.bitField0_; + gNECDPPELLO = other.gNECDPPELLO; + groupId = other.groupId; + bPFADJDEGHP = other.bPFADJDEGHP; + } + return this; + } + + @Override + public RotaterData mergeFrom(final RotaterData other) { + if (other.isEmpty()) { + return this; + } + cachedSize = -1; + if (other.hasGNECDPPELLO()) { + setGNECDPPELLO(other.gNECDPPELLO); + } + if (other.hasGroupId()) { + setGroupId(other.groupId); + } + if (other.hasBPFADJDEGHP()) { + setBPFADJDEGHP(other.bPFADJDEGHP); + } + return this; + } + + @Override + public RotaterData clear() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + gNECDPPELLO = 0F; + groupId = 0; + bPFADJDEGHP = 0; + return this; + } + + @Override + public RotaterData clearQuick() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + return this; + } + + @Override + public boolean equals(Object o) { + if (o == this) { + return true; + } + if (!(o instanceof RotaterData)) { + return false; + } + RotaterData other = (RotaterData) o; + return bitField0_ == other.bitField0_ + && (!hasGNECDPPELLO() || ProtoUtil.isEqual(gNECDPPELLO, other.gNECDPPELLO)) + && (!hasGroupId() || groupId == other.groupId) + && (!hasBPFADJDEGHP() || bPFADJDEGHP == other.bPFADJDEGHP); + } + + @Override + public void writeTo(final ProtoSink output) throws IOException { + if ((bitField0_ & 0x00000001) != 0) { + output.writeRawByte((byte) 69); + output.writeFloatNoTag(gNECDPPELLO); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 24); + output.writeUInt32NoTag(groupId); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 40); + output.writeUInt32NoTag(bPFADJDEGHP); + } + } + + @Override + protected int computeSerializedSize() { + int size = 0; + if ((bitField0_ & 0x00000001) != 0) { + size += 5; + } + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(groupId); + } + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(bPFADJDEGHP); + } + return size; + } + + @Override + @SuppressWarnings("fallthrough") + public RotaterData mergeFrom(final ProtoSource input) throws IOException { + // Enabled Fall-Through Optimization (QuickBuffers) + int tag = input.readTag(); + while (true) { + switch (tag) { + case 69: { + // gNECDPPELLO + gNECDPPELLO = input.readFloat(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 24) { + break; + } + } + case 24: { + // groupId + groupId = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 40) { + break; + } + } + case 40: { + // bPFADJDEGHP + bPFADJDEGHP = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 0) { + break; + } + } + case 0: { + return this; + } + default: { + if (!input.skipField(tag)) { + return this; + } + tag = input.readTag(); + break; + } + } + } + } + + @Override + public void writeTo(final JsonSink output) throws IOException { + output.beginObject(); + if ((bitField0_ & 0x00000001) != 0) { + output.writeFloat(FieldNames.gNECDPPELLO, gNECDPPELLO); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeUInt32(FieldNames.groupId, groupId); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeUInt32(FieldNames.bPFADJDEGHP, bPFADJDEGHP); + } + output.endObject(); + } + + @Override + public RotaterData mergeFrom(final JsonSource input) throws IOException { + if (!input.beginObject()) { + return this; + } + while (!input.isAtEnd()) { + switch (input.readFieldHash()) { + case 2053242953: { + if (input.isAtField(FieldNames.gNECDPPELLO)) { + if (!input.trySkipNullValue()) { + gNECDPPELLO = input.readFloat(); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } + case 293428218: + case 506361563: { + if (input.isAtField(FieldNames.groupId)) { + if (!input.trySkipNullValue()) { + groupId = input.readUInt32(); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + case 874068223: { + if (input.isAtField(FieldNames.bPFADJDEGHP)) { + if (!input.trySkipNullValue()) { + bPFADJDEGHP = input.readUInt32(); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } + default: { + input.skipUnknownField(); + break; + } + } + } + input.endObject(); + return this; + } + + @Override + public RotaterData clone() { + return new RotaterData().copyFrom(this); + } + + @Override + public boolean isEmpty() { + return ((bitField0_) == 0); + } + + public static RotaterData parseFrom(final byte[] data) throws InvalidProtocolBufferException { + return ProtoMessage.mergeFrom(new RotaterData(), data).checkInitialized(); + } + + public static RotaterData parseFrom(final ProtoSource input) throws IOException { + return ProtoMessage.mergeFrom(new RotaterData(), input).checkInitialized(); + } + + public static RotaterData parseFrom(final JsonSource input) throws IOException { + return ProtoMessage.mergeFrom(new RotaterData(), input).checkInitialized(); + } + + /** + * @return factory for creating RotaterData messages + */ + public static MessageFactory getFactory() { + return RotaterDataFactory.INSTANCE; + } + + private enum RotaterDataFactory implements MessageFactory { + INSTANCE; + + @Override + public RotaterData create() { + return RotaterData.newInstance(); + } + } + + /** + * Contains name constants used for serializing JSON + */ + static class FieldNames { + static final FieldName gNECDPPELLO = FieldName.forField("GNECDPPELLO"); + + static final FieldName groupId = FieldName.forField("groupId", "group_id"); + + static final FieldName bPFADJDEGHP = FieldName.forField("BPFADJDEGHP"); + } + } +} diff --git a/src/generated/main/emu/lunarcore/proto/SceneActorInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneActorInfoOuterClass.java index 6caa0e9ee..72644466c 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneActorInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneActorInfoOuterClass.java @@ -19,22 +19,22 @@ public static final class SceneActorInfo extends ProtoMessage im private static final long serialVersionUID = 0L; /** - * optional uint32 map_layer = 4; + * optional uint32 uid = 7; */ - private int mapLayer; + private int uid; /** - * optional uint32 base_avatar_id = 7; + * optional uint32 map_layer = 12; */ - private int baseAvatarId; + private int mapLayer; /** - * optional uint32 uid = 10; + * optional uint32 base_avatar_id = 14; */ - private int uid; + private int baseAvatarId; /** - * optional .AvatarType avatar_type = 8; + * optional .AvatarType avatar_type = 13; */ private int avatarType; @@ -49,118 +49,118 @@ public static SceneActorInfo newInstance() { } /** - * optional uint32 map_layer = 4; - * @return whether the mapLayer field is set + * optional uint32 uid = 7; + * @return whether the uid field is set */ - public boolean hasMapLayer() { + public boolean hasUid() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 map_layer = 4; + * optional uint32 uid = 7; * @return this */ - public SceneActorInfo clearMapLayer() { + public SceneActorInfo clearUid() { bitField0_ &= ~0x00000001; - mapLayer = 0; + uid = 0; return this; } /** - * optional uint32 map_layer = 4; - * @return the mapLayer + * optional uint32 uid = 7; + * @return the uid */ - public int getMapLayer() { - return mapLayer; + public int getUid() { + return uid; } /** - * optional uint32 map_layer = 4; - * @param value the mapLayer to set + * optional uint32 uid = 7; + * @param value the uid to set * @return this */ - public SceneActorInfo setMapLayer(final int value) { + public SceneActorInfo setUid(final int value) { bitField0_ |= 0x00000001; - mapLayer = value; + uid = value; return this; } /** - * optional uint32 base_avatar_id = 7; - * @return whether the baseAvatarId field is set + * optional uint32 map_layer = 12; + * @return whether the mapLayer field is set */ - public boolean hasBaseAvatarId() { + public boolean hasMapLayer() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 base_avatar_id = 7; + * optional uint32 map_layer = 12; * @return this */ - public SceneActorInfo clearBaseAvatarId() { + public SceneActorInfo clearMapLayer() { bitField0_ &= ~0x00000002; - baseAvatarId = 0; + mapLayer = 0; return this; } /** - * optional uint32 base_avatar_id = 7; - * @return the baseAvatarId + * optional uint32 map_layer = 12; + * @return the mapLayer */ - public int getBaseAvatarId() { - return baseAvatarId; + public int getMapLayer() { + return mapLayer; } /** - * optional uint32 base_avatar_id = 7; - * @param value the baseAvatarId to set + * optional uint32 map_layer = 12; + * @param value the mapLayer to set * @return this */ - public SceneActorInfo setBaseAvatarId(final int value) { + public SceneActorInfo setMapLayer(final int value) { bitField0_ |= 0x00000002; - baseAvatarId = value; + mapLayer = value; return this; } /** - * optional uint32 uid = 10; - * @return whether the uid field is set + * optional uint32 base_avatar_id = 14; + * @return whether the baseAvatarId field is set */ - public boolean hasUid() { + public boolean hasBaseAvatarId() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 uid = 10; + * optional uint32 base_avatar_id = 14; * @return this */ - public SceneActorInfo clearUid() { + public SceneActorInfo clearBaseAvatarId() { bitField0_ &= ~0x00000004; - uid = 0; + baseAvatarId = 0; return this; } /** - * optional uint32 uid = 10; - * @return the uid + * optional uint32 base_avatar_id = 14; + * @return the baseAvatarId */ - public int getUid() { - return uid; + public int getBaseAvatarId() { + return baseAvatarId; } /** - * optional uint32 uid = 10; - * @param value the uid to set + * optional uint32 base_avatar_id = 14; + * @param value the baseAvatarId to set * @return this */ - public SceneActorInfo setUid(final int value) { + public SceneActorInfo setBaseAvatarId(final int value) { bitField0_ |= 0x00000004; - uid = value; + baseAvatarId = value; return this; } /** - * optional .AvatarType avatar_type = 8; + * optional .AvatarType avatar_type = 13; * @return whether the avatarType field is set */ public boolean hasAvatarType() { @@ -168,7 +168,7 @@ public boolean hasAvatarType() { } /** - * optional .AvatarType avatar_type = 8; + * optional .AvatarType avatar_type = 13; * @return this */ public SceneActorInfo clearAvatarType() { @@ -178,7 +178,7 @@ public SceneActorInfo clearAvatarType() { } /** - * optional .AvatarType avatar_type = 8; + * optional .AvatarType avatar_type = 13; * @return the avatarType */ public AvatarTypeOuterClass.AvatarType getAvatarType() { @@ -211,7 +211,7 @@ public SceneActorInfo setAvatarTypeValue(final int value) { } /** - * optional .AvatarType avatar_type = 8; + * optional .AvatarType avatar_type = 13; * @param value the avatarType to set * @return this */ @@ -226,9 +226,9 @@ public SceneActorInfo copyFrom(final SceneActorInfo other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; + uid = other.uid; mapLayer = other.mapLayer; baseAvatarId = other.baseAvatarId; - uid = other.uid; avatarType = other.avatarType; } return this; @@ -240,15 +240,15 @@ public SceneActorInfo mergeFrom(final SceneActorInfo other) { return this; } cachedSize = -1; + if (other.hasUid()) { + setUid(other.uid); + } if (other.hasMapLayer()) { setMapLayer(other.mapLayer); } if (other.hasBaseAvatarId()) { setBaseAvatarId(other.baseAvatarId); } - if (other.hasUid()) { - setUid(other.uid); - } if (other.hasAvatarType()) { setAvatarTypeValue(other.avatarType); } @@ -262,9 +262,9 @@ public SceneActorInfo clear() { } cachedSize = -1; bitField0_ = 0; + uid = 0; mapLayer = 0; baseAvatarId = 0; - uid = 0; avatarType = 0; return this; } @@ -289,28 +289,28 @@ public boolean equals(Object o) { } SceneActorInfo other = (SceneActorInfo) o; return bitField0_ == other.bitField0_ + && (!hasUid() || uid == other.uid) && (!hasMapLayer() || mapLayer == other.mapLayer) && (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId) - && (!hasUid() || uid == other.uid) && (!hasAvatarType() || avatarType == other.avatarType); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); - output.writeUInt32NoTag(mapLayer); + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(uid); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 56); - output.writeUInt32NoTag(baseAvatarId); + output.writeRawByte((byte) 96); + output.writeUInt32NoTag(mapLayer); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 80); - output.writeUInt32NoTag(uid); + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(baseAvatarId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 104); output.writeEnumNoTag(avatarType); } } @@ -319,13 +319,13 @@ public void writeTo(final ProtoSink output) throws IOException { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(mapLayer); + size += 1 + ProtoSink.computeUInt32SizeNoTag(uid); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(mapLayer); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(uid); + size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId); } if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeEnumSizeNoTag(avatarType); @@ -340,34 +340,34 @@ public SceneActorInfo mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { - // mapLayer - mapLayer = input.readUInt32(); + case 56: { + // uid + uid = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 56) { + if (tag != 96) { break; } } - case 56: { - // baseAvatarId - baseAvatarId = input.readUInt32(); + case 96: { + // mapLayer + mapLayer = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 80) { + if (tag != 112) { break; } } - case 80: { - // uid - uid = input.readUInt32(); + case 112: { + // baseAvatarId + baseAvatarId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 64) { + if (tag != 104) { break; } } - case 64: { + case 104: { // avatarType final int value = input.readInt32(); if (AvatarTypeOuterClass.AvatarType.forNumber(value) != null) { @@ -397,13 +397,13 @@ public SceneActorInfo mergeFrom(final ProtoSource input) throws IOException { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.mapLayer, mapLayer); + output.writeUInt32(FieldNames.uid, uid); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId); + output.writeUInt32(FieldNames.mapLayer, mapLayer); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.uid, uid); + output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId); } if ((bitField0_ & 0x00000008) != 0) { output.writeEnum(FieldNames.avatarType, avatarType, AvatarTypeOuterClass.AvatarType.converter()); @@ -418,11 +418,10 @@ public SceneActorInfo mergeFrom(final JsonSource input) throws IOException { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 160971093: - case 1248553134: { - if (input.isAtField(FieldNames.mapLayer)) { + case 115792: { + if (input.isAtField(FieldNames.uid)) { if (!input.trySkipNullValue()) { - mapLayer = input.readUInt32(); + uid = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -430,11 +429,11 @@ public SceneActorInfo mergeFrom(final JsonSource input) throws IOException { } break; } - case 118022725: - case -1756826157: { - if (input.isAtField(FieldNames.baseAvatarId)) { + case 160971093: + case 1248553134: { + if (input.isAtField(FieldNames.mapLayer)) { if (!input.trySkipNullValue()) { - baseAvatarId = input.readUInt32(); + mapLayer = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -442,10 +441,11 @@ public SceneActorInfo mergeFrom(final JsonSource input) throws IOException { } break; } - case 115792: { - if (input.isAtField(FieldNames.uid)) { + case 118022725: + case -1756826157: { + if (input.isAtField(FieldNames.baseAvatarId)) { if (!input.trySkipNullValue()) { - uid = input.readUInt32(); + baseAvatarId = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -523,12 +523,12 @@ public SceneActorInfo create() { * Contains name constants used for serializing JSON */ static class FieldNames { + static final FieldName uid = FieldName.forField("uid"); + static final FieldName mapLayer = FieldName.forField("mapLayer", "map_layer"); static final FieldName baseAvatarId = FieldName.forField("baseAvatarId", "base_avatar_id"); - static final FieldName uid = FieldName.forField("uid"); - static final FieldName avatarType = FieldName.forField("avatarType", "avatar_type"); } } diff --git a/src/generated/main/emu/lunarcore/proto/SceneBattleInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneBattleInfoOuterClass.java index 96c2aa7c7..b3bfddbf8 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneBattleInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneBattleInfoOuterClass.java @@ -20,74 +20,55 @@ public static final class SceneBattleInfo extends ProtoMessage private static final long serialVersionUID = 0L; /** - * 
-     * AHJODGJDJGA LMAPJDNAEKC = 450;
-     *
- * - * optional uint32 battle_id = 1; + * optional uint32 rounds_limit = 3; */ - private int battleId; - - /** - * optional uint32 stage_id = 7; - */ - private int stageId; + private int roundsLimit; /** - * optional uint32 GCNHGANFJKF = 9; + * optional uint32 world_level = 8; */ - private int gCNHGANFJKF; + private int worldLevel; /** - * optional uint32 rounds_limit = 11; + * optional uint32 battle_id = 9; */ - private int roundsLimit; + private int battleId; /** - * optional uint32 logic_random_seed = 13; + * optional uint32 logic_random_seed = 12; */ private int logicRandomSeed; /** - * optional uint32 world_level = 15; + * optional uint32 stage_id = 15; */ - private int worldLevel; - - /** - * optional bool CHELNDDEKPB = 10; - */ - private boolean cHELNDDEKPB; + private int stageId; /** - * optional .BattleMechanismBar mechanism_bar_info = 12; + * repeated .SceneMonsterWave monster_wave_list = 1; */ - private final BattleMechanismBarOuterClass.BattleMechanismBar mechanismBarInfo = BattleMechanismBarOuterClass.BattleMechanismBar.newInstance(); + private final RepeatedMessage monsterWaveList = RepeatedMessage.newEmptyInstance(SceneMonsterWaveOuterClass.SceneMonsterWave.getFactory()); /** - * repeated .SceneMonsterWave monster_wave_list = 2; + * repeated .BattleAvatar battle_avatar_list = 7; */ - private final RepeatedMessage monsterWaveList = RepeatedMessage.newEmptyInstance(SceneMonsterWaveOuterClass.SceneMonsterWave.getFactory()); + private final RepeatedMessage battleAvatarList = RepeatedMessage.newEmptyInstance(BattleAvatarOuterClass.BattleAvatar.getFactory()); /** - * repeated .BattleBuff buff_list = 3; + * repeated .BattleBuff buff_list = 11; */ private final RepeatedMessage buffList = RepeatedMessage.newEmptyInstance(BattleBuffOuterClass.BattleBuff.getFactory()); /** - * repeated .BattleAvatar battle_avatar_list = 8; + * repeated .SceneBattleInfo.BattleTargetInfoEntry battle_target_info = 136; */ - private final RepeatedMessage battleAvatarList = RepeatedMessage.newEmptyInstance(BattleAvatarOuterClass.BattleAvatar.getFactory()); + private final RepeatedMessage battleTargetInfo = RepeatedMessage.newEmptyInstance(BattleTargetInfoEntry.getFactory()); /** - * repeated .BattleEventBattleInfo event_battle_info_list = 77; + * repeated .BattleEventBattleInfo event_battle_info_list = 1367; */ private final RepeatedMessage eventBattleInfoList = RepeatedMessage.newEmptyInstance(BattleEventBattleInfoOuterClass.BattleEventBattleInfo.getFactory()); - /** - * repeated .SceneBattleInfo.BattleTargetInfoEntry battle_target_info = 1857; - */ - private final RepeatedMessage battleTargetInfo = RepeatedMessage.newEmptyInstance(BattleTargetInfoEntry.getFactory()); - private SceneBattleInfo() { } @@ -99,189 +80,136 @@ public static SceneBattleInfo newInstance() { } /** - * 
-     * AHJODGJDJGA LMAPJDNAEKC = 450;
-     *
- * - * optional uint32 battle_id = 1; - * @return whether the battleId field is set + * optional uint32 rounds_limit = 3; + * @return whether the roundsLimit field is set */ - public boolean hasBattleId() { + public boolean hasRoundsLimit() { return (bitField0_ & 0x00000001) != 0; } /** - * 
-     * AHJODGJDJGA LMAPJDNAEKC = 450;
-     *
- * - * optional uint32 battle_id = 1; + * optional uint32 rounds_limit = 3; * @return this */ - public SceneBattleInfo clearBattleId() { + public SceneBattleInfo clearRoundsLimit() { bitField0_ &= ~0x00000001; - battleId = 0; + roundsLimit = 0; return this; } /** - * 
-     * AHJODGJDJGA LMAPJDNAEKC = 450;
-     *
- * - * optional uint32 battle_id = 1; - * @return the battleId + * optional uint32 rounds_limit = 3; + * @return the roundsLimit */ - public int getBattleId() { - return battleId; + public int getRoundsLimit() { + return roundsLimit; } /** - * 
-     * AHJODGJDJGA LMAPJDNAEKC = 450;
-     *
- * - * optional uint32 battle_id = 1; - * @param value the battleId to set + * optional uint32 rounds_limit = 3; + * @param value the roundsLimit to set * @return this */ - public SceneBattleInfo setBattleId(final int value) { + public SceneBattleInfo setRoundsLimit(final int value) { bitField0_ |= 0x00000001; - battleId = value; + roundsLimit = value; return this; } /** - * optional uint32 stage_id = 7; - * @return whether the stageId field is set + * optional uint32 world_level = 8; + * @return whether the worldLevel field is set */ - public boolean hasStageId() { + public boolean hasWorldLevel() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 stage_id = 7; + * optional uint32 world_level = 8; * @return this */ - public SceneBattleInfo clearStageId() { + public SceneBattleInfo clearWorldLevel() { bitField0_ &= ~0x00000002; - stageId = 0; + worldLevel = 0; return this; } /** - * optional uint32 stage_id = 7; - * @return the stageId + * optional uint32 world_level = 8; + * @return the worldLevel */ - public int getStageId() { - return stageId; + public int getWorldLevel() { + return worldLevel; } /** - * optional uint32 stage_id = 7; - * @param value the stageId to set + * optional uint32 world_level = 8; + * @param value the worldLevel to set * @return this */ - public SceneBattleInfo setStageId(final int value) { + public SceneBattleInfo setWorldLevel(final int value) { bitField0_ |= 0x00000002; - stageId = value; + worldLevel = value; return this; } /** - * optional uint32 GCNHGANFJKF = 9; - * @return whether the gCNHGANFJKF field is set + * optional uint32 battle_id = 9; + * @return whether the battleId field is set */ - public boolean hasGCNHGANFJKF() { + public boolean hasBattleId() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 GCNHGANFJKF = 9; + * optional uint32 battle_id = 9; * @return this */ - public SceneBattleInfo clearGCNHGANFJKF() { + public SceneBattleInfo clearBattleId() { bitField0_ &= ~0x00000004; - gCNHGANFJKF = 0; + battleId = 0; return this; } /** - * optional uint32 GCNHGANFJKF = 9; - * @return the gCNHGANFJKF + * optional uint32 battle_id = 9; + * @return the battleId */ - public int getGCNHGANFJKF() { - return gCNHGANFJKF; + public int getBattleId() { + return battleId; } /** - * optional uint32 GCNHGANFJKF = 9; - * @param value the gCNHGANFJKF to set + * optional uint32 battle_id = 9; + * @param value the battleId to set * @return this */ - public SceneBattleInfo setGCNHGANFJKF(final int value) { + public SceneBattleInfo setBattleId(final int value) { bitField0_ |= 0x00000004; - gCNHGANFJKF = value; - return this; - } - - /** - * optional uint32 rounds_limit = 11; - * @return whether the roundsLimit field is set - */ - public boolean hasRoundsLimit() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 rounds_limit = 11; - * @return this - */ - public SceneBattleInfo clearRoundsLimit() { - bitField0_ &= ~0x00000008; - roundsLimit = 0; - return this; - } - - /** - * optional uint32 rounds_limit = 11; - * @return the roundsLimit - */ - public int getRoundsLimit() { - return roundsLimit; - } - - /** - * optional uint32 rounds_limit = 11; - * @param value the roundsLimit to set - * @return this - */ - public SceneBattleInfo setRoundsLimit(final int value) { - bitField0_ |= 0x00000008; - roundsLimit = value; + battleId = value; return this; } /** - * optional uint32 logic_random_seed = 13; + * optional uint32 logic_random_seed = 12; * @return whether the logicRandomSeed field is set */ public boolean hasLogicRandomSeed() { - return (bitField0_ & 0x00000010) != 0; + return (bitField0_ & 0x00000008) != 0; } /** - * optional uint32 logic_random_seed = 13; + * optional uint32 logic_random_seed = 12; * @return this */ public SceneBattleInfo clearLogicRandomSeed() { - bitField0_ &= ~0x00000010; + bitField0_ &= ~0x00000008; logicRandomSeed = 0; return this; } /** - * optional uint32 logic_random_seed = 13; + * optional uint32 logic_random_seed = 12; * @return the logicRandomSeed */ public int getLogicRandomSeed() { @@ -289,124 +217,87 @@ public int getLogicRandomSeed() { } /** - * optional uint32 logic_random_seed = 13; + * optional uint32 logic_random_seed = 12; * @param value the logicRandomSeed to set * @return this */ public SceneBattleInfo setLogicRandomSeed(final int value) { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; logicRandomSeed = value; return this; } /** - * optional uint32 world_level = 15; - * @return whether the worldLevel field is set - */ - public boolean hasWorldLevel() { - return (bitField0_ & 0x00000020) != 0; - } - - /** - * optional uint32 world_level = 15; - * @return this - */ - public SceneBattleInfo clearWorldLevel() { - bitField0_ &= ~0x00000020; - worldLevel = 0; - return this; - } - - /** - * optional uint32 world_level = 15; - * @return the worldLevel - */ - public int getWorldLevel() { - return worldLevel; - } - - /** - * optional uint32 world_level = 15; - * @param value the worldLevel to set - * @return this - */ - public SceneBattleInfo setWorldLevel(final int value) { - bitField0_ |= 0x00000020; - worldLevel = value; - return this; - } - - /** - * optional bool CHELNDDEKPB = 10; - * @return whether the cHELNDDEKPB field is set + * optional uint32 stage_id = 15; + * @return whether the stageId field is set */ - public boolean hasCHELNDDEKPB() { - return (bitField0_ & 0x00000040) != 0; + public boolean hasStageId() { + return (bitField0_ & 0x00000010) != 0; } /** - * optional bool CHELNDDEKPB = 10; + * optional uint32 stage_id = 15; * @return this */ - public SceneBattleInfo clearCHELNDDEKPB() { - bitField0_ &= ~0x00000040; - cHELNDDEKPB = false; + public SceneBattleInfo clearStageId() { + bitField0_ &= ~0x00000010; + stageId = 0; return this; } /** - * optional bool CHELNDDEKPB = 10; - * @return the cHELNDDEKPB + * optional uint32 stage_id = 15; + * @return the stageId */ - public boolean getCHELNDDEKPB() { - return cHELNDDEKPB; + public int getStageId() { + return stageId; } /** - * optional bool CHELNDDEKPB = 10; - * @param value the cHELNDDEKPB to set + * optional uint32 stage_id = 15; + * @param value the stageId to set * @return this */ - public SceneBattleInfo setCHELNDDEKPB(final boolean value) { - bitField0_ |= 0x00000040; - cHELNDDEKPB = value; + public SceneBattleInfo setStageId(final int value) { + bitField0_ |= 0x00000010; + stageId = value; return this; } /** - * optional .BattleMechanismBar mechanism_bar_info = 12; - * @return whether the mechanismBarInfo field is set + * repeated .SceneMonsterWave monster_wave_list = 1; + * @return whether the monsterWaveList field is set */ - public boolean hasMechanismBarInfo() { - return (bitField0_ & 0x00000080) != 0; + public boolean hasMonsterWaveList() { + return (bitField0_ & 0x00000020) != 0; } /** - * optional .BattleMechanismBar mechanism_bar_info = 12; + * repeated .SceneMonsterWave monster_wave_list = 1; * @return this */ - public SceneBattleInfo clearMechanismBarInfo() { - bitField0_ &= ~0x00000080; - mechanismBarInfo.clear(); + public SceneBattleInfo clearMonsterWaveList() { + bitField0_ &= ~0x00000020; + monsterWaveList.clear(); return this; } /** - * optional .BattleMechanismBar mechanism_bar_info = 12; + * repeated .SceneMonsterWave monster_wave_list = 1; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. * - * Use {@link #getMutableMechanismBarInfo()} if you want to modify it. + * Use {@link #getMutableMonsterWaveList()} if you want to modify it. * * @return internal storage object for reading */ - public BattleMechanismBarOuterClass.BattleMechanismBar getMechanismBarInfo() { - return mechanismBarInfo; + public RepeatedMessage getMonsterWaveList() { + return monsterWaveList; } /** - * optional .BattleMechanismBar mechanism_bar_info = 12; + * repeated .SceneMonsterWave monster_wave_list = 1; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -414,57 +305,70 @@ public BattleMechanismBarOuterClass.BattleMechanismBar getMechanismBarInfo() { * * @return internal storage object for modifications */ - public BattleMechanismBarOuterClass.BattleMechanismBar getMutableMechanismBarInfo() { - bitField0_ |= 0x00000080; - return mechanismBarInfo; + public RepeatedMessage getMutableMonsterWaveList( + ) { + bitField0_ |= 0x00000020; + return monsterWaveList; } /** - * optional .BattleMechanismBar mechanism_bar_info = 12; - * @param value the mechanismBarInfo to set + * repeated .SceneMonsterWave monster_wave_list = 1; + * @param value the monsterWaveList to add * @return this */ - public SceneBattleInfo setMechanismBarInfo( - final BattleMechanismBarOuterClass.BattleMechanismBar value) { - bitField0_ |= 0x00000080; - mechanismBarInfo.copyFrom(value); + public SceneBattleInfo addMonsterWaveList( + final SceneMonsterWaveOuterClass.SceneMonsterWave value) { + bitField0_ |= 0x00000020; + monsterWaveList.add(value); return this; } /** - * repeated .SceneMonsterWave monster_wave_list = 2; - * @return whether the monsterWaveList field is set + * repeated .SceneMonsterWave monster_wave_list = 1; + * @param values the monsterWaveList to add + * @return this */ - public boolean hasMonsterWaveList() { - return (bitField0_ & 0x00000100) != 0; + public SceneBattleInfo addAllMonsterWaveList( + final SceneMonsterWaveOuterClass.SceneMonsterWave... values) { + bitField0_ |= 0x00000020; + monsterWaveList.addAll(values); + return this; } /** - * repeated .SceneMonsterWave monster_wave_list = 2; + * repeated .BattleAvatar battle_avatar_list = 7; + * @return whether the battleAvatarList field is set + */ + public boolean hasBattleAvatarList() { + return (bitField0_ & 0x00000040) != 0; + } + + /** + * repeated .BattleAvatar battle_avatar_list = 7; * @return this */ - public SceneBattleInfo clearMonsterWaveList() { - bitField0_ &= ~0x00000100; - monsterWaveList.clear(); + public SceneBattleInfo clearBattleAvatarList() { + bitField0_ &= ~0x00000040; + battleAvatarList.clear(); return this; } /** - * repeated .SceneMonsterWave monster_wave_list = 2; + * repeated .BattleAvatar battle_avatar_list = 7; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. * - * Use {@link #getMutableMonsterWaveList()} if you want to modify it. + * Use {@link #getMutableBattleAvatarList()} if you want to modify it. * * @return internal storage object for reading */ - public RepeatedMessage getMonsterWaveList() { - return monsterWaveList; + public RepeatedMessage getBattleAvatarList() { + return battleAvatarList; } /** - * repeated .SceneMonsterWave monster_wave_list = 2; + * repeated .BattleAvatar battle_avatar_list = 7; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -472,56 +376,54 @@ public RepeatedMessage getMonsterWa * * @return internal storage object for modifications */ - public RepeatedMessage getMutableMonsterWaveList( - ) { - bitField0_ |= 0x00000100; - return monsterWaveList; + public RepeatedMessage getMutableBattleAvatarList() { + bitField0_ |= 0x00000040; + return battleAvatarList; } /** - * repeated .SceneMonsterWave monster_wave_list = 2; - * @param value the monsterWaveList to add + * repeated .BattleAvatar battle_avatar_list = 7; + * @param value the battleAvatarList to add * @return this */ - public SceneBattleInfo addMonsterWaveList( - final SceneMonsterWaveOuterClass.SceneMonsterWave value) { - bitField0_ |= 0x00000100; - monsterWaveList.add(value); + public SceneBattleInfo addBattleAvatarList(final BattleAvatarOuterClass.BattleAvatar value) { + bitField0_ |= 0x00000040; + battleAvatarList.add(value); return this; } /** - * repeated .SceneMonsterWave monster_wave_list = 2; - * @param values the monsterWaveList to add + * repeated .BattleAvatar battle_avatar_list = 7; + * @param values the battleAvatarList to add * @return this */ - public SceneBattleInfo addAllMonsterWaveList( - final SceneMonsterWaveOuterClass.SceneMonsterWave... values) { - bitField0_ |= 0x00000100; - monsterWaveList.addAll(values); + public SceneBattleInfo addAllBattleAvatarList( + final BattleAvatarOuterClass.BattleAvatar... values) { + bitField0_ |= 0x00000040; + battleAvatarList.addAll(values); return this; } /** - * repeated .BattleBuff buff_list = 3; + * repeated .BattleBuff buff_list = 11; * @return whether the buffList field is set */ public boolean hasBuffList() { - return (bitField0_ & 0x00000200) != 0; + return (bitField0_ & 0x00000080) != 0; } /** - * repeated .BattleBuff buff_list = 3; + * repeated .BattleBuff buff_list = 11; * @return this */ public SceneBattleInfo clearBuffList() { - bitField0_ &= ~0x00000200; + bitField0_ &= ~0x00000080; buffList.clear(); return this; } /** - * repeated .BattleBuff buff_list = 3; + * repeated .BattleBuff buff_list = 11; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -535,7 +437,7 @@ public RepeatedMessage getBuffList() { } /** - * repeated .BattleBuff buff_list = 3; + * repeated .BattleBuff buff_list = 11; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -544,66 +446,66 @@ public RepeatedMessage getBuffList() { * @return internal storage object for modifications */ public RepeatedMessage getMutableBuffList() { - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000080; return buffList; } /** - * repeated .BattleBuff buff_list = 3; + * repeated .BattleBuff buff_list = 11; * @param value the buffList to add * @return this */ public SceneBattleInfo addBuffList(final BattleBuffOuterClass.BattleBuff value) { - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000080; buffList.add(value); return this; } /** - * repeated .BattleBuff buff_list = 3; + * repeated .BattleBuff buff_list = 11; * @param values the buffList to add * @return this */ public SceneBattleInfo addAllBuffList(final BattleBuffOuterClass.BattleBuff... values) { - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000080; buffList.addAll(values); return this; } /** - * repeated .BattleAvatar battle_avatar_list = 8; - * @return whether the battleAvatarList field is set + * repeated .SceneBattleInfo.BattleTargetInfoEntry battle_target_info = 136; + * @return whether the battleTargetInfo field is set */ - public boolean hasBattleAvatarList() { - return (bitField0_ & 0x00000400) != 0; + public boolean hasBattleTargetInfo() { + return (bitField0_ & 0x00000100) != 0; } /** - * repeated .BattleAvatar battle_avatar_list = 8; + * repeated .SceneBattleInfo.BattleTargetInfoEntry battle_target_info = 136; * @return this */ - public SceneBattleInfo clearBattleAvatarList() { - bitField0_ &= ~0x00000400; - battleAvatarList.clear(); + public SceneBattleInfo clearBattleTargetInfo() { + bitField0_ &= ~0x00000100; + battleTargetInfo.clear(); return this; } /** - * repeated .BattleAvatar battle_avatar_list = 8; + * repeated .SceneBattleInfo.BattleTargetInfoEntry battle_target_info = 136; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. * - * Use {@link #getMutableBattleAvatarList()} if you want to modify it. + * Use {@link #getMutableBattleTargetInfo()} if you want to modify it. * * @return internal storage object for reading */ - public RepeatedMessage getBattleAvatarList() { - return battleAvatarList; + public RepeatedMessage getBattleTargetInfo() { + return battleTargetInfo; } /** - * repeated .BattleAvatar battle_avatar_list = 8; + * repeated .SceneBattleInfo.BattleTargetInfoEntry battle_target_info = 136; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -611,54 +513,53 @@ public RepeatedMessage getBattleAvatarList( * * @return internal storage object for modifications */ - public RepeatedMessage getMutableBattleAvatarList() { - bitField0_ |= 0x00000400; - return battleAvatarList; + public RepeatedMessage getMutableBattleTargetInfo() { + bitField0_ |= 0x00000100; + return battleTargetInfo; } /** - * repeated .BattleAvatar battle_avatar_list = 8; - * @param value the battleAvatarList to add + * repeated .SceneBattleInfo.BattleTargetInfoEntry battle_target_info = 136; + * @param value the battleTargetInfo to add * @return this */ - public SceneBattleInfo addBattleAvatarList(final BattleAvatarOuterClass.BattleAvatar value) { - bitField0_ |= 0x00000400; - battleAvatarList.add(value); + public SceneBattleInfo addBattleTargetInfo(final BattleTargetInfoEntry value) { + bitField0_ |= 0x00000100; + battleTargetInfo.add(value); return this; } /** - * repeated .BattleAvatar battle_avatar_list = 8; - * @param values the battleAvatarList to add + * repeated .SceneBattleInfo.BattleTargetInfoEntry battle_target_info = 136; + * @param values the battleTargetInfo to add * @return this */ - public SceneBattleInfo addAllBattleAvatarList( - final BattleAvatarOuterClass.BattleAvatar... values) { - bitField0_ |= 0x00000400; - battleAvatarList.addAll(values); + public SceneBattleInfo addAllBattleTargetInfo(final BattleTargetInfoEntry... values) { + bitField0_ |= 0x00000100; + battleTargetInfo.addAll(values); return this; } /** - * repeated .BattleEventBattleInfo event_battle_info_list = 77; + * repeated .BattleEventBattleInfo event_battle_info_list = 1367; * @return whether the eventBattleInfoList field is set */ public boolean hasEventBattleInfoList() { - return (bitField0_ & 0x00000800) != 0; + return (bitField0_ & 0x00000200) != 0; } /** - * repeated .BattleEventBattleInfo event_battle_info_list = 77; + * repeated .BattleEventBattleInfo event_battle_info_list = 1367; * @return this */ public SceneBattleInfo clearEventBattleInfoList() { - bitField0_ &= ~0x00000800; + bitField0_ &= ~0x00000200; eventBattleInfoList.clear(); return this; } /** - * repeated .BattleEventBattleInfo event_battle_info_list = 77; + * repeated .BattleEventBattleInfo event_battle_info_list = 1367; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -673,7 +574,7 @@ public RepeatedMessage ge } /** - * repeated .BattleEventBattleInfo event_battle_info_list = 77; + * repeated .BattleEventBattleInfo event_battle_info_list = 1367; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -683,120 +584,49 @@ public RepeatedMessage ge */ public RepeatedMessage getMutableEventBattleInfoList( ) { - bitField0_ |= 0x00000800; + bitField0_ |= 0x00000200; return eventBattleInfoList; } /** - * repeated .BattleEventBattleInfo event_battle_info_list = 77; + * repeated .BattleEventBattleInfo event_battle_info_list = 1367; * @param value the eventBattleInfoList to add * @return this */ public SceneBattleInfo addEventBattleInfoList( final BattleEventBattleInfoOuterClass.BattleEventBattleInfo value) { - bitField0_ |= 0x00000800; + bitField0_ |= 0x00000200; eventBattleInfoList.add(value); return this; } /** - * repeated .BattleEventBattleInfo event_battle_info_list = 77; + * repeated .BattleEventBattleInfo event_battle_info_list = 1367; * @param values the eventBattleInfoList to add * @return this */ public SceneBattleInfo addAllEventBattleInfoList( final BattleEventBattleInfoOuterClass.BattleEventBattleInfo... values) { - bitField0_ |= 0x00000800; + bitField0_ |= 0x00000200; eventBattleInfoList.addAll(values); return this; } - /** - * repeated .SceneBattleInfo.BattleTargetInfoEntry battle_target_info = 1857; - * @return whether the battleTargetInfo field is set - */ - public boolean hasBattleTargetInfo() { - return (bitField0_ & 0x00001000) != 0; - } - - /** - * repeated .SceneBattleInfo.BattleTargetInfoEntry battle_target_info = 1857; - * @return this - */ - public SceneBattleInfo clearBattleTargetInfo() { - bitField0_ &= ~0x00001000; - battleTargetInfo.clear(); - return this; - } - - /** - * repeated .SceneBattleInfo.BattleTargetInfoEntry battle_target_info = 1857; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * Use {@link #getMutableBattleTargetInfo()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedMessage getBattleTargetInfo() { - return battleTargetInfo; - } - - /** - * repeated .SceneBattleInfo.BattleTargetInfoEntry battle_target_info = 1857; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public RepeatedMessage getMutableBattleTargetInfo() { - bitField0_ |= 0x00001000; - return battleTargetInfo; - } - - /** - * repeated .SceneBattleInfo.BattleTargetInfoEntry battle_target_info = 1857; - * @param value the battleTargetInfo to add - * @return this - */ - public SceneBattleInfo addBattleTargetInfo(final BattleTargetInfoEntry value) { - bitField0_ |= 0x00001000; - battleTargetInfo.add(value); - return this; - } - - /** - * repeated .SceneBattleInfo.BattleTargetInfoEntry battle_target_info = 1857; - * @param values the battleTargetInfo to add - * @return this - */ - public SceneBattleInfo addAllBattleTargetInfo(final BattleTargetInfoEntry... values) { - bitField0_ |= 0x00001000; - battleTargetInfo.addAll(values); - return this; - } - @Override public SceneBattleInfo copyFrom(final SceneBattleInfo other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - battleId = other.battleId; - stageId = other.stageId; - gCNHGANFJKF = other.gCNHGANFJKF; roundsLimit = other.roundsLimit; - logicRandomSeed = other.logicRandomSeed; worldLevel = other.worldLevel; - cHELNDDEKPB = other.cHELNDDEKPB; - mechanismBarInfo.copyFrom(other.mechanismBarInfo); + battleId = other.battleId; + logicRandomSeed = other.logicRandomSeed; + stageId = other.stageId; monsterWaveList.copyFrom(other.monsterWaveList); - buffList.copyFrom(other.buffList); battleAvatarList.copyFrom(other.battleAvatarList); - eventBattleInfoList.copyFrom(other.eventBattleInfoList); + buffList.copyFrom(other.buffList); battleTargetInfo.copyFrom(other.battleTargetInfo); + eventBattleInfoList.copyFrom(other.eventBattleInfoList); } return this; } @@ -807,45 +637,36 @@ public SceneBattleInfo mergeFrom(final SceneBattleInfo other) { return this; } cachedSize = -1; - if (other.hasBattleId()) { - setBattleId(other.battleId); - } - if (other.hasStageId()) { - setStageId(other.stageId); - } - if (other.hasGCNHGANFJKF()) { - setGCNHGANFJKF(other.gCNHGANFJKF); - } if (other.hasRoundsLimit()) { setRoundsLimit(other.roundsLimit); } - if (other.hasLogicRandomSeed()) { - setLogicRandomSeed(other.logicRandomSeed); - } if (other.hasWorldLevel()) { setWorldLevel(other.worldLevel); } - if (other.hasCHELNDDEKPB()) { - setCHELNDDEKPB(other.cHELNDDEKPB); + if (other.hasBattleId()) { + setBattleId(other.battleId); + } + if (other.hasLogicRandomSeed()) { + setLogicRandomSeed(other.logicRandomSeed); } - if (other.hasMechanismBarInfo()) { - getMutableMechanismBarInfo().mergeFrom(other.mechanismBarInfo); + if (other.hasStageId()) { + setStageId(other.stageId); } if (other.hasMonsterWaveList()) { getMutableMonsterWaveList().addAll(other.monsterWaveList); } - if (other.hasBuffList()) { - getMutableBuffList().addAll(other.buffList); - } if (other.hasBattleAvatarList()) { getMutableBattleAvatarList().addAll(other.battleAvatarList); } - if (other.hasEventBattleInfoList()) { - getMutableEventBattleInfoList().addAll(other.eventBattleInfoList); + if (other.hasBuffList()) { + getMutableBuffList().addAll(other.buffList); } if (other.hasBattleTargetInfo()) { getMutableBattleTargetInfo().addAll(other.battleTargetInfo); } + if (other.hasEventBattleInfoList()) { + getMutableEventBattleInfoList().addAll(other.eventBattleInfoList); + } return this; } @@ -856,19 +677,16 @@ public SceneBattleInfo clear() { } cachedSize = -1; bitField0_ = 0; - battleId = 0; - stageId = 0; - gCNHGANFJKF = 0; roundsLimit = 0; - logicRandomSeed = 0; worldLevel = 0; - cHELNDDEKPB = false; - mechanismBarInfo.clear(); + battleId = 0; + logicRandomSeed = 0; + stageId = 0; monsterWaveList.clear(); - buffList.clear(); battleAvatarList.clear(); - eventBattleInfoList.clear(); + buffList.clear(); battleTargetInfo.clear(); + eventBattleInfoList.clear(); return this; } @@ -879,12 +697,11 @@ public SceneBattleInfo clearQuick() { } cachedSize = -1; bitField0_ = 0; - mechanismBarInfo.clearQuick(); monsterWaveList.clearQuick(); - buffList.clearQuick(); battleAvatarList.clearQuick(); - eventBattleInfoList.clearQuick(); + buffList.clearQuick(); battleTargetInfo.clearQuick(); + eventBattleInfoList.clearQuick(); return this; } @@ -898,129 +715,105 @@ public boolean equals(Object o) { } SceneBattleInfo other = (SceneBattleInfo) o; return bitField0_ == other.bitField0_ - && (!hasBattleId() || battleId == other.battleId) - && (!hasStageId() || stageId == other.stageId) - && (!hasGCNHGANFJKF() || gCNHGANFJKF == other.gCNHGANFJKF) && (!hasRoundsLimit() || roundsLimit == other.roundsLimit) - && (!hasLogicRandomSeed() || logicRandomSeed == other.logicRandomSeed) && (!hasWorldLevel() || worldLevel == other.worldLevel) - && (!hasCHELNDDEKPB() || cHELNDDEKPB == other.cHELNDDEKPB) - && (!hasMechanismBarInfo() || mechanismBarInfo.equals(other.mechanismBarInfo)) + && (!hasBattleId() || battleId == other.battleId) + && (!hasLogicRandomSeed() || logicRandomSeed == other.logicRandomSeed) + && (!hasStageId() || stageId == other.stageId) && (!hasMonsterWaveList() || monsterWaveList.equals(other.monsterWaveList)) - && (!hasBuffList() || buffList.equals(other.buffList)) && (!hasBattleAvatarList() || battleAvatarList.equals(other.battleAvatarList)) - && (!hasEventBattleInfoList() || eventBattleInfoList.equals(other.eventBattleInfoList)) - && (!hasBattleTargetInfo() || battleTargetInfo.equals(other.battleTargetInfo)); + && (!hasBuffList() || buffList.equals(other.buffList)) + && (!hasBattleTargetInfo() || battleTargetInfo.equals(other.battleTargetInfo)) + && (!hasEventBattleInfoList() || eventBattleInfoList.equals(other.eventBattleInfoList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); - output.writeUInt32NoTag(battleId); + output.writeRawByte((byte) 24); + output.writeUInt32NoTag(roundsLimit); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 56); - output.writeUInt32NoTag(stageId); + output.writeRawByte((byte) 64); + output.writeUInt32NoTag(worldLevel); } if ((bitField0_ & 0x00000004) != 0) { output.writeRawByte((byte) 72); - output.writeUInt32NoTag(gCNHGANFJKF); + output.writeUInt32NoTag(battleId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 88); - output.writeUInt32NoTag(roundsLimit); - } - if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(logicRandomSeed); } - if ((bitField0_ & 0x00000020) != 0) { + if ((bitField0_ & 0x00000010) != 0) { output.writeRawByte((byte) 120); - output.writeUInt32NoTag(worldLevel); - } - if ((bitField0_ & 0x00000040) != 0) { - output.writeRawByte((byte) 80); - output.writeBoolNoTag(cHELNDDEKPB); - } - if ((bitField0_ & 0x00000080) != 0) { - output.writeRawByte((byte) 98); - output.writeMessageNoTag(mechanismBarInfo); + output.writeUInt32NoTag(stageId); } - if ((bitField0_ & 0x00000100) != 0) { + if ((bitField0_ & 0x00000020) != 0) { for (int i = 0; i < monsterWaveList.length(); i++) { - output.writeRawByte((byte) 18); + output.writeRawByte((byte) 10); output.writeMessageNoTag(monsterWaveList.get(i)); } } - if ((bitField0_ & 0x00000200) != 0) { - for (int i = 0; i < buffList.length(); i++) { - output.writeRawByte((byte) 26); - output.writeMessageNoTag(buffList.get(i)); - } - } - if ((bitField0_ & 0x00000400) != 0) { + if ((bitField0_ & 0x00000040) != 0) { for (int i = 0; i < battleAvatarList.length(); i++) { - output.writeRawByte((byte) 66); + output.writeRawByte((byte) 58); output.writeMessageNoTag(battleAvatarList.get(i)); } } - if ((bitField0_ & 0x00000800) != 0) { - for (int i = 0; i < eventBattleInfoList.length(); i++) { - output.writeRawLittleEndian16((short) 1258); - output.writeMessageNoTag(eventBattleInfoList.get(i)); + if ((bitField0_ & 0x00000080) != 0) { + for (int i = 0; i < buffList.length(); i++) { + output.writeRawByte((byte) 90); + output.writeMessageNoTag(buffList.get(i)); } } - if ((bitField0_ & 0x00001000) != 0) { + if ((bitField0_ & 0x00000100) != 0) { for (int i = 0; i < battleTargetInfo.length(); i++) { - output.writeRawLittleEndian16((short) 29834); + output.writeRawLittleEndian16((short) 2242); output.writeMessageNoTag(battleTargetInfo.get(i)); } } + if ((bitField0_ & 0x00000200) != 0) { + for (int i = 0; i < eventBattleInfoList.length(); i++) { + output.writeRawLittleEndian16((short) 21946); + output.writeMessageNoTag(eventBattleInfoList.get(i)); + } + } } @Override protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(battleId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(roundsLimit); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(stageId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(worldLevel); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(gCNHGANFJKF); + size += 1 + ProtoSink.computeUInt32SizeNoTag(battleId); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(roundsLimit); + size += 1 + ProtoSink.computeUInt32SizeNoTag(logicRandomSeed); } if ((bitField0_ & 0x00000010) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(logicRandomSeed); + size += 1 + ProtoSink.computeUInt32SizeNoTag(stageId); } if ((bitField0_ & 0x00000020) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(worldLevel); + size += (1 * monsterWaveList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(monsterWaveList); } if ((bitField0_ & 0x00000040) != 0) { - size += 2; + size += (1 * battleAvatarList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(battleAvatarList); } if ((bitField0_ & 0x00000080) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(mechanismBarInfo); + size += (1 * buffList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(buffList); } if ((bitField0_ & 0x00000100) != 0) { - size += (1 * monsterWaveList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(monsterWaveList); + size += (2 * battleTargetInfo.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(battleTargetInfo); } if ((bitField0_ & 0x00000200) != 0) { - size += (1 * buffList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(buffList); - } - if ((bitField0_ & 0x00000400) != 0) { - size += (1 * battleAvatarList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(battleAvatarList); - } - if ((bitField0_ & 0x00000800) != 0) { size += (2 * eventBattleInfoList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(eventBattleInfoList); } - if ((bitField0_ & 0x00001000) != 0) { - size += (2 * battleTargetInfo.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(battleTargetInfo); - } return size; } @@ -1031,18 +824,18 @@ public SceneBattleInfo mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { - // battleId - battleId = input.readUInt32(); + case 24: { + // roundsLimit + roundsLimit = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 56) { + if (tag != 64) { break; } } - case 56: { - // stageId - stageId = input.readUInt32(); + case 64: { + // worldLevel + worldLevel = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 72) { @@ -1050,95 +843,68 @@ public SceneBattleInfo mergeFrom(final ProtoSource input) throws IOException { } } case 72: { - // gCNHGANFJKF - gCNHGANFJKF = input.readUInt32(); + // battleId + battleId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 88) { - break; - } - } - case 88: { - // roundsLimit - roundsLimit = input.readUInt32(); - bitField0_ |= 0x00000008; - tag = input.readTag(); - if (tag != 104) { + if (tag != 96) { break; } } - case 104: { + case 96: { // logicRandomSeed logicRandomSeed = input.readUInt32(); - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; tag = input.readTag(); if (tag != 120) { break; } } case 120: { - // worldLevel - worldLevel = input.readUInt32(); - bitField0_ |= 0x00000020; - tag = input.readTag(); - if (tag != 80) { - break; - } - } - case 80: { - // cHELNDDEKPB - cHELNDDEKPB = input.readBool(); - bitField0_ |= 0x00000040; + // stageId + stageId = input.readUInt32(); + bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 98) { + if (tag != 10) { break; } } - case 98: { - // mechanismBarInfo - input.readMessage(mechanismBarInfo); - bitField0_ |= 0x00000080; - tag = input.readTag(); - if (tag != 18) { + case 10: { + // monsterWaveList + tag = input.readRepeatedMessage(monsterWaveList, tag); + bitField0_ |= 0x00000020; + if (tag != 58) { break; } } - case 18: { - // monsterWaveList - tag = input.readRepeatedMessage(monsterWaveList, tag); - bitField0_ |= 0x00000100; - if (tag != 26) { + case 58: { + // battleAvatarList + tag = input.readRepeatedMessage(battleAvatarList, tag); + bitField0_ |= 0x00000040; + if (tag != 90) { break; } } - case 26: { + case 90: { // buffList tag = input.readRepeatedMessage(buffList, tag); - bitField0_ |= 0x00000200; - if (tag != 66) { + bitField0_ |= 0x00000080; + if (tag != 1090) { break; } } - case 66: { - // battleAvatarList - tag = input.readRepeatedMessage(battleAvatarList, tag); - bitField0_ |= 0x00000400; - if (tag != 618) { + case 1090: { + // battleTargetInfo + tag = input.readRepeatedMessage(battleTargetInfo, tag); + bitField0_ |= 0x00000100; + if (tag != 10938) { break; } } - case 618: { + case 10938: { // eventBattleInfoList tag = input.readRepeatedMessage(eventBattleInfoList, tag); - bitField0_ |= 0x00000800; - if (tag != 14858) { - break; - } - } - case 14858: { - // battleTargetInfo - tag = input.readRepeatedMessage(battleTargetInfo, tag); - bitField0_ |= 0x00001000; + bitField0_ |= 0x00000200; if (tag != 0) { break; } @@ -1161,44 +927,35 @@ public SceneBattleInfo mergeFrom(final ProtoSource input) throws IOException { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.battleId, battleId); + output.writeUInt32(FieldNames.roundsLimit, roundsLimit); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.stageId, stageId); + output.writeUInt32(FieldNames.worldLevel, worldLevel); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.gCNHGANFJKF, gCNHGANFJKF); + output.writeUInt32(FieldNames.battleId, battleId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.roundsLimit, roundsLimit); + output.writeUInt32(FieldNames.logicRandomSeed, logicRandomSeed); } if ((bitField0_ & 0x00000010) != 0) { - output.writeUInt32(FieldNames.logicRandomSeed, logicRandomSeed); + output.writeUInt32(FieldNames.stageId, stageId); } if ((bitField0_ & 0x00000020) != 0) { - output.writeUInt32(FieldNames.worldLevel, worldLevel); + output.writeRepeatedMessage(FieldNames.monsterWaveList, monsterWaveList); } if ((bitField0_ & 0x00000040) != 0) { - output.writeBool(FieldNames.cHELNDDEKPB, cHELNDDEKPB); + output.writeRepeatedMessage(FieldNames.battleAvatarList, battleAvatarList); } if ((bitField0_ & 0x00000080) != 0) { - output.writeMessage(FieldNames.mechanismBarInfo, mechanismBarInfo); + output.writeRepeatedMessage(FieldNames.buffList, buffList); } if ((bitField0_ & 0x00000100) != 0) { - output.writeRepeatedMessage(FieldNames.monsterWaveList, monsterWaveList); + output.writeRepeatedMessage(FieldNames.battleTargetInfo, battleTargetInfo); } if ((bitField0_ & 0x00000200) != 0) { - output.writeRepeatedMessage(FieldNames.buffList, buffList); - } - if ((bitField0_ & 0x00000400) != 0) { - output.writeRepeatedMessage(FieldNames.battleAvatarList, battleAvatarList); - } - if ((bitField0_ & 0x00000800) != 0) { output.writeRepeatedMessage(FieldNames.eventBattleInfoList, eventBattleInfoList); } - if ((bitField0_ & 0x00001000) != 0) { - output.writeRepeatedMessage(FieldNames.battleTargetInfo, battleTargetInfo); - } output.endObject(); } @@ -1209,11 +966,11 @@ public SceneBattleInfo mergeFrom(final JsonSource input) throws IOException { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1678308365: - case -487930366: { - if (input.isAtField(FieldNames.battleId)) { + case 306477590: + case 1457479585: { + if (input.isAtField(FieldNames.roundsLimit)) { if (!input.trySkipNullValue()) { - battleId = input.readUInt32(); + roundsLimit = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -1221,11 +978,11 @@ public SceneBattleInfo mergeFrom(final JsonSource input) throws IOException { } break; } - case -1897528135: - case 1306191356: { - if (input.isAtField(FieldNames.stageId)) { + case 440007442: + case 1305257111: { + if (input.isAtField(FieldNames.worldLevel)) { if (!input.trySkipNullValue()) { - stageId = input.readUInt32(); + worldLevel = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -1233,10 +990,11 @@ public SceneBattleInfo mergeFrom(final JsonSource input) throws IOException { } break; } - case -1106892419: { - if (input.isAtField(FieldNames.gCNHGANFJKF)) { + case -1678308365: + case -487930366: { + if (input.isAtField(FieldNames.battleId)) { if (!input.trySkipNullValue()) { - gCNHGANFJKF = input.readUInt32(); + battleId = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -1244,71 +1002,48 @@ public SceneBattleInfo mergeFrom(final JsonSource input) throws IOException { } break; } - case 306477590: - case 1457479585: { - if (input.isAtField(FieldNames.roundsLimit)) { - if (!input.trySkipNullValue()) { - roundsLimit = input.readUInt32(); - bitField0_ |= 0x00000008; - } - } else { - input.skipUnknownField(); - } - break; - } case 141999058: case -1894951668: { if (input.isAtField(FieldNames.logicRandomSeed)) { if (!input.trySkipNullValue()) { logicRandomSeed = input.readUInt32(); - bitField0_ |= 0x00000010; - } - } else { - input.skipUnknownField(); - } - break; - } - case 440007442: - case 1305257111: { - if (input.isAtField(FieldNames.worldLevel)) { - if (!input.trySkipNullValue()) { - worldLevel = input.readUInt32(); - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000008; } } else { input.skipUnknownField(); } break; } - case 266087962: { - if (input.isAtField(FieldNames.cHELNDDEKPB)) { + case -1897528135: + case 1306191356: { + if (input.isAtField(FieldNames.stageId)) { if (!input.trySkipNullValue()) { - cHELNDDEKPB = input.readBool(); - bitField0_ |= 0x00000040; + stageId = input.readUInt32(); + bitField0_ |= 0x00000010; } } else { input.skipUnknownField(); } break; } - case -129465912: - case -39078016: { - if (input.isAtField(FieldNames.mechanismBarInfo)) { + case 697746737: + case -1492024321: { + if (input.isAtField(FieldNames.monsterWaveList)) { if (!input.trySkipNullValue()) { - input.readMessage(mechanismBarInfo); - bitField0_ |= 0x00000080; + input.readRepeatedMessage(monsterWaveList); + bitField0_ |= 0x00000020; } } else { input.skipUnknownField(); } break; } - case 697746737: - case -1492024321: { - if (input.isAtField(FieldNames.monsterWaveList)) { + case 768292975: + case 328463037: { + if (input.isAtField(FieldNames.battleAvatarList)) { if (!input.trySkipNullValue()) { - input.readRepeatedMessage(monsterWaveList); - bitField0_ |= 0x00000100; + input.readRepeatedMessage(battleAvatarList); + bitField0_ |= 0x00000040; } } else { input.skipUnknownField(); @@ -1320,19 +1055,19 @@ public SceneBattleInfo mergeFrom(final JsonSource input) throws IOException { if (input.isAtField(FieldNames.buffList)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(buffList); - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000080; } } else { input.skipUnknownField(); } break; } - case 768292975: - case 328463037: { - if (input.isAtField(FieldNames.battleAvatarList)) { + case 1657979063: + case 2141477269: { + if (input.isAtField(FieldNames.battleTargetInfo)) { if (!input.trySkipNullValue()) { - input.readRepeatedMessage(battleAvatarList); - bitField0_ |= 0x00000400; + input.readRepeatedMessage(battleTargetInfo); + bitField0_ |= 0x00000100; } } else { input.skipUnknownField(); @@ -1344,19 +1079,7 @@ public SceneBattleInfo mergeFrom(final JsonSource input) throws IOException { if (input.isAtField(FieldNames.eventBattleInfoList)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(eventBattleInfoList); - bitField0_ |= 0x00000800; - } - } else { - input.skipUnknownField(); - } - break; - } - case 1657979063: - case 2141477269: { - if (input.isAtField(FieldNames.battleTargetInfo)) { - if (!input.trySkipNullValue()) { - input.readRepeatedMessage(battleTargetInfo); - bitField0_ |= 0x00001000; + bitField0_ |= 0x00000200; } } else { input.skipUnknownField(); @@ -1763,31 +1486,25 @@ public SceneBattleInfo create() { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName battleId = FieldName.forField("battleId", "battle_id"); - - static final FieldName stageId = FieldName.forField("stageId", "stage_id"); - - static final FieldName gCNHGANFJKF = FieldName.forField("GCNHGANFJKF"); - static final FieldName roundsLimit = FieldName.forField("roundsLimit", "rounds_limit"); - static final FieldName logicRandomSeed = FieldName.forField("logicRandomSeed", "logic_random_seed"); - static final FieldName worldLevel = FieldName.forField("worldLevel", "world_level"); - static final FieldName cHELNDDEKPB = FieldName.forField("CHELNDDEKPB"); + static final FieldName battleId = FieldName.forField("battleId", "battle_id"); + + static final FieldName logicRandomSeed = FieldName.forField("logicRandomSeed", "logic_random_seed"); - static final FieldName mechanismBarInfo = FieldName.forField("mechanismBarInfo", "mechanism_bar_info"); + static final FieldName stageId = FieldName.forField("stageId", "stage_id"); static final FieldName monsterWaveList = FieldName.forField("monsterWaveList", "monster_wave_list"); - static final FieldName buffList = FieldName.forField("buffList", "buff_list"); - static final FieldName battleAvatarList = FieldName.forField("battleAvatarList", "battle_avatar_list"); - static final FieldName eventBattleInfoList = FieldName.forField("eventBattleInfoList", "event_battle_info_list"); + static final FieldName buffList = FieldName.forField("buffList", "buff_list"); static final FieldName battleTargetInfo = FieldName.forField("battleTargetInfo", "battle_target_info"); + + static final FieldName eventBattleInfoList = FieldName.forField("eventBattleInfoList", "event_battle_info_list"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/SceneCastSkillCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneCastSkillCsReqOuterClass.java index 1b0b9c618..a6b53341e 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneCastSkillCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneCastSkillCsReqOuterClass.java @@ -20,32 +20,32 @@ public static final class SceneCastSkillCsReq extends ProtoMessageoptional uint32 attacked_group_id = 8; + * optional uint32 caster_id = 1; */ - private int attackedGroupId; + private int casterId; /** - * optional uint32 caster_id = 11; + * optional uint32 skill_index = 6; */ - private int casterId; + private int skillIndex; /** - * optional uint32 skill_index = 15; + * optional uint32 attacked_group_id = 8; */ - private int skillIndex; + private int attackedGroupId; /** - * optional .MotionInfo target_motion = 7; + * optional .MotionInfo target_motion = 15; */ private final MotionInfoOuterClass.MotionInfo targetMotion = MotionInfoOuterClass.MotionInfo.newInstance(); /** - * repeated uint32 hit_target_entity_id_list = 2; + * repeated uint32 hit_target_entity_id_list = 13; */ private final RepeatedInt hitTargetEntityIdList = RepeatedInt.newEmptyInstance(); /** - * repeated uint32 assist_monster_entity_id_list = 13; + * repeated uint32 assist_monster_entity_id_list = 14; */ private final RepeatedInt assistMonsterEntityIdList = RepeatedInt.newEmptyInstance(); @@ -60,118 +60,118 @@ public static SceneCastSkillCsReq newInstance() { } /** - * optional uint32 attacked_group_id = 8; - * @return whether the attackedGroupId field is set + * optional uint32 caster_id = 1; + * @return whether the casterId field is set */ - public boolean hasAttackedGroupId() { + public boolean hasCasterId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 attacked_group_id = 8; + * optional uint32 caster_id = 1; * @return this */ - public SceneCastSkillCsReq clearAttackedGroupId() { + public SceneCastSkillCsReq clearCasterId() { bitField0_ &= ~0x00000001; - attackedGroupId = 0; + casterId = 0; return this; } /** - * optional uint32 attacked_group_id = 8; - * @return the attackedGroupId + * optional uint32 caster_id = 1; + * @return the casterId */ - public int getAttackedGroupId() { - return attackedGroupId; + public int getCasterId() { + return casterId; } /** - * optional uint32 attacked_group_id = 8; - * @param value the attackedGroupId to set + * optional uint32 caster_id = 1; + * @param value the casterId to set * @return this */ - public SceneCastSkillCsReq setAttackedGroupId(final int value) { + public SceneCastSkillCsReq setCasterId(final int value) { bitField0_ |= 0x00000001; - attackedGroupId = value; + casterId = value; return this; } /** - * optional uint32 caster_id = 11; - * @return whether the casterId field is set + * optional uint32 skill_index = 6; + * @return whether the skillIndex field is set */ - public boolean hasCasterId() { + public boolean hasSkillIndex() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 caster_id = 11; + * optional uint32 skill_index = 6; * @return this */ - public SceneCastSkillCsReq clearCasterId() { + public SceneCastSkillCsReq clearSkillIndex() { bitField0_ &= ~0x00000002; - casterId = 0; + skillIndex = 0; return this; } /** - * optional uint32 caster_id = 11; - * @return the casterId + * optional uint32 skill_index = 6; + * @return the skillIndex */ - public int getCasterId() { - return casterId; + public int getSkillIndex() { + return skillIndex; } /** - * optional uint32 caster_id = 11; - * @param value the casterId to set + * optional uint32 skill_index = 6; + * @param value the skillIndex to set * @return this */ - public SceneCastSkillCsReq setCasterId(final int value) { + public SceneCastSkillCsReq setSkillIndex(final int value) { bitField0_ |= 0x00000002; - casterId = value; + skillIndex = value; return this; } /** - * optional uint32 skill_index = 15; - * @return whether the skillIndex field is set + * optional uint32 attacked_group_id = 8; + * @return whether the attackedGroupId field is set */ - public boolean hasSkillIndex() { + public boolean hasAttackedGroupId() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 skill_index = 15; + * optional uint32 attacked_group_id = 8; * @return this */ - public SceneCastSkillCsReq clearSkillIndex() { + public SceneCastSkillCsReq clearAttackedGroupId() { bitField0_ &= ~0x00000004; - skillIndex = 0; + attackedGroupId = 0; return this; } /** - * optional uint32 skill_index = 15; - * @return the skillIndex + * optional uint32 attacked_group_id = 8; + * @return the attackedGroupId */ - public int getSkillIndex() { - return skillIndex; + public int getAttackedGroupId() { + return attackedGroupId; } /** - * optional uint32 skill_index = 15; - * @param value the skillIndex to set + * optional uint32 attacked_group_id = 8; + * @param value the attackedGroupId to set * @return this */ - public SceneCastSkillCsReq setSkillIndex(final int value) { + public SceneCastSkillCsReq setAttackedGroupId(final int value) { bitField0_ |= 0x00000004; - skillIndex = value; + attackedGroupId = value; return this; } /** - * optional .MotionInfo target_motion = 7; + * optional .MotionInfo target_motion = 15; * @return whether the targetMotion field is set */ public boolean hasTargetMotion() { @@ -179,7 +179,7 @@ public boolean hasTargetMotion() { } /** - * optional .MotionInfo target_motion = 7; + * optional .MotionInfo target_motion = 15; * @return this */ public SceneCastSkillCsReq clearTargetMotion() { @@ -189,7 +189,7 @@ public SceneCastSkillCsReq clearTargetMotion() { } /** - * optional .MotionInfo target_motion = 7; + * optional .MotionInfo target_motion = 15; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -203,7 +203,7 @@ public MotionInfoOuterClass.MotionInfo getTargetMotion() { } /** - * optional .MotionInfo target_motion = 7; + * optional .MotionInfo target_motion = 15; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -217,7 +217,7 @@ public MotionInfoOuterClass.MotionInfo getMutableTargetMotion() { } /** - * optional .MotionInfo target_motion = 7; + * optional .MotionInfo target_motion = 15; * @param value the targetMotion to set * @return this */ @@ -228,7 +228,7 @@ public SceneCastSkillCsReq setTargetMotion(final MotionInfoOuterClass.MotionInfo } /** - * repeated uint32 hit_target_entity_id_list = 2; + * repeated uint32 hit_target_entity_id_list = 13; * @return whether the hitTargetEntityIdList field is set */ public boolean hasHitTargetEntityIdList() { @@ -236,7 +236,7 @@ public boolean hasHitTargetEntityIdList() { } /** - * repeated uint32 hit_target_entity_id_list = 2; + * repeated uint32 hit_target_entity_id_list = 13; * @return this */ public SceneCastSkillCsReq clearHitTargetEntityIdList() { @@ -246,7 +246,7 @@ public SceneCastSkillCsReq clearHitTargetEntityIdList() { } /** - * repeated uint32 hit_target_entity_id_list = 2; + * repeated uint32 hit_target_entity_id_list = 13; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -260,7 +260,7 @@ public RepeatedInt getHitTargetEntityIdList() { } /** - * repeated uint32 hit_target_entity_id_list = 2; + * repeated uint32 hit_target_entity_id_list = 13; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -274,7 +274,7 @@ public RepeatedInt getMutableHitTargetEntityIdList() { } /** - * repeated uint32 hit_target_entity_id_list = 2; + * repeated uint32 hit_target_entity_id_list = 13; * @param value the hitTargetEntityIdList to add * @return this */ @@ -285,7 +285,7 @@ public SceneCastSkillCsReq addHitTargetEntityIdList(final int value) { } /** - * repeated uint32 hit_target_entity_id_list = 2; + * repeated uint32 hit_target_entity_id_list = 13; * @param values the hitTargetEntityIdList to add * @return this */ @@ -296,7 +296,7 @@ public SceneCastSkillCsReq addAllHitTargetEntityIdList(final int... values) { } /** - * repeated uint32 assist_monster_entity_id_list = 13; + * repeated uint32 assist_monster_entity_id_list = 14; * @return whether the assistMonsterEntityIdList field is set */ public boolean hasAssistMonsterEntityIdList() { @@ -304,7 +304,7 @@ public boolean hasAssistMonsterEntityIdList() { } /** - * repeated uint32 assist_monster_entity_id_list = 13; + * repeated uint32 assist_monster_entity_id_list = 14; * @return this */ public SceneCastSkillCsReq clearAssistMonsterEntityIdList() { @@ -314,7 +314,7 @@ public SceneCastSkillCsReq clearAssistMonsterEntityIdList() { } /** - * repeated uint32 assist_monster_entity_id_list = 13; + * repeated uint32 assist_monster_entity_id_list = 14; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -328,7 +328,7 @@ public RepeatedInt getAssistMonsterEntityIdList() { } /** - * repeated uint32 assist_monster_entity_id_list = 13; + * repeated uint32 assist_monster_entity_id_list = 14; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -342,7 +342,7 @@ public RepeatedInt getMutableAssistMonsterEntityIdList() { } /** - * repeated uint32 assist_monster_entity_id_list = 13; + * repeated uint32 assist_monster_entity_id_list = 14; * @param value the assistMonsterEntityIdList to add * @return this */ @@ -353,7 +353,7 @@ public SceneCastSkillCsReq addAssistMonsterEntityIdList(final int value) { } /** - * repeated uint32 assist_monster_entity_id_list = 13; + * repeated uint32 assist_monster_entity_id_list = 14; * @param values the assistMonsterEntityIdList to add * @return this */ @@ -368,9 +368,9 @@ public SceneCastSkillCsReq copyFrom(final SceneCastSkillCsReq other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - attackedGroupId = other.attackedGroupId; casterId = other.casterId; skillIndex = other.skillIndex; + attackedGroupId = other.attackedGroupId; targetMotion.copyFrom(other.targetMotion); hitTargetEntityIdList.copyFrom(other.hitTargetEntityIdList); assistMonsterEntityIdList.copyFrom(other.assistMonsterEntityIdList); @@ -384,15 +384,15 @@ public SceneCastSkillCsReq mergeFrom(final SceneCastSkillCsReq other) { return this; } cachedSize = -1; - if (other.hasAttackedGroupId()) { - setAttackedGroupId(other.attackedGroupId); - } if (other.hasCasterId()) { setCasterId(other.casterId); } if (other.hasSkillIndex()) { setSkillIndex(other.skillIndex); } + if (other.hasAttackedGroupId()) { + setAttackedGroupId(other.attackedGroupId); + } if (other.hasTargetMotion()) { getMutableTargetMotion().mergeFrom(other.targetMotion); } @@ -412,9 +412,9 @@ public SceneCastSkillCsReq clear() { } cachedSize = -1; bitField0_ = 0; - attackedGroupId = 0; casterId = 0; skillIndex = 0; + attackedGroupId = 0; targetMotion.clear(); hitTargetEntityIdList.clear(); assistMonsterEntityIdList.clear(); @@ -444,9 +444,9 @@ public boolean equals(Object o) { } SceneCastSkillCsReq other = (SceneCastSkillCsReq) o; return bitField0_ == other.bitField0_ - && (!hasAttackedGroupId() || attackedGroupId == other.attackedGroupId) && (!hasCasterId() || casterId == other.casterId) && (!hasSkillIndex() || skillIndex == other.skillIndex) + && (!hasAttackedGroupId() || attackedGroupId == other.attackedGroupId) && (!hasTargetMotion() || targetMotion.equals(other.targetMotion)) && (!hasHitTargetEntityIdList() || hitTargetEntityIdList.equals(other.hitTargetEntityIdList)) && (!hasAssistMonsterEntityIdList() || assistMonsterEntityIdList.equals(other.assistMonsterEntityIdList)); @@ -455,30 +455,30 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 64); - output.writeUInt32NoTag(attackedGroupId); + output.writeRawByte((byte) 8); + output.writeUInt32NoTag(casterId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 88); - output.writeUInt32NoTag(casterId); + output.writeRawByte((byte) 48); + output.writeUInt32NoTag(skillIndex); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 120); - output.writeUInt32NoTag(skillIndex); + output.writeRawByte((byte) 64); + output.writeUInt32NoTag(attackedGroupId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 58); + output.writeRawByte((byte) 122); output.writeMessageNoTag(targetMotion); } if ((bitField0_ & 0x00000010) != 0) { for (int i = 0; i < hitTargetEntityIdList.length(); i++) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(hitTargetEntityIdList.array()[i]); } } if ((bitField0_ & 0x00000020) != 0) { for (int i = 0; i < assistMonsterEntityIdList.length(); i++) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(assistMonsterEntityIdList.array()[i]); } } @@ -488,13 +488,13 @@ public void writeTo(final ProtoSink output) throws IOException { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(attackedGroupId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(casterId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(casterId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(skillIndex); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(skillIndex); + size += 1 + ProtoSink.computeUInt32SizeNoTag(attackedGroupId); } if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(targetMotion); @@ -515,52 +515,52 @@ public SceneCastSkillCsReq mergeFrom(final ProtoSource input) throws IOException int tag = input.readTag(); while (true) { switch (tag) { - case 64: { - // attackedGroupId - attackedGroupId = input.readUInt32(); + case 8: { + // casterId + casterId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 88) { + if (tag != 48) { break; } } - case 88: { - // casterId - casterId = input.readUInt32(); + case 48: { + // skillIndex + skillIndex = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 120) { + if (tag != 64) { break; } } - case 120: { - // skillIndex - skillIndex = input.readUInt32(); + case 64: { + // attackedGroupId + attackedGroupId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 58) { + if (tag != 122) { break; } } - case 58: { + case 122: { // targetMotion input.readMessage(targetMotion); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 18) { + if (tag != 106) { break; } } - case 18: { + case 106: { // hitTargetEntityIdList [packed=true] input.readPackedUInt32(hitTargetEntityIdList, tag); bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 106) { + if (tag != 114) { break; } } - case 106: { + case 114: { // assistMonsterEntityIdList [packed=true] input.readPackedUInt32(assistMonsterEntityIdList, tag); bitField0_ |= 0x00000020; @@ -579,13 +579,13 @@ public SceneCastSkillCsReq mergeFrom(final ProtoSource input) throws IOException tag = input.readTag(); break; } - case 16: { + case 104: { // hitTargetEntityIdList [packed=false] tag = input.readRepeatedUInt32(hitTargetEntityIdList, tag); bitField0_ |= 0x00000010; break; } - case 104: { + case 112: { // assistMonsterEntityIdList [packed=false] tag = input.readRepeatedUInt32(assistMonsterEntityIdList, tag); bitField0_ |= 0x00000020; @@ -599,13 +599,13 @@ public SceneCastSkillCsReq mergeFrom(final ProtoSource input) throws IOException public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.attackedGroupId, attackedGroupId); + output.writeUInt32(FieldNames.casterId, casterId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.casterId, casterId); + output.writeUInt32(FieldNames.skillIndex, skillIndex); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.skillIndex, skillIndex); + output.writeUInt32(FieldNames.attackedGroupId, attackedGroupId); } if ((bitField0_ & 0x00000008) != 0) { output.writeMessage(FieldNames.targetMotion, targetMotion); @@ -626,11 +626,11 @@ public SceneCastSkillCsReq mergeFrom(final JsonSource input) throws IOException } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1725961965: - case -715836621: { - if (input.isAtField(FieldNames.attackedGroupId)) { + case 35676775: + case 1106001422: { + if (input.isAtField(FieldNames.casterId)) { if (!input.trySkipNullValue()) { - attackedGroupId = input.readUInt32(); + casterId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -638,11 +638,11 @@ public SceneCastSkillCsReq mergeFrom(final JsonSource input) throws IOException } break; } - case 35676775: - case 1106001422: { - if (input.isAtField(FieldNames.casterId)) { + case 1587034369: + case -1716021916: { + if (input.isAtField(FieldNames.skillIndex)) { if (!input.trySkipNullValue()) { - casterId = input.readUInt32(); + skillIndex = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -650,11 +650,11 @@ public SceneCastSkillCsReq mergeFrom(final JsonSource input) throws IOException } break; } - case 1587034369: - case -1716021916: { - if (input.isAtField(FieldNames.skillIndex)) { + case -1725961965: + case -715836621: { + if (input.isAtField(FieldNames.attackedGroupId)) { if (!input.trySkipNullValue()) { - skillIndex = input.readUInt32(); + attackedGroupId = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -751,12 +751,12 @@ public SceneCastSkillCsReq create() { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName attackedGroupId = FieldName.forField("attackedGroupId", "attacked_group_id"); - static final FieldName casterId = FieldName.forField("casterId", "caster_id"); static final FieldName skillIndex = FieldName.forField("skillIndex", "skill_index"); + static final FieldName attackedGroupId = FieldName.forField("attackedGroupId", "attacked_group_id"); + static final FieldName targetMotion = FieldName.forField("targetMotion", "target_motion"); static final FieldName hitTargetEntityIdList = FieldName.forField("hitTargetEntityIdList", "hit_target_entity_id_list"); diff --git a/src/generated/main/emu/lunarcore/proto/SceneCastSkillMpUpdateScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneCastSkillMpUpdateScNotifyOuterClass.java index 5eb153f01..884fd67d4 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneCastSkillMpUpdateScNotifyOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneCastSkillMpUpdateScNotifyOuterClass.java @@ -19,12 +19,12 @@ public static final class SceneCastSkillMpUpdateScNotify extends ProtoMessageoptional uint32 attacked_group_id = 4; + * optional uint32 attacked_group_id = 8; */ private int attackedGroupId; /** - * optional uint32 mp = 6; + * optional uint32 mp = 13; */ private int mp; @@ -39,7 +39,7 @@ public static SceneCastSkillMpUpdateScNotify newInstance() { } /** - * optional uint32 attacked_group_id = 4; + * optional uint32 attacked_group_id = 8; * @return whether the attackedGroupId field is set */ public boolean hasAttackedGroupId() { @@ -47,7 +47,7 @@ public boolean hasAttackedGroupId() { } /** - * optional uint32 attacked_group_id = 4; + * optional uint32 attacked_group_id = 8; * @return this */ public SceneCastSkillMpUpdateScNotify clearAttackedGroupId() { @@ -57,7 +57,7 @@ public SceneCastSkillMpUpdateScNotify clearAttackedGroupId() { } /** - * optional uint32 attacked_group_id = 4; + * optional uint32 attacked_group_id = 8; * @return the attackedGroupId */ public int getAttackedGroupId() { @@ -65,7 +65,7 @@ public int getAttackedGroupId() { } /** - * optional uint32 attacked_group_id = 4; + * optional uint32 attacked_group_id = 8; * @param value the attackedGroupId to set * @return this */ @@ -76,7 +76,7 @@ public SceneCastSkillMpUpdateScNotify setAttackedGroupId(final int value) { } /** - * optional uint32 mp = 6; + * optional uint32 mp = 13; * @return whether the mp field is set */ public boolean hasMp() { @@ -84,7 +84,7 @@ public boolean hasMp() { } /** - * optional uint32 mp = 6; + * optional uint32 mp = 13; * @return this */ public SceneCastSkillMpUpdateScNotify clearMp() { @@ -94,7 +94,7 @@ public SceneCastSkillMpUpdateScNotify clearMp() { } /** - * optional uint32 mp = 6; + * optional uint32 mp = 13; * @return the mp */ public int getMp() { @@ -102,7 +102,7 @@ public int getMp() { } /** - * optional uint32 mp = 6; + * optional uint32 mp = 13; * @param value the mp to set * @return this */ @@ -177,11 +177,11 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(attackedGroupId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(mp); } } @@ -205,16 +205,16 @@ public SceneCastSkillMpUpdateScNotify mergeFrom(final ProtoSource input) throws int tag = input.readTag(); while (true) { switch (tag) { - case 32: { + case 64: { // attackedGroupId attackedGroupId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 48) { + if (tag != 104) { break; } } - case 48: { + case 104: { // mp mp = input.readUInt32(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/SceneCastSkillScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneCastSkillScRspOuterClass.java index c61a9e9e1..244f5610c 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneCastSkillScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneCastSkillScRspOuterClass.java @@ -19,17 +19,17 @@ public static final class SceneCastSkillScRsp extends ProtoMessageoptional uint32 attacked_group_id = 5; + * optional uint32 attacked_group_id = 6; */ private int attackedGroupId; /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 12; */ private int retcode; /** - * optional .SceneBattleInfo battle_info = 11; + * optional .SceneBattleInfo battle_info = 5; */ private final SceneBattleInfoOuterClass.SceneBattleInfo battleInfo = SceneBattleInfoOuterClass.SceneBattleInfo.newInstance(); @@ -44,7 +44,7 @@ public static SceneCastSkillScRsp newInstance() { } /** - * optional uint32 attacked_group_id = 5; + * optional uint32 attacked_group_id = 6; * @return whether the attackedGroupId field is set */ public boolean hasAttackedGroupId() { @@ -52,7 +52,7 @@ public boolean hasAttackedGroupId() { } /** - * optional uint32 attacked_group_id = 5; + * optional uint32 attacked_group_id = 6; * @return this */ public SceneCastSkillScRsp clearAttackedGroupId() { @@ -62,7 +62,7 @@ public SceneCastSkillScRsp clearAttackedGroupId() { } /** - * optional uint32 attacked_group_id = 5; + * optional uint32 attacked_group_id = 6; * @return the attackedGroupId */ public int getAttackedGroupId() { @@ -70,7 +70,7 @@ public int getAttackedGroupId() { } /** - * optional uint32 attacked_group_id = 5; + * optional uint32 attacked_group_id = 6; * @param value the attackedGroupId to set * @return this */ @@ -81,7 +81,7 @@ public SceneCastSkillScRsp setAttackedGroupId(final int value) { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 12; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -89,7 +89,7 @@ public boolean hasRetcode() { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 12; * @return this */ public SceneCastSkillScRsp clearRetcode() { @@ -99,7 +99,7 @@ public SceneCastSkillScRsp clearRetcode() { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 12; * @return the retcode */ public int getRetcode() { @@ -107,7 +107,7 @@ public int getRetcode() { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 12; * @param value the retcode to set * @return this */ @@ -118,7 +118,7 @@ public SceneCastSkillScRsp setRetcode(final int value) { } /** - * optional .SceneBattleInfo battle_info = 11; + * optional .SceneBattleInfo battle_info = 5; * @return whether the battleInfo field is set */ public boolean hasBattleInfo() { @@ -126,7 +126,7 @@ public boolean hasBattleInfo() { } /** - * optional .SceneBattleInfo battle_info = 11; + * optional .SceneBattleInfo battle_info = 5; * @return this */ public SceneCastSkillScRsp clearBattleInfo() { @@ -136,7 +136,7 @@ public SceneCastSkillScRsp clearBattleInfo() { } /** - * optional .SceneBattleInfo battle_info = 11; + * optional .SceneBattleInfo battle_info = 5; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -150,7 +150,7 @@ public SceneBattleInfoOuterClass.SceneBattleInfo getBattleInfo() { } /** - * optional .SceneBattleInfo battle_info = 11; + * optional .SceneBattleInfo battle_info = 5; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -164,7 +164,7 @@ public SceneBattleInfoOuterClass.SceneBattleInfo getMutableBattleInfo() { } /** - * optional .SceneBattleInfo battle_info = 11; + * optional .SceneBattleInfo battle_info = 5; * @param value the battleInfo to set * @return this */ @@ -247,15 +247,15 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(attackedGroupId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 90); + output.writeRawByte((byte) 42); output.writeMessageNoTag(battleInfo); } } @@ -282,25 +282,25 @@ public SceneCastSkillScRsp mergeFrom(final ProtoSource input) throws IOException int tag = input.readTag(); while (true) { switch (tag) { - case 40: { + case 48: { // attackedGroupId attackedGroupId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 120) { + if (tag != 96) { break; } } - case 120: { + case 96: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 90) { + if (tag != 42) { break; } } - case 90: { + case 42: { // battleInfo input.readMessage(battleInfo); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/SceneEntityGroupInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneEntityGroupInfoOuterClass.java index 0db8135af..5d2eed9d8 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneEntityGroupInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneEntityGroupInfoOuterClass.java @@ -20,17 +20,17 @@ public static final class SceneEntityGroupInfo extends ProtoMessageoptional uint32 state = 1; + * optional uint32 state = 6; */ private int state; /** - * optional uint32 group_id = 4; + * optional uint32 group_id = 10; */ private int groupId; /** - * repeated .SceneEntityInfo entity_list = 5; + * repeated .SceneEntityInfo entity_list = 2; */ private final RepeatedMessage entityList = RepeatedMessage.newEmptyInstance(SceneEntityInfoOuterClass.SceneEntityInfo.getFactory()); @@ -45,7 +45,7 @@ public static SceneEntityGroupInfo newInstance() { } /** - * optional uint32 state = 1; + * optional uint32 state = 6; * @return whether the state field is set */ public boolean hasState() { @@ -53,7 +53,7 @@ public boolean hasState() { } /** - * optional uint32 state = 1; + * optional uint32 state = 6; * @return this */ public SceneEntityGroupInfo clearState() { @@ -63,7 +63,7 @@ public SceneEntityGroupInfo clearState() { } /** - * optional uint32 state = 1; + * optional uint32 state = 6; * @return the state */ public int getState() { @@ -71,7 +71,7 @@ public int getState() { } /** - * optional uint32 state = 1; + * optional uint32 state = 6; * @param value the state to set * @return this */ @@ -82,7 +82,7 @@ public SceneEntityGroupInfo setState(final int value) { } /** - * optional uint32 group_id = 4; + * optional uint32 group_id = 10; * @return whether the groupId field is set */ public boolean hasGroupId() { @@ -90,7 +90,7 @@ public boolean hasGroupId() { } /** - * optional uint32 group_id = 4; + * optional uint32 group_id = 10; * @return this */ public SceneEntityGroupInfo clearGroupId() { @@ -100,7 +100,7 @@ public SceneEntityGroupInfo clearGroupId() { } /** - * optional uint32 group_id = 4; + * optional uint32 group_id = 10; * @return the groupId */ public int getGroupId() { @@ -108,7 +108,7 @@ public int getGroupId() { } /** - * optional uint32 group_id = 4; + * optional uint32 group_id = 10; * @param value the groupId to set * @return this */ @@ -119,7 +119,7 @@ public SceneEntityGroupInfo setGroupId(final int value) { } /** - * repeated .SceneEntityInfo entity_list = 5; + * repeated .SceneEntityInfo entity_list = 2; * @return whether the entityList field is set */ public boolean hasEntityList() { @@ -127,7 +127,7 @@ public boolean hasEntityList() { } /** - * repeated .SceneEntityInfo entity_list = 5; + * repeated .SceneEntityInfo entity_list = 2; * @return this */ public SceneEntityGroupInfo clearEntityList() { @@ -137,7 +137,7 @@ public SceneEntityGroupInfo clearEntityList() { } /** - * repeated .SceneEntityInfo entity_list = 5; + * repeated .SceneEntityInfo entity_list = 2; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -151,7 +151,7 @@ public RepeatedMessage getEntityList( } /** - * repeated .SceneEntityInfo entity_list = 5; + * repeated .SceneEntityInfo entity_list = 2; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -165,7 +165,7 @@ public RepeatedMessage getMutableEnti } /** - * repeated .SceneEntityInfo entity_list = 5; + * repeated .SceneEntityInfo entity_list = 2; * @param value the entityList to add * @return this */ @@ -177,7 +177,7 @@ public SceneEntityGroupInfo addEntityList( } /** - * repeated .SceneEntityInfo entity_list = 5; + * repeated .SceneEntityInfo entity_list = 2; * @param values the entityList to add * @return this */ @@ -260,16 +260,16 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(state); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(groupId); } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < entityList.length(); i++) { - output.writeRawByte((byte) 42); + output.writeRawByte((byte) 18); output.writeMessageNoTag(entityList.get(i)); } } @@ -297,25 +297,25 @@ public SceneEntityGroupInfo mergeFrom(final ProtoSource input) throws IOExceptio int tag = input.readTag(); while (true) { switch (tag) { - case 8: { + case 48: { // state state = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 32) { + if (tag != 80) { break; } } - case 32: { + case 80: { // groupId groupId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 42) { + if (tag != 18) { break; } } - case 42: { + case 18: { // entityList tag = input.readRepeatedMessage(entityList, tag); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/SceneEntityInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneEntityInfoOuterClass.java index 8f326f558..911a08ef6 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneEntityInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneEntityInfoOuterClass.java @@ -19,49 +19,49 @@ public static final class SceneEntityInfo extends ProtoMessage private static final long serialVersionUID = 0L; /** - * optional uint32 entity_id = 1; + * optional uint32 inst_id = 4; */ - private int entityId; + private int instId; /** - * optional uint32 group_id = 3; + * optional uint32 entity_id = 6; */ - private int groupId; + private int entityId; /** - * optional uint32 inst_id = 15; + * optional uint32 group_id = 11; */ - private int instId; + private int groupId; /** - * optional .SceneSummonUnitInfo summon_unit = 4; + * optional .ScenePropInfo prop = 5; */ - private final SceneSummonUnitInfoOuterClass.SceneSummonUnitInfo summonUnit = SceneSummonUnitInfoOuterClass.SceneSummonUnitInfo.newInstance(); + private final ScenePropInfoOuterClass.ScenePropInfo prop = ScenePropInfoOuterClass.ScenePropInfo.newInstance(); /** - * optional .ScenePropInfo prop = 5; + * optional .MotionInfo motion = 8; */ - private final ScenePropInfoOuterClass.ScenePropInfo prop = ScenePropInfoOuterClass.ScenePropInfo.newInstance(); + private final MotionInfoOuterClass.MotionInfo motion = MotionInfoOuterClass.MotionInfo.newInstance(); /** - * optional .SceneActorInfo actor = 9; + * optional .SceneNpcMonsterInfo npc_monster = 9; */ - private final SceneActorInfoOuterClass.SceneActorInfo actor = SceneActorInfoOuterClass.SceneActorInfo.newInstance(); + private final SceneNpcMonsterInfoOuterClass.SceneNpcMonsterInfo npcMonster = SceneNpcMonsterInfoOuterClass.SceneNpcMonsterInfo.newInstance(); /** - * optional .SceneNpcInfo npc = 12; + * optional .SceneSummonUnitInfo summon_unit = 12; */ - private final SceneNpcInfoOuterClass.SceneNpcInfo npc = SceneNpcInfoOuterClass.SceneNpcInfo.newInstance(); + private final SceneSummonUnitInfoOuterClass.SceneSummonUnitInfo summonUnit = SceneSummonUnitInfoOuterClass.SceneSummonUnitInfo.newInstance(); /** - * optional .MotionInfo motion = 13; + * optional .SceneActorInfo actor = 13; */ - private final MotionInfoOuterClass.MotionInfo motion = MotionInfoOuterClass.MotionInfo.newInstance(); + private final SceneActorInfoOuterClass.SceneActorInfo actor = SceneActorInfoOuterClass.SceneActorInfo.newInstance(); /** - * optional .SceneNpcMonsterInfo npc_monster = 14; + * optional .SceneNpcInfo npc = 14; */ - private final SceneNpcMonsterInfoOuterClass.SceneNpcMonsterInfo npcMonster = SceneNpcMonsterInfoOuterClass.SceneNpcMonsterInfo.newInstance(); + private final SceneNpcInfoOuterClass.SceneNpcInfo npc = SceneNpcInfoOuterClass.SceneNpcInfo.newInstance(); private SceneEntityInfo() { } @@ -74,150 +74,150 @@ public static SceneEntityInfo newInstance() { } /** - * optional uint32 entity_id = 1; - * @return whether the entityId field is set + * optional uint32 inst_id = 4; + * @return whether the instId field is set */ - public boolean hasEntityId() { + public boolean hasInstId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 entity_id = 1; + * optional uint32 inst_id = 4; * @return this */ - public SceneEntityInfo clearEntityId() { + public SceneEntityInfo clearInstId() { bitField0_ &= ~0x00000001; - entityId = 0; + instId = 0; return this; } /** - * optional uint32 entity_id = 1; - * @return the entityId + * optional uint32 inst_id = 4; + * @return the instId */ - public int getEntityId() { - return entityId; + public int getInstId() { + return instId; } /** - * optional uint32 entity_id = 1; - * @param value the entityId to set + * optional uint32 inst_id = 4; + * @param value the instId to set * @return this */ - public SceneEntityInfo setEntityId(final int value) { + public SceneEntityInfo setInstId(final int value) { bitField0_ |= 0x00000001; - entityId = value; + instId = value; return this; } /** - * optional uint32 group_id = 3; - * @return whether the groupId field is set + * optional uint32 entity_id = 6; + * @return whether the entityId field is set */ - public boolean hasGroupId() { + public boolean hasEntityId() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 group_id = 3; + * optional uint32 entity_id = 6; * @return this */ - public SceneEntityInfo clearGroupId() { + public SceneEntityInfo clearEntityId() { bitField0_ &= ~0x00000002; - groupId = 0; + entityId = 0; return this; } /** - * optional uint32 group_id = 3; - * @return the groupId + * optional uint32 entity_id = 6; + * @return the entityId */ - public int getGroupId() { - return groupId; + public int getEntityId() { + return entityId; } /** - * optional uint32 group_id = 3; - * @param value the groupId to set + * optional uint32 entity_id = 6; + * @param value the entityId to set * @return this */ - public SceneEntityInfo setGroupId(final int value) { + public SceneEntityInfo setEntityId(final int value) { bitField0_ |= 0x00000002; - groupId = value; + entityId = value; return this; } /** - * optional uint32 inst_id = 15; - * @return whether the instId field is set + * optional uint32 group_id = 11; + * @return whether the groupId field is set */ - public boolean hasInstId() { + public boolean hasGroupId() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 inst_id = 15; + * optional uint32 group_id = 11; * @return this */ - public SceneEntityInfo clearInstId() { + public SceneEntityInfo clearGroupId() { bitField0_ &= ~0x00000004; - instId = 0; + groupId = 0; return this; } /** - * optional uint32 inst_id = 15; - * @return the instId + * optional uint32 group_id = 11; + * @return the groupId */ - public int getInstId() { - return instId; + public int getGroupId() { + return groupId; } /** - * optional uint32 inst_id = 15; - * @param value the instId to set + * optional uint32 group_id = 11; + * @param value the groupId to set * @return this */ - public SceneEntityInfo setInstId(final int value) { + public SceneEntityInfo setGroupId(final int value) { bitField0_ |= 0x00000004; - instId = value; + groupId = value; return this; } /** - * optional .SceneSummonUnitInfo summon_unit = 4; - * @return whether the summonUnit field is set + * optional .ScenePropInfo prop = 5; + * @return whether the prop field is set */ - public boolean hasSummonUnit() { + public boolean hasProp() { return (bitField0_ & 0x00000008) != 0; } /** - * optional .SceneSummonUnitInfo summon_unit = 4; + * optional .ScenePropInfo prop = 5; * @return this */ - public SceneEntityInfo clearSummonUnit() { + public SceneEntityInfo clearProp() { bitField0_ &= ~0x00000008; - summonUnit.clear(); + prop.clear(); return this; } /** - * optional .SceneSummonUnitInfo summon_unit = 4; + * optional .ScenePropInfo prop = 5; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. * - * Use {@link #getMutableSummonUnit()} if you want to modify it. + * Use {@link #getMutableProp()} if you want to modify it. * * @return internal storage object for reading */ - public SceneSummonUnitInfoOuterClass.SceneSummonUnitInfo getSummonUnit() { - return summonUnit; + public ScenePropInfoOuterClass.ScenePropInfo getProp() { + return prop; } /** - * optional .SceneSummonUnitInfo summon_unit = 4; + * optional .ScenePropInfo prop = 5; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -225,57 +225,56 @@ public SceneSummonUnitInfoOuterClass.SceneSummonUnitInfo getSummonUnit() { * * @return internal storage object for modifications */ - public SceneSummonUnitInfoOuterClass.SceneSummonUnitInfo getMutableSummonUnit() { + public ScenePropInfoOuterClass.ScenePropInfo getMutableProp() { bitField0_ |= 0x00000008; - return summonUnit; + return prop; } /** - * optional .SceneSummonUnitInfo summon_unit = 4; - * @param value the summonUnit to set + * optional .ScenePropInfo prop = 5; + * @param value the prop to set * @return this */ - public SceneEntityInfo setSummonUnit( - final SceneSummonUnitInfoOuterClass.SceneSummonUnitInfo value) { + public SceneEntityInfo setProp(final ScenePropInfoOuterClass.ScenePropInfo value) { bitField0_ |= 0x00000008; - summonUnit.copyFrom(value); + prop.copyFrom(value); return this; } /** - * optional .ScenePropInfo prop = 5; - * @return whether the prop field is set + * optional .MotionInfo motion = 8; + * @return whether the motion field is set */ - public boolean hasProp() { + public boolean hasMotion() { return (bitField0_ & 0x00000010) != 0; } /** - * optional .ScenePropInfo prop = 5; + * optional .MotionInfo motion = 8; * @return this */ - public SceneEntityInfo clearProp() { + public SceneEntityInfo clearMotion() { bitField0_ &= ~0x00000010; - prop.clear(); + motion.clear(); return this; } /** - * optional .ScenePropInfo prop = 5; + * optional .MotionInfo motion = 8; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. * - * Use {@link #getMutableProp()} if you want to modify it. + * Use {@link #getMutableMotion()} if you want to modify it. * * @return internal storage object for reading */ - public ScenePropInfoOuterClass.ScenePropInfo getProp() { - return prop; + public MotionInfoOuterClass.MotionInfo getMotion() { + return motion; } /** - * optional .ScenePropInfo prop = 5; + * optional .MotionInfo motion = 8; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -283,56 +282,56 @@ public ScenePropInfoOuterClass.ScenePropInfo getProp() { * * @return internal storage object for modifications */ - public ScenePropInfoOuterClass.ScenePropInfo getMutableProp() { + public MotionInfoOuterClass.MotionInfo getMutableMotion() { bitField0_ |= 0x00000010; - return prop; + return motion; } /** - * optional .ScenePropInfo prop = 5; - * @param value the prop to set + * optional .MotionInfo motion = 8; + * @param value the motion to set * @return this */ - public SceneEntityInfo setProp(final ScenePropInfoOuterClass.ScenePropInfo value) { + public SceneEntityInfo setMotion(final MotionInfoOuterClass.MotionInfo value) { bitField0_ |= 0x00000010; - prop.copyFrom(value); + motion.copyFrom(value); return this; } /** - * optional .SceneActorInfo actor = 9; - * @return whether the actor field is set + * optional .SceneNpcMonsterInfo npc_monster = 9; + * @return whether the npcMonster field is set */ - public boolean hasActor() { + public boolean hasNpcMonster() { return (bitField0_ & 0x00000020) != 0; } /** - * optional .SceneActorInfo actor = 9; + * optional .SceneNpcMonsterInfo npc_monster = 9; * @return this */ - public SceneEntityInfo clearActor() { + public SceneEntityInfo clearNpcMonster() { bitField0_ &= ~0x00000020; - actor.clear(); + npcMonster.clear(); return this; } /** - * optional .SceneActorInfo actor = 9; + * optional .SceneNpcMonsterInfo npc_monster = 9; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. * - * Use {@link #getMutableActor()} if you want to modify it. + * Use {@link #getMutableNpcMonster()} if you want to modify it. * * @return internal storage object for reading */ - public SceneActorInfoOuterClass.SceneActorInfo getActor() { - return actor; + public SceneNpcMonsterInfoOuterClass.SceneNpcMonsterInfo getNpcMonster() { + return npcMonster; } /** - * optional .SceneActorInfo actor = 9; + * optional .SceneNpcMonsterInfo npc_monster = 9; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -340,56 +339,57 @@ public SceneActorInfoOuterClass.SceneActorInfo getActor() { * * @return internal storage object for modifications */ - public SceneActorInfoOuterClass.SceneActorInfo getMutableActor() { + public SceneNpcMonsterInfoOuterClass.SceneNpcMonsterInfo getMutableNpcMonster() { bitField0_ |= 0x00000020; - return actor; + return npcMonster; } /** - * optional .SceneActorInfo actor = 9; - * @param value the actor to set + * optional .SceneNpcMonsterInfo npc_monster = 9; + * @param value the npcMonster to set * @return this */ - public SceneEntityInfo setActor(final SceneActorInfoOuterClass.SceneActorInfo value) { + public SceneEntityInfo setNpcMonster( + final SceneNpcMonsterInfoOuterClass.SceneNpcMonsterInfo value) { bitField0_ |= 0x00000020; - actor.copyFrom(value); + npcMonster.copyFrom(value); return this; } /** - * optional .SceneNpcInfo npc = 12; - * @return whether the npc field is set + * optional .SceneSummonUnitInfo summon_unit = 12; + * @return whether the summonUnit field is set */ - public boolean hasNpc() { + public boolean hasSummonUnit() { return (bitField0_ & 0x00000040) != 0; } /** - * optional .SceneNpcInfo npc = 12; + * optional .SceneSummonUnitInfo summon_unit = 12; * @return this */ - public SceneEntityInfo clearNpc() { + public SceneEntityInfo clearSummonUnit() { bitField0_ &= ~0x00000040; - npc.clear(); + summonUnit.clear(); return this; } /** - * optional .SceneNpcInfo npc = 12; + * optional .SceneSummonUnitInfo summon_unit = 12; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. * - * Use {@link #getMutableNpc()} if you want to modify it. + * Use {@link #getMutableSummonUnit()} if you want to modify it. * * @return internal storage object for reading */ - public SceneNpcInfoOuterClass.SceneNpcInfo getNpc() { - return npc; + public SceneSummonUnitInfoOuterClass.SceneSummonUnitInfo getSummonUnit() { + return summonUnit; } /** - * optional .SceneNpcInfo npc = 12; + * optional .SceneSummonUnitInfo summon_unit = 12; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -397,56 +397,57 @@ public SceneNpcInfoOuterClass.SceneNpcInfo getNpc() { * * @return internal storage object for modifications */ - public SceneNpcInfoOuterClass.SceneNpcInfo getMutableNpc() { + public SceneSummonUnitInfoOuterClass.SceneSummonUnitInfo getMutableSummonUnit() { bitField0_ |= 0x00000040; - return npc; + return summonUnit; } /** - * optional .SceneNpcInfo npc = 12; - * @param value the npc to set + * optional .SceneSummonUnitInfo summon_unit = 12; + * @param value the summonUnit to set * @return this */ - public SceneEntityInfo setNpc(final SceneNpcInfoOuterClass.SceneNpcInfo value) { + public SceneEntityInfo setSummonUnit( + final SceneSummonUnitInfoOuterClass.SceneSummonUnitInfo value) { bitField0_ |= 0x00000040; - npc.copyFrom(value); + summonUnit.copyFrom(value); return this; } /** - * optional .MotionInfo motion = 13; - * @return whether the motion field is set + * optional .SceneActorInfo actor = 13; + * @return whether the actor field is set */ - public boolean hasMotion() { + public boolean hasActor() { return (bitField0_ & 0x00000080) != 0; } /** - * optional .MotionInfo motion = 13; + * optional .SceneActorInfo actor = 13; * @return this */ - public SceneEntityInfo clearMotion() { + public SceneEntityInfo clearActor() { bitField0_ &= ~0x00000080; - motion.clear(); + actor.clear(); return this; } /** - * optional .MotionInfo motion = 13; + * optional .SceneActorInfo actor = 13; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. * - * Use {@link #getMutableMotion()} if you want to modify it. + * Use {@link #getMutableActor()} if you want to modify it. * * @return internal storage object for reading */ - public MotionInfoOuterClass.MotionInfo getMotion() { - return motion; + public SceneActorInfoOuterClass.SceneActorInfo getActor() { + return actor; } /** - * optional .MotionInfo motion = 13; + * optional .SceneActorInfo actor = 13; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -454,56 +455,56 @@ public MotionInfoOuterClass.MotionInfo getMotion() { * * @return internal storage object for modifications */ - public MotionInfoOuterClass.MotionInfo getMutableMotion() { + public SceneActorInfoOuterClass.SceneActorInfo getMutableActor() { bitField0_ |= 0x00000080; - return motion; + return actor; } /** - * optional .MotionInfo motion = 13; - * @param value the motion to set + * optional .SceneActorInfo actor = 13; + * @param value the actor to set * @return this */ - public SceneEntityInfo setMotion(final MotionInfoOuterClass.MotionInfo value) { + public SceneEntityInfo setActor(final SceneActorInfoOuterClass.SceneActorInfo value) { bitField0_ |= 0x00000080; - motion.copyFrom(value); + actor.copyFrom(value); return this; } /** - * optional .SceneNpcMonsterInfo npc_monster = 14; - * @return whether the npcMonster field is set + * optional .SceneNpcInfo npc = 14; + * @return whether the npc field is set */ - public boolean hasNpcMonster() { + public boolean hasNpc() { return (bitField0_ & 0x00000100) != 0; } /** - * optional .SceneNpcMonsterInfo npc_monster = 14; + * optional .SceneNpcInfo npc = 14; * @return this */ - public SceneEntityInfo clearNpcMonster() { + public SceneEntityInfo clearNpc() { bitField0_ &= ~0x00000100; - npcMonster.clear(); + npc.clear(); return this; } /** - * optional .SceneNpcMonsterInfo npc_monster = 14; + * optional .SceneNpcInfo npc = 14; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. * - * Use {@link #getMutableNpcMonster()} if you want to modify it. + * Use {@link #getMutableNpc()} if you want to modify it. * * @return internal storage object for reading */ - public SceneNpcMonsterInfoOuterClass.SceneNpcMonsterInfo getNpcMonster() { - return npcMonster; + public SceneNpcInfoOuterClass.SceneNpcInfo getNpc() { + return npc; } /** - * optional .SceneNpcMonsterInfo npc_monster = 14; + * optional .SceneNpcInfo npc = 14; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -511,20 +512,19 @@ public SceneNpcMonsterInfoOuterClass.SceneNpcMonsterInfo getNpcMonster() { * * @return internal storage object for modifications */ - public SceneNpcMonsterInfoOuterClass.SceneNpcMonsterInfo getMutableNpcMonster() { + public SceneNpcInfoOuterClass.SceneNpcInfo getMutableNpc() { bitField0_ |= 0x00000100; - return npcMonster; + return npc; } /** - * optional .SceneNpcMonsterInfo npc_monster = 14; - * @param value the npcMonster to set + * optional .SceneNpcInfo npc = 14; + * @param value the npc to set * @return this */ - public SceneEntityInfo setNpcMonster( - final SceneNpcMonsterInfoOuterClass.SceneNpcMonsterInfo value) { + public SceneEntityInfo setNpc(final SceneNpcInfoOuterClass.SceneNpcInfo value) { bitField0_ |= 0x00000100; - npcMonster.copyFrom(value); + npc.copyFrom(value); return this; } @@ -533,15 +533,15 @@ public SceneEntityInfo copyFrom(final SceneEntityInfo other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; + instId = other.instId; entityId = other.entityId; groupId = other.groupId; - instId = other.instId; - summonUnit.copyFrom(other.summonUnit); prop.copyFrom(other.prop); - actor.copyFrom(other.actor); - npc.copyFrom(other.npc); motion.copyFrom(other.motion); npcMonster.copyFrom(other.npcMonster); + summonUnit.copyFrom(other.summonUnit); + actor.copyFrom(other.actor); + npc.copyFrom(other.npc); } return this; } @@ -552,33 +552,33 @@ public SceneEntityInfo mergeFrom(final SceneEntityInfo other) { return this; } cachedSize = -1; + if (other.hasInstId()) { + setInstId(other.instId); + } if (other.hasEntityId()) { setEntityId(other.entityId); } if (other.hasGroupId()) { setGroupId(other.groupId); } - if (other.hasInstId()) { - setInstId(other.instId); + if (other.hasProp()) { + getMutableProp().mergeFrom(other.prop); + } + if (other.hasMotion()) { + getMutableMotion().mergeFrom(other.motion); + } + if (other.hasNpcMonster()) { + getMutableNpcMonster().mergeFrom(other.npcMonster); } if (other.hasSummonUnit()) { getMutableSummonUnit().mergeFrom(other.summonUnit); } - if (other.hasProp()) { - getMutableProp().mergeFrom(other.prop); - } if (other.hasActor()) { getMutableActor().mergeFrom(other.actor); } if (other.hasNpc()) { getMutableNpc().mergeFrom(other.npc); } - if (other.hasMotion()) { - getMutableMotion().mergeFrom(other.motion); - } - if (other.hasNpcMonster()) { - getMutableNpcMonster().mergeFrom(other.npcMonster); - } return this; } @@ -589,15 +589,15 @@ public SceneEntityInfo clear() { } cachedSize = -1; bitField0_ = 0; + instId = 0; entityId = 0; groupId = 0; - instId = 0; - summonUnit.clear(); prop.clear(); - actor.clear(); - npc.clear(); motion.clear(); npcMonster.clear(); + summonUnit.clear(); + actor.clear(); + npc.clear(); return this; } @@ -608,12 +608,12 @@ public SceneEntityInfo clearQuick() { } cachedSize = -1; bitField0_ = 0; - summonUnit.clearQuick(); prop.clearQuick(); - actor.clearQuick(); - npc.clearQuick(); motion.clearQuick(); npcMonster.clearQuick(); + summonUnit.clearQuick(); + actor.clearQuick(); + npc.clearQuick(); return this; } @@ -627,54 +627,54 @@ public boolean equals(Object o) { } SceneEntityInfo other = (SceneEntityInfo) o; return bitField0_ == other.bitField0_ + && (!hasInstId() || instId == other.instId) && (!hasEntityId() || entityId == other.entityId) && (!hasGroupId() || groupId == other.groupId) - && (!hasInstId() || instId == other.instId) - && (!hasSummonUnit() || summonUnit.equals(other.summonUnit)) && (!hasProp() || prop.equals(other.prop)) - && (!hasActor() || actor.equals(other.actor)) - && (!hasNpc() || npc.equals(other.npc)) && (!hasMotion() || motion.equals(other.motion)) - && (!hasNpcMonster() || npcMonster.equals(other.npcMonster)); + && (!hasNpcMonster() || npcMonster.equals(other.npcMonster)) + && (!hasSummonUnit() || summonUnit.equals(other.summonUnit)) + && (!hasActor() || actor.equals(other.actor)) + && (!hasNpc() || npc.equals(other.npc)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); - output.writeUInt32NoTag(entityId); + output.writeRawByte((byte) 32); + output.writeUInt32NoTag(instId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 24); - output.writeUInt32NoTag(groupId); + output.writeRawByte((byte) 48); + output.writeUInt32NoTag(entityId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 120); - output.writeUInt32NoTag(instId); + output.writeRawByte((byte) 88); + output.writeUInt32NoTag(groupId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 34); - output.writeMessageNoTag(summonUnit); - } - if ((bitField0_ & 0x00000010) != 0) { output.writeRawByte((byte) 42); output.writeMessageNoTag(prop); } + if ((bitField0_ & 0x00000010) != 0) { + output.writeRawByte((byte) 66); + output.writeMessageNoTag(motion); + } if ((bitField0_ & 0x00000020) != 0) { output.writeRawByte((byte) 74); - output.writeMessageNoTag(actor); + output.writeMessageNoTag(npcMonster); } if ((bitField0_ & 0x00000040) != 0) { output.writeRawByte((byte) 98); - output.writeMessageNoTag(npc); + output.writeMessageNoTag(summonUnit); } if ((bitField0_ & 0x00000080) != 0) { output.writeRawByte((byte) 106); - output.writeMessageNoTag(motion); + output.writeMessageNoTag(actor); } if ((bitField0_ & 0x00000100) != 0) { output.writeRawByte((byte) 114); - output.writeMessageNoTag(npcMonster); + output.writeMessageNoTag(npc); } } @@ -682,31 +682,31 @@ public void writeTo(final ProtoSink output) throws IOException { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(entityId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(instId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(groupId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(entityId); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(instId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(groupId); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(summonUnit); + size += 1 + ProtoSink.computeMessageSizeNoTag(prop); } if ((bitField0_ & 0x00000010) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(prop); + size += 1 + ProtoSink.computeMessageSizeNoTag(motion); } if ((bitField0_ & 0x00000020) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(actor); + size += 1 + ProtoSink.computeMessageSizeNoTag(npcMonster); } if ((bitField0_ & 0x00000040) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(npc); + size += 1 + ProtoSink.computeMessageSizeNoTag(summonUnit); } if ((bitField0_ & 0x00000080) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(motion); + size += 1 + ProtoSink.computeMessageSizeNoTag(actor); } if ((bitField0_ & 0x00000100) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(npcMonster); + size += 1 + ProtoSink.computeMessageSizeNoTag(npc); } return size; } @@ -718,45 +718,45 @@ public SceneEntityInfo mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { - // entityId - entityId = input.readUInt32(); + case 32: { + // instId + instId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 24) { + if (tag != 48) { break; } } - case 24: { - // groupId - groupId = input.readUInt32(); + case 48: { + // entityId + entityId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 120) { + if (tag != 88) { break; } } - case 120: { - // instId - instId = input.readUInt32(); + case 88: { + // groupId + groupId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 34) { + if (tag != 42) { break; } } - case 34: { - // summonUnit - input.readMessage(summonUnit); + case 42: { + // prop + input.readMessage(prop); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 42) { + if (tag != 66) { break; } } - case 42: { - // prop - input.readMessage(prop); + case 66: { + // motion + input.readMessage(motion); bitField0_ |= 0x00000010; tag = input.readTag(); if (tag != 74) { @@ -764,8 +764,8 @@ public SceneEntityInfo mergeFrom(final ProtoSource input) throws IOException { } } case 74: { - // actor - input.readMessage(actor); + // npcMonster + input.readMessage(npcMonster); bitField0_ |= 0x00000020; tag = input.readTag(); if (tag != 98) { @@ -773,8 +773,8 @@ public SceneEntityInfo mergeFrom(final ProtoSource input) throws IOException { } } case 98: { - // npc - input.readMessage(npc); + // summonUnit + input.readMessage(summonUnit); bitField0_ |= 0x00000040; tag = input.readTag(); if (tag != 106) { @@ -782,8 +782,8 @@ public SceneEntityInfo mergeFrom(final ProtoSource input) throws IOException { } } case 106: { - // motion - input.readMessage(motion); + // actor + input.readMessage(actor); bitField0_ |= 0x00000080; tag = input.readTag(); if (tag != 114) { @@ -791,8 +791,8 @@ public SceneEntityInfo mergeFrom(final ProtoSource input) throws IOException { } } case 114: { - // npcMonster - input.readMessage(npcMonster); + // npc + input.readMessage(npc); bitField0_ |= 0x00000100; tag = input.readTag(); if (tag != 0) { @@ -817,31 +817,31 @@ public SceneEntityInfo mergeFrom(final ProtoSource input) throws IOException { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.entityId, entityId); + output.writeUInt32(FieldNames.instId, instId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.groupId, groupId); + output.writeUInt32(FieldNames.entityId, entityId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.instId, instId); + output.writeUInt32(FieldNames.groupId, groupId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeMessage(FieldNames.summonUnit, summonUnit); + output.writeMessage(FieldNames.prop, prop); } if ((bitField0_ & 0x00000010) != 0) { - output.writeMessage(FieldNames.prop, prop); + output.writeMessage(FieldNames.motion, motion); } if ((bitField0_ & 0x00000020) != 0) { - output.writeMessage(FieldNames.actor, actor); + output.writeMessage(FieldNames.npcMonster, npcMonster); } if ((bitField0_ & 0x00000040) != 0) { - output.writeMessage(FieldNames.npc, npc); + output.writeMessage(FieldNames.summonUnit, summonUnit); } if ((bitField0_ & 0x00000080) != 0) { - output.writeMessage(FieldNames.motion, motion); + output.writeMessage(FieldNames.actor, actor); } if ((bitField0_ & 0x00000100) != 0) { - output.writeMessage(FieldNames.npcMonster, npcMonster); + output.writeMessage(FieldNames.npc, npc); } output.endObject(); } @@ -853,11 +853,11 @@ public SceneEntityInfo mergeFrom(final JsonSource input) throws IOException { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -2102099874: - case -740565257: { - if (input.isAtField(FieldNames.entityId)) { + case -1183779327: + case 1957567924: { + if (input.isAtField(FieldNames.instId)) { if (!input.trySkipNullValue()) { - entityId = input.readUInt32(); + instId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -865,11 +865,11 @@ public SceneEntityInfo mergeFrom(final JsonSource input) throws IOException { } break; } - case 293428218: - case 506361563: { - if (input.isAtField(FieldNames.groupId)) { + case -2102099874: + case -740565257: { + if (input.isAtField(FieldNames.entityId)) { if (!input.trySkipNullValue()) { - groupId = input.readUInt32(); + entityId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -877,11 +877,11 @@ public SceneEntityInfo mergeFrom(final JsonSource input) throws IOException { } break; } - case -1183779327: - case 1957567924: { - if (input.isAtField(FieldNames.instId)) { + case 293428218: + case 506361563: { + if (input.isAtField(FieldNames.groupId)) { if (!input.trySkipNullValue()) { - instId = input.readUInt32(); + groupId = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -889,11 +889,10 @@ public SceneEntityInfo mergeFrom(final JsonSource input) throws IOException { } break; } - case 80492037: - case -1790265822: { - if (input.isAtField(FieldNames.summonUnit)) { + case 3449699: { + if (input.isAtField(FieldNames.prop)) { if (!input.trySkipNullValue()) { - input.readMessage(summonUnit); + input.readMessage(prop); bitField0_ |= 0x00000008; } } else { @@ -901,10 +900,10 @@ public SceneEntityInfo mergeFrom(final JsonSource input) throws IOException { } break; } - case 3449699: { - if (input.isAtField(FieldNames.prop)) { + case -1068318794: { + if (input.isAtField(FieldNames.motion)) { if (!input.trySkipNullValue()) { - input.readMessage(prop); + input.readMessage(motion); bitField0_ |= 0x00000010; } } else { @@ -912,10 +911,11 @@ public SceneEntityInfo mergeFrom(final JsonSource input) throws IOException { } break; } - case 92645877: { - if (input.isAtField(FieldNames.actor)) { + case -1367251527: + case 119679100: { + if (input.isAtField(FieldNames.npcMonster)) { if (!input.trySkipNullValue()) { - input.readMessage(actor); + input.readMessage(npcMonster); bitField0_ |= 0x00000020; } } else { @@ -923,10 +923,11 @@ public SceneEntityInfo mergeFrom(final JsonSource input) throws IOException { } break; } - case 109281: { - if (input.isAtField(FieldNames.npc)) { + case 80492037: + case -1790265822: { + if (input.isAtField(FieldNames.summonUnit)) { if (!input.trySkipNullValue()) { - input.readMessage(npc); + input.readMessage(summonUnit); bitField0_ |= 0x00000040; } } else { @@ -934,10 +935,10 @@ public SceneEntityInfo mergeFrom(final JsonSource input) throws IOException { } break; } - case -1068318794: { - if (input.isAtField(FieldNames.motion)) { + case 92645877: { + if (input.isAtField(FieldNames.actor)) { if (!input.trySkipNullValue()) { - input.readMessage(motion); + input.readMessage(actor); bitField0_ |= 0x00000080; } } else { @@ -945,11 +946,10 @@ public SceneEntityInfo mergeFrom(final JsonSource input) throws IOException { } break; } - case -1367251527: - case 119679100: { - if (input.isAtField(FieldNames.npcMonster)) { + case 109281: { + if (input.isAtField(FieldNames.npc)) { if (!input.trySkipNullValue()) { - input.readMessage(npcMonster); + input.readMessage(npc); bitField0_ |= 0x00000100; } } else { @@ -1010,23 +1010,23 @@ public SceneEntityInfo create() { * Contains name constants used for serializing JSON */ static class FieldNames { + static final FieldName instId = FieldName.forField("instId", "inst_id"); + static final FieldName entityId = FieldName.forField("entityId", "entity_id"); static final FieldName groupId = FieldName.forField("groupId", "group_id"); - static final FieldName instId = FieldName.forField("instId", "inst_id"); + static final FieldName prop = FieldName.forField("prop"); - static final FieldName summonUnit = FieldName.forField("summonUnit", "summon_unit"); + static final FieldName motion = FieldName.forField("motion"); - static final FieldName prop = FieldName.forField("prop"); + static final FieldName npcMonster = FieldName.forField("npcMonster", "npc_monster"); + + static final FieldName summonUnit = FieldName.forField("summonUnit", "summon_unit"); static final FieldName actor = FieldName.forField("actor"); static final FieldName npc = FieldName.forField("npc"); - - static final FieldName motion = FieldName.forField("motion"); - - static final FieldName npcMonster = FieldName.forField("npcMonster", "npc_monster"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/SceneEntityMoveCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneEntityMoveCsReqOuterClass.java index 450134e7f..33c446a43 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneEntityMoveCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneEntityMoveCsReqOuterClass.java @@ -20,12 +20,12 @@ public static final class SceneEntityMoveCsReq extends ProtoMessageoptional uint32 entry_id = 11; + * optional uint32 entry_id = 8; */ private int entryId; /** - * repeated .EntityMotion entity_motion_list = 8; + * repeated .EntityMotion entity_motion_list = 7; */ private final RepeatedMessage entityMotionList = RepeatedMessage.newEmptyInstance(EntityMotionOuterClass.EntityMotion.getFactory()); @@ -40,7 +40,7 @@ public static SceneEntityMoveCsReq newInstance() { } /** - * optional uint32 entry_id = 11; + * optional uint32 entry_id = 8; * @return whether the entryId field is set */ public boolean hasEntryId() { @@ -48,7 +48,7 @@ public boolean hasEntryId() { } /** - * optional uint32 entry_id = 11; + * optional uint32 entry_id = 8; * @return this */ public SceneEntityMoveCsReq clearEntryId() { @@ -58,7 +58,7 @@ public SceneEntityMoveCsReq clearEntryId() { } /** - * optional uint32 entry_id = 11; + * optional uint32 entry_id = 8; * @return the entryId */ public int getEntryId() { @@ -66,7 +66,7 @@ public int getEntryId() { } /** - * optional uint32 entry_id = 11; + * optional uint32 entry_id = 8; * @param value the entryId to set * @return this */ @@ -77,7 +77,7 @@ public SceneEntityMoveCsReq setEntryId(final int value) { } /** - * repeated .EntityMotion entity_motion_list = 8; + * repeated .EntityMotion entity_motion_list = 7; * @return whether the entityMotionList field is set */ public boolean hasEntityMotionList() { @@ -85,7 +85,7 @@ public boolean hasEntityMotionList() { } /** - * repeated .EntityMotion entity_motion_list = 8; + * repeated .EntityMotion entity_motion_list = 7; * @return this */ public SceneEntityMoveCsReq clearEntityMotionList() { @@ -95,7 +95,7 @@ public SceneEntityMoveCsReq clearEntityMotionList() { } /** - * repeated .EntityMotion entity_motion_list = 8; + * repeated .EntityMotion entity_motion_list = 7; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -109,7 +109,7 @@ public RepeatedMessage getEntityMotionList( } /** - * repeated .EntityMotion entity_motion_list = 8; + * repeated .EntityMotion entity_motion_list = 7; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -123,7 +123,7 @@ public RepeatedMessage getMutableEntityMoti } /** - * repeated .EntityMotion entity_motion_list = 8; + * repeated .EntityMotion entity_motion_list = 7; * @param value the entityMotionList to add * @return this */ @@ -135,7 +135,7 @@ public SceneEntityMoveCsReq addEntityMotionList( } /** - * repeated .EntityMotion entity_motion_list = 8; + * repeated .EntityMotion entity_motion_list = 7; * @param values the entityMotionList to add * @return this */ @@ -212,12 +212,12 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(entryId); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < entityMotionList.length(); i++) { - output.writeRawByte((byte) 66); + output.writeRawByte((byte) 58); output.writeMessageNoTag(entityMotionList.get(i)); } } @@ -242,16 +242,16 @@ public SceneEntityMoveCsReq mergeFrom(final ProtoSource input) throws IOExceptio int tag = input.readTag(); while (true) { switch (tag) { - case 88: { + case 64: { // entryId entryId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 66) { + if (tag != 58) { break; } } - case 66: { + case 58: { // entityMotionList tag = input.readRepeatedMessage(entityMotionList, tag); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/SceneEntityMoveScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneEntityMoveScNotifyOuterClass.java index ae57ced92..dfa462660 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneEntityMoveScNotifyOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneEntityMoveScNotifyOuterClass.java @@ -19,22 +19,22 @@ public static final class SceneEntityMoveScNotify extends ProtoMessageoptional uint32 client_pos_version = 5; + * optional uint32 entry_id = 10; */ - private int clientPosVersion; + private int entryId; /** - * optional uint32 entity_id = 8; + * optional uint32 entity_id = 11; */ private int entityId; /** - * optional uint32 entry_id = 11; + * optional uint32 client_pos_version = 13; */ - private int entryId; + private int clientPosVersion; /** - * optional .MotionInfo motion = 12; + * optional .MotionInfo motion = 8; */ private final MotionInfoOuterClass.MotionInfo motion = MotionInfoOuterClass.MotionInfo.newInstance(); @@ -49,44 +49,44 @@ public static SceneEntityMoveScNotify newInstance() { } /** - * optional uint32 client_pos_version = 5; - * @return whether the clientPosVersion field is set + * optional uint32 entry_id = 10; + * @return whether the entryId field is set */ - public boolean hasClientPosVersion() { + public boolean hasEntryId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 client_pos_version = 5; + * optional uint32 entry_id = 10; * @return this */ - public SceneEntityMoveScNotify clearClientPosVersion() { + public SceneEntityMoveScNotify clearEntryId() { bitField0_ &= ~0x00000001; - clientPosVersion = 0; + entryId = 0; return this; } /** - * optional uint32 client_pos_version = 5; - * @return the clientPosVersion + * optional uint32 entry_id = 10; + * @return the entryId */ - public int getClientPosVersion() { - return clientPosVersion; + public int getEntryId() { + return entryId; } /** - * optional uint32 client_pos_version = 5; - * @param value the clientPosVersion to set + * optional uint32 entry_id = 10; + * @param value the entryId to set * @return this */ - public SceneEntityMoveScNotify setClientPosVersion(final int value) { + public SceneEntityMoveScNotify setEntryId(final int value) { bitField0_ |= 0x00000001; - clientPosVersion = value; + entryId = value; return this; } /** - * optional uint32 entity_id = 8; + * optional uint32 entity_id = 11; * @return whether the entityId field is set */ public boolean hasEntityId() { @@ -94,7 +94,7 @@ public boolean hasEntityId() { } /** - * optional uint32 entity_id = 8; + * optional uint32 entity_id = 11; * @return this */ public SceneEntityMoveScNotify clearEntityId() { @@ -104,7 +104,7 @@ public SceneEntityMoveScNotify clearEntityId() { } /** - * optional uint32 entity_id = 8; + * optional uint32 entity_id = 11; * @return the entityId */ public int getEntityId() { @@ -112,7 +112,7 @@ public int getEntityId() { } /** - * optional uint32 entity_id = 8; + * optional uint32 entity_id = 11; * @param value the entityId to set * @return this */ @@ -123,44 +123,44 @@ public SceneEntityMoveScNotify setEntityId(final int value) { } /** - * optional uint32 entry_id = 11; - * @return whether the entryId field is set + * optional uint32 client_pos_version = 13; + * @return whether the clientPosVersion field is set */ - public boolean hasEntryId() { + public boolean hasClientPosVersion() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 entry_id = 11; + * optional uint32 client_pos_version = 13; * @return this */ - public SceneEntityMoveScNotify clearEntryId() { + public SceneEntityMoveScNotify clearClientPosVersion() { bitField0_ &= ~0x00000004; - entryId = 0; + clientPosVersion = 0; return this; } /** - * optional uint32 entry_id = 11; - * @return the entryId + * optional uint32 client_pos_version = 13; + * @return the clientPosVersion */ - public int getEntryId() { - return entryId; + public int getClientPosVersion() { + return clientPosVersion; } /** - * optional uint32 entry_id = 11; - * @param value the entryId to set + * optional uint32 client_pos_version = 13; + * @param value the clientPosVersion to set * @return this */ - public SceneEntityMoveScNotify setEntryId(final int value) { + public SceneEntityMoveScNotify setClientPosVersion(final int value) { bitField0_ |= 0x00000004; - entryId = value; + clientPosVersion = value; return this; } /** - * optional .MotionInfo motion = 12; + * optional .MotionInfo motion = 8; * @return whether the motion field is set */ public boolean hasMotion() { @@ -168,7 +168,7 @@ public boolean hasMotion() { } /** - * optional .MotionInfo motion = 12; + * optional .MotionInfo motion = 8; * @return this */ public SceneEntityMoveScNotify clearMotion() { @@ -178,7 +178,7 @@ public SceneEntityMoveScNotify clearMotion() { } /** - * optional .MotionInfo motion = 12; + * optional .MotionInfo motion = 8; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -192,7 +192,7 @@ public MotionInfoOuterClass.MotionInfo getMotion() { } /** - * optional .MotionInfo motion = 12; + * optional .MotionInfo motion = 8; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -206,7 +206,7 @@ public MotionInfoOuterClass.MotionInfo getMutableMotion() { } /** - * optional .MotionInfo motion = 12; + * optional .MotionInfo motion = 8; * @param value the motion to set * @return this */ @@ -221,9 +221,9 @@ public SceneEntityMoveScNotify copyFrom(final SceneEntityMoveScNotify other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - clientPosVersion = other.clientPosVersion; - entityId = other.entityId; entryId = other.entryId; + entityId = other.entityId; + clientPosVersion = other.clientPosVersion; motion.copyFrom(other.motion); } return this; @@ -235,14 +235,14 @@ public SceneEntityMoveScNotify mergeFrom(final SceneEntityMoveScNotify other) { return this; } cachedSize = -1; - if (other.hasClientPosVersion()) { - setClientPosVersion(other.clientPosVersion); + if (other.hasEntryId()) { + setEntryId(other.entryId); } if (other.hasEntityId()) { setEntityId(other.entityId); } - if (other.hasEntryId()) { - setEntryId(other.entryId); + if (other.hasClientPosVersion()) { + setClientPosVersion(other.clientPosVersion); } if (other.hasMotion()) { getMutableMotion().mergeFrom(other.motion); @@ -257,9 +257,9 @@ public SceneEntityMoveScNotify clear() { } cachedSize = -1; bitField0_ = 0; - clientPosVersion = 0; - entityId = 0; entryId = 0; + entityId = 0; + clientPosVersion = 0; motion.clear(); return this; } @@ -285,28 +285,28 @@ public boolean equals(Object o) { } SceneEntityMoveScNotify other = (SceneEntityMoveScNotify) o; return bitField0_ == other.bitField0_ - && (!hasClientPosVersion() || clientPosVersion == other.clientPosVersion) - && (!hasEntityId() || entityId == other.entityId) && (!hasEntryId() || entryId == other.entryId) + && (!hasEntityId() || entityId == other.entityId) + && (!hasClientPosVersion() || clientPosVersion == other.clientPosVersion) && (!hasMotion() || motion.equals(other.motion)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 40); - output.writeUInt32NoTag(clientPosVersion); + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(entryId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(entityId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 88); - output.writeUInt32NoTag(entryId); + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(clientPosVersion); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 98); + output.writeRawByte((byte) 66); output.writeMessageNoTag(motion); } } @@ -315,13 +315,13 @@ public void writeTo(final ProtoSink output) throws IOException { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(clientPosVersion); + size += 1 + ProtoSink.computeUInt32SizeNoTag(entryId); } if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(entityId); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(entryId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(clientPosVersion); } if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(motion); @@ -336,34 +336,34 @@ public SceneEntityMoveScNotify mergeFrom(final ProtoSource input) throws IOExcep int tag = input.readTag(); while (true) { switch (tag) { - case 40: { - // clientPosVersion - clientPosVersion = input.readUInt32(); + case 80: { + // entryId + entryId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 64) { + if (tag != 88) { break; } } - case 64: { + case 88: { // entityId entityId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 88) { + if (tag != 104) { break; } } - case 88: { - // entryId - entryId = input.readUInt32(); + case 104: { + // clientPosVersion + clientPosVersion = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 98) { + if (tag != 66) { break; } } - case 98: { + case 66: { // motion input.readMessage(motion); bitField0_ |= 0x00000008; @@ -390,13 +390,13 @@ public SceneEntityMoveScNotify mergeFrom(final ProtoSource input) throws IOExcep public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.clientPosVersion, clientPosVersion); + output.writeUInt32(FieldNames.entryId, entryId); } if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.entityId, entityId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.entryId, entryId); + output.writeUInt32(FieldNames.clientPosVersion, clientPosVersion); } if ((bitField0_ & 0x00000008) != 0) { output.writeMessage(FieldNames.motion, motion); @@ -411,11 +411,11 @@ public SceneEntityMoveScNotify mergeFrom(final JsonSource input) throws IOExcept } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1787644431: - case 1278860153: { - if (input.isAtField(FieldNames.clientPosVersion)) { + case -1591558867: + case -2093663224: { + if (input.isAtField(FieldNames.entryId)) { if (!input.trySkipNullValue()) { - clientPosVersion = input.readUInt32(); + entryId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -435,11 +435,11 @@ public SceneEntityMoveScNotify mergeFrom(final JsonSource input) throws IOExcept } break; } - case -1591558867: - case -2093663224: { - if (input.isAtField(FieldNames.entryId)) { + case 1787644431: + case 1278860153: { + if (input.isAtField(FieldNames.clientPosVersion)) { if (!input.trySkipNullValue()) { - entryId = input.readUInt32(); + clientPosVersion = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -511,11 +511,11 @@ public SceneEntityMoveScNotify create() { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName clientPosVersion = FieldName.forField("clientPosVersion", "client_pos_version"); + static final FieldName entryId = FieldName.forField("entryId", "entry_id"); static final FieldName entityId = FieldName.forField("entityId", "entity_id"); - static final FieldName entryId = FieldName.forField("entryId", "entry_id"); + static final FieldName clientPosVersion = FieldName.forField("clientPosVersion", "client_pos_version"); static final FieldName motion = FieldName.forField("motion"); } diff --git a/src/generated/main/emu/lunarcore/proto/SceneEntityRefreshInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneEntityRefreshInfoOuterClass.java index 7e3c0dbcb..76e3a660d 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneEntityRefreshInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneEntityRefreshInfoOuterClass.java @@ -19,7 +19,7 @@ public static final class SceneEntityRefreshInfo extends ProtoMessageoptional uint32 del_entity = 8; + * optional uint32 del_entity = 7; */ private int delEntity; @@ -39,7 +39,7 @@ public static SceneEntityRefreshInfo newInstance() { } /** - * optional uint32 del_entity = 8; + * optional uint32 del_entity = 7; * @return whether the delEntity field is set */ public boolean hasDelEntity() { @@ -47,7 +47,7 @@ public boolean hasDelEntity() { } /** - * optional uint32 del_entity = 8; + * optional uint32 del_entity = 7; * @return this */ public SceneEntityRefreshInfo clearDelEntity() { @@ -57,7 +57,7 @@ public SceneEntityRefreshInfo clearDelEntity() { } /** - * optional uint32 del_entity = 8; + * optional uint32 del_entity = 7; * @return the delEntity */ public int getDelEntity() { @@ -65,7 +65,7 @@ public int getDelEntity() { } /** - * optional uint32 del_entity = 8; + * optional uint32 del_entity = 7; * @param value the delEntity to set * @return this */ @@ -199,7 +199,7 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(delEntity); } if ((bitField0_ & 0x00000002) != 0) { @@ -227,7 +227,7 @@ public SceneEntityRefreshInfo mergeFrom(final ProtoSource input) throws IOExcept int tag = input.readTag(); while (true) { switch (tag) { - case 64: { + case 56: { // delEntity delEntity = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/SceneEntityTeleportCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneEntityTeleportCsReqOuterClass.java new file mode 100644 index 000000000..7fa004688 --- /dev/null +++ b/src/generated/main/emu/lunarcore/proto/SceneEntityTeleportCsReqOuterClass.java @@ -0,0 +1,363 @@ +// Code generated by protocol buffer compiler. Do not edit! +package emu.lunarcore.proto; + +import java.io.IOException; +import us.hebi.quickbuf.FieldName; +import us.hebi.quickbuf.InvalidProtocolBufferException; +import us.hebi.quickbuf.JsonSink; +import us.hebi.quickbuf.JsonSource; +import us.hebi.quickbuf.MessageFactory; +import us.hebi.quickbuf.ProtoMessage; +import us.hebi.quickbuf.ProtoSink; +import us.hebi.quickbuf.ProtoSource; + +public final class SceneEntityTeleportCsReqOuterClass { + /** + * Protobuf type {@code SceneEntityTeleportCsReq} + */ + public static final class SceneEntityTeleportCsReq extends ProtoMessage implements Cloneable { + private static final long serialVersionUID = 0L; + + /** + * optional uint32 entry_id = 2; + */ + private int entryId; + + /** + * optional .EntityMotion entity_motion = 8; + */ + private final EntityMotionOuterClass.EntityMotion entityMotion = EntityMotionOuterClass.EntityMotion.newInstance(); + + private SceneEntityTeleportCsReq() { + } + + /** + * @return a new empty instance of {@code SceneEntityTeleportCsReq} + */ + public static SceneEntityTeleportCsReq newInstance() { + return new SceneEntityTeleportCsReq(); + } + + /** + * optional uint32 entry_id = 2; + * @return whether the entryId field is set + */ + public boolean hasEntryId() { + return (bitField0_ & 0x00000001) != 0; + } + + /** + * optional uint32 entry_id = 2; + * @return this + */ + public SceneEntityTeleportCsReq clearEntryId() { + bitField0_ &= ~0x00000001; + entryId = 0; + return this; + } + + /** + * optional uint32 entry_id = 2; + * @return the entryId + */ + public int getEntryId() { + return entryId; + } + + /** + * optional uint32 entry_id = 2; + * @param value the entryId to set + * @return this + */ + public SceneEntityTeleportCsReq setEntryId(final int value) { + bitField0_ |= 0x00000001; + entryId = value; + return this; + } + + /** + * optional .EntityMotion entity_motion = 8; + * @return whether the entityMotion field is set + */ + public boolean hasEntityMotion() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional .EntityMotion entity_motion = 8; + * @return this + */ + public SceneEntityTeleportCsReq clearEntityMotion() { + bitField0_ &= ~0x00000002; + entityMotion.clear(); + return this; + } + + /** + * optional .EntityMotion entity_motion = 8; + * + * This method returns the internal storage object without modifying any has state. + * The returned object should not be modified and be treated as read-only. + * + * Use {@link #getMutableEntityMotion()} if you want to modify it. + * + * @return internal storage object for reading + */ + public EntityMotionOuterClass.EntityMotion getEntityMotion() { + return entityMotion; + } + + /** + * optional .EntityMotion entity_motion = 8; + * + * This method returns the internal storage object and sets the corresponding + * has state. The returned object will become part of this message and its + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public EntityMotionOuterClass.EntityMotion getMutableEntityMotion() { + bitField0_ |= 0x00000002; + return entityMotion; + } + + /** + * optional .EntityMotion entity_motion = 8; + * @param value the entityMotion to set + * @return this + */ + public SceneEntityTeleportCsReq setEntityMotion( + final EntityMotionOuterClass.EntityMotion value) { + bitField0_ |= 0x00000002; + entityMotion.copyFrom(value); + return this; + } + + @Override + public SceneEntityTeleportCsReq copyFrom(final SceneEntityTeleportCsReq other) { + cachedSize = other.cachedSize; + if ((bitField0_ | other.bitField0_) != 0) { + bitField0_ = other.bitField0_; + entryId = other.entryId; + entityMotion.copyFrom(other.entityMotion); + } + return this; + } + + @Override + public SceneEntityTeleportCsReq mergeFrom(final SceneEntityTeleportCsReq other) { + if (other.isEmpty()) { + return this; + } + cachedSize = -1; + if (other.hasEntryId()) { + setEntryId(other.entryId); + } + if (other.hasEntityMotion()) { + getMutableEntityMotion().mergeFrom(other.entityMotion); + } + return this; + } + + @Override + public SceneEntityTeleportCsReq clear() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + entryId = 0; + entityMotion.clear(); + return this; + } + + @Override + public SceneEntityTeleportCsReq clearQuick() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + entityMotion.clearQuick(); + return this; + } + + @Override + public boolean equals(Object o) { + if (o == this) { + return true; + } + if (!(o instanceof SceneEntityTeleportCsReq)) { + return false; + } + SceneEntityTeleportCsReq other = (SceneEntityTeleportCsReq) o; + return bitField0_ == other.bitField0_ + && (!hasEntryId() || entryId == other.entryId) + && (!hasEntityMotion() || entityMotion.equals(other.entityMotion)); + } + + @Override + public void writeTo(final ProtoSink output) throws IOException { + if ((bitField0_ & 0x00000001) != 0) { + output.writeRawByte((byte) 16); + output.writeUInt32NoTag(entryId); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 66); + output.writeMessageNoTag(entityMotion); + } + } + + @Override + protected int computeSerializedSize() { + int size = 0; + if ((bitField0_ & 0x00000001) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(entryId); + } + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeMessageSizeNoTag(entityMotion); + } + return size; + } + + @Override + @SuppressWarnings("fallthrough") + public SceneEntityTeleportCsReq mergeFrom(final ProtoSource input) throws IOException { + // Enabled Fall-Through Optimization (QuickBuffers) + int tag = input.readTag(); + while (true) { + switch (tag) { + case 16: { + // entryId + entryId = input.readUInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 66) { + break; + } + } + case 66: { + // entityMotion + input.readMessage(entityMotion); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 0) { + break; + } + } + case 0: { + return this; + } + default: { + if (!input.skipField(tag)) { + return this; + } + tag = input.readTag(); + break; + } + } + } + } + + @Override + public void writeTo(final JsonSink output) throws IOException { + output.beginObject(); + if ((bitField0_ & 0x00000001) != 0) { + output.writeUInt32(FieldNames.entryId, entryId); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeMessage(FieldNames.entityMotion, entityMotion); + } + output.endObject(); + } + + @Override + public SceneEntityTeleportCsReq mergeFrom(final JsonSource input) throws IOException { + if (!input.beginObject()) { + return this; + } + while (!input.isAtEnd()) { + switch (input.readFieldHash()) { + case -1591558867: + case -2093663224: { + if (input.isAtField(FieldNames.entryId)) { + if (!input.trySkipNullValue()) { + entryId = input.readUInt32(); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } + case 558225785: + case -1141226606: { + if (input.isAtField(FieldNames.entityMotion)) { + if (!input.trySkipNullValue()) { + input.readMessage(entityMotion); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + default: { + input.skipUnknownField(); + break; + } + } + } + input.endObject(); + return this; + } + + @Override + public SceneEntityTeleportCsReq clone() { + return new SceneEntityTeleportCsReq().copyFrom(this); + } + + @Override + public boolean isEmpty() { + return ((bitField0_) == 0); + } + + public static SceneEntityTeleportCsReq parseFrom(final byte[] data) throws + InvalidProtocolBufferException { + return ProtoMessage.mergeFrom(new SceneEntityTeleportCsReq(), data).checkInitialized(); + } + + public static SceneEntityTeleportCsReq parseFrom(final ProtoSource input) throws IOException { + return ProtoMessage.mergeFrom(new SceneEntityTeleportCsReq(), input).checkInitialized(); + } + + public static SceneEntityTeleportCsReq parseFrom(final JsonSource input) throws IOException { + return ProtoMessage.mergeFrom(new SceneEntityTeleportCsReq(), input).checkInitialized(); + } + + /** + * @return factory for creating SceneEntityTeleportCsReq messages + */ + public static MessageFactory getFactory() { + return SceneEntityTeleportCsReqFactory.INSTANCE; + } + + private enum SceneEntityTeleportCsReqFactory implements MessageFactory { + INSTANCE; + + @Override + public SceneEntityTeleportCsReq create() { + return SceneEntityTeleportCsReq.newInstance(); + } + } + + /** + * Contains name constants used for serializing JSON + */ + static class FieldNames { + static final FieldName entryId = FieldName.forField("entryId", "entry_id"); + + static final FieldName entityMotion = FieldName.forField("entityMotion", "entity_motion"); + } + } +} diff --git a/src/generated/main/emu/lunarcore/proto/SceneEntityTeleportScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneEntityTeleportScRspOuterClass.java new file mode 100644 index 000000000..af9f98917 --- /dev/null +++ b/src/generated/main/emu/lunarcore/proto/SceneEntityTeleportScRspOuterClass.java @@ -0,0 +1,443 @@ +// Code generated by protocol buffer compiler. Do not edit! +package emu.lunarcore.proto; + +import java.io.IOException; +import us.hebi.quickbuf.FieldName; +import us.hebi.quickbuf.InvalidProtocolBufferException; +import us.hebi.quickbuf.JsonSink; +import us.hebi.quickbuf.JsonSource; +import us.hebi.quickbuf.MessageFactory; +import us.hebi.quickbuf.ProtoMessage; +import us.hebi.quickbuf.ProtoSink; +import us.hebi.quickbuf.ProtoSource; + +public final class SceneEntityTeleportScRspOuterClass { + /** + * Protobuf type {@code SceneEntityTeleportScRsp} + */ + public static final class SceneEntityTeleportScRsp extends ProtoMessage implements Cloneable { + private static final long serialVersionUID = 0L; + + /** + * optional uint32 client_pos_version = 6; + */ + private int clientPosVersion; + + /** + * optional uint32 retcode = 15; + */ + private int retcode; + + /** + * optional .EntityMotion entity_motion = 13; + */ + private final EntityMotionOuterClass.EntityMotion entityMotion = EntityMotionOuterClass.EntityMotion.newInstance(); + + private SceneEntityTeleportScRsp() { + } + + /** + * @return a new empty instance of {@code SceneEntityTeleportScRsp} + */ + public static SceneEntityTeleportScRsp newInstance() { + return new SceneEntityTeleportScRsp(); + } + + /** + * optional uint32 client_pos_version = 6; + * @return whether the clientPosVersion field is set + */ + public boolean hasClientPosVersion() { + return (bitField0_ & 0x00000001) != 0; + } + + /** + * optional uint32 client_pos_version = 6; + * @return this + */ + public SceneEntityTeleportScRsp clearClientPosVersion() { + bitField0_ &= ~0x00000001; + clientPosVersion = 0; + return this; + } + + /** + * optional uint32 client_pos_version = 6; + * @return the clientPosVersion + */ + public int getClientPosVersion() { + return clientPosVersion; + } + + /** + * optional uint32 client_pos_version = 6; + * @param value the clientPosVersion to set + * @return this + */ + public SceneEntityTeleportScRsp setClientPosVersion(final int value) { + bitField0_ |= 0x00000001; + clientPosVersion = value; + return this; + } + + /** + * optional uint32 retcode = 15; + * @return whether the retcode field is set + */ + public boolean hasRetcode() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 retcode = 15; + * @return this + */ + public SceneEntityTeleportScRsp clearRetcode() { + bitField0_ &= ~0x00000002; + retcode = 0; + return this; + } + + /** + * optional uint32 retcode = 15; + * @return the retcode + */ + public int getRetcode() { + return retcode; + } + + /** + * optional uint32 retcode = 15; + * @param value the retcode to set + * @return this + */ + public SceneEntityTeleportScRsp setRetcode(final int value) { + bitField0_ |= 0x00000002; + retcode = value; + return this; + } + + /** + * optional .EntityMotion entity_motion = 13; + * @return whether the entityMotion field is set + */ + public boolean hasEntityMotion() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional .EntityMotion entity_motion = 13; + * @return this + */ + public SceneEntityTeleportScRsp clearEntityMotion() { + bitField0_ &= ~0x00000004; + entityMotion.clear(); + return this; + } + + /** + * optional .EntityMotion entity_motion = 13; + * + * This method returns the internal storage object without modifying any has state. + * The returned object should not be modified and be treated as read-only. + * + * Use {@link #getMutableEntityMotion()} if you want to modify it. + * + * @return internal storage object for reading + */ + public EntityMotionOuterClass.EntityMotion getEntityMotion() { + return entityMotion; + } + + /** + * optional .EntityMotion entity_motion = 13; + * + * This method returns the internal storage object and sets the corresponding + * has state. The returned object will become part of this message and its + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public EntityMotionOuterClass.EntityMotion getMutableEntityMotion() { + bitField0_ |= 0x00000004; + return entityMotion; + } + + /** + * optional .EntityMotion entity_motion = 13; + * @param value the entityMotion to set + * @return this + */ + public SceneEntityTeleportScRsp setEntityMotion( + final EntityMotionOuterClass.EntityMotion value) { + bitField0_ |= 0x00000004; + entityMotion.copyFrom(value); + return this; + } + + @Override + public SceneEntityTeleportScRsp copyFrom(final SceneEntityTeleportScRsp other) { + cachedSize = other.cachedSize; + if ((bitField0_ | other.bitField0_) != 0) { + bitField0_ = other.bitField0_; + clientPosVersion = other.clientPosVersion; + retcode = other.retcode; + entityMotion.copyFrom(other.entityMotion); + } + return this; + } + + @Override + public SceneEntityTeleportScRsp mergeFrom(final SceneEntityTeleportScRsp other) { + if (other.isEmpty()) { + return this; + } + cachedSize = -1; + if (other.hasClientPosVersion()) { + setClientPosVersion(other.clientPosVersion); + } + if (other.hasRetcode()) { + setRetcode(other.retcode); + } + if (other.hasEntityMotion()) { + getMutableEntityMotion().mergeFrom(other.entityMotion); + } + return this; + } + + @Override + public SceneEntityTeleportScRsp clear() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + clientPosVersion = 0; + retcode = 0; + entityMotion.clear(); + return this; + } + + @Override + public SceneEntityTeleportScRsp clearQuick() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + entityMotion.clearQuick(); + return this; + } + + @Override + public boolean equals(Object o) { + if (o == this) { + return true; + } + if (!(o instanceof SceneEntityTeleportScRsp)) { + return false; + } + SceneEntityTeleportScRsp other = (SceneEntityTeleportScRsp) o; + return bitField0_ == other.bitField0_ + && (!hasClientPosVersion() || clientPosVersion == other.clientPosVersion) + && (!hasRetcode() || retcode == other.retcode) + && (!hasEntityMotion() || entityMotion.equals(other.entityMotion)); + } + + @Override + public void writeTo(final ProtoSink output) throws IOException { + if ((bitField0_ & 0x00000001) != 0) { + output.writeRawByte((byte) 48); + output.writeUInt32NoTag(clientPosVersion); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 120); + output.writeUInt32NoTag(retcode); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 106); + output.writeMessageNoTag(entityMotion); + } + } + + @Override + protected int computeSerializedSize() { + int size = 0; + if ((bitField0_ & 0x00000001) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(clientPosVersion); + } + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + } + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeMessageSizeNoTag(entityMotion); + } + return size; + } + + @Override + @SuppressWarnings("fallthrough") + public SceneEntityTeleportScRsp mergeFrom(final ProtoSource input) throws IOException { + // Enabled Fall-Through Optimization (QuickBuffers) + int tag = input.readTag(); + while (true) { + switch (tag) { + case 48: { + // clientPosVersion + clientPosVersion = input.readUInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 120) { + break; + } + } + case 120: { + // retcode + retcode = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 106) { + break; + } + } + case 106: { + // entityMotion + input.readMessage(entityMotion); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 0) { + break; + } + } + case 0: { + return this; + } + default: { + if (!input.skipField(tag)) { + return this; + } + tag = input.readTag(); + break; + } + } + } + } + + @Override + public void writeTo(final JsonSink output) throws IOException { + output.beginObject(); + if ((bitField0_ & 0x00000001) != 0) { + output.writeUInt32(FieldNames.clientPosVersion, clientPosVersion); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeUInt32(FieldNames.retcode, retcode); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeMessage(FieldNames.entityMotion, entityMotion); + } + output.endObject(); + } + + @Override + public SceneEntityTeleportScRsp mergeFrom(final JsonSource input) throws IOException { + if (!input.beginObject()) { + return this; + } + while (!input.isAtEnd()) { + switch (input.readFieldHash()) { + case 1787644431: + case 1278860153: { + if (input.isAtField(FieldNames.clientPosVersion)) { + if (!input.trySkipNullValue()) { + clientPosVersion = input.readUInt32(); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { + if (!input.trySkipNullValue()) { + retcode = input.readUInt32(); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + case 558225785: + case -1141226606: { + if (input.isAtField(FieldNames.entityMotion)) { + if (!input.trySkipNullValue()) { + input.readMessage(entityMotion); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } + default: { + input.skipUnknownField(); + break; + } + } + } + input.endObject(); + return this; + } + + @Override + public SceneEntityTeleportScRsp clone() { + return new SceneEntityTeleportScRsp().copyFrom(this); + } + + @Override + public boolean isEmpty() { + return ((bitField0_) == 0); + } + + public static SceneEntityTeleportScRsp parseFrom(final byte[] data) throws + InvalidProtocolBufferException { + return ProtoMessage.mergeFrom(new SceneEntityTeleportScRsp(), data).checkInitialized(); + } + + public static SceneEntityTeleportScRsp parseFrom(final ProtoSource input) throws IOException { + return ProtoMessage.mergeFrom(new SceneEntityTeleportScRsp(), input).checkInitialized(); + } + + public static SceneEntityTeleportScRsp parseFrom(final JsonSource input) throws IOException { + return ProtoMessage.mergeFrom(new SceneEntityTeleportScRsp(), input).checkInitialized(); + } + + /** + * @return factory for creating SceneEntityTeleportScRsp messages + */ + public static MessageFactory getFactory() { + return SceneEntityTeleportScRspFactory.INSTANCE; + } + + private enum SceneEntityTeleportScRspFactory implements MessageFactory { + INSTANCE; + + @Override + public SceneEntityTeleportScRsp create() { + return SceneEntityTeleportScRsp.newInstance(); + } + } + + /** + * Contains name constants used for serializing JSON + */ + static class FieldNames { + static final FieldName clientPosVersion = FieldName.forField("clientPosVersion", "client_pos_version"); + + static final FieldName retcode = FieldName.forField("retcode"); + + static final FieldName entityMotion = FieldName.forField("entityMotion", "entity_motion"); + } + } +} diff --git a/src/generated/main/emu/lunarcore/proto/SceneGroupRefreshInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneGroupRefreshInfoOuterClass.java index 0b9eded8f..be92e086d 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneGroupRefreshInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneGroupRefreshInfoOuterClass.java @@ -20,17 +20,17 @@ public static final class SceneGroupRefreshInfo extends ProtoMessageoptional uint32 group_id = 4; + * optional uint32 state = 3; */ - private int groupId; + private int state; /** - * optional uint32 state = 5; + * optional uint32 group_id = 12; */ - private int state; + private int groupId; /** - * repeated .SceneEntityRefreshInfo refresh_entity = 7; + * repeated .SceneEntityRefreshInfo refresh_entity = 14; */ private final RepeatedMessage refreshEntity = RepeatedMessage.newEmptyInstance(SceneEntityRefreshInfoOuterClass.SceneEntityRefreshInfo.getFactory()); @@ -45,81 +45,81 @@ public static SceneGroupRefreshInfo newInstance() { } /** - * optional uint32 group_id = 4; - * @return whether the groupId field is set + * optional uint32 state = 3; + * @return whether the state field is set */ - public boolean hasGroupId() { + public boolean hasState() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 group_id = 4; + * optional uint32 state = 3; * @return this */ - public SceneGroupRefreshInfo clearGroupId() { + public SceneGroupRefreshInfo clearState() { bitField0_ &= ~0x00000001; - groupId = 0; + state = 0; return this; } /** - * optional uint32 group_id = 4; - * @return the groupId + * optional uint32 state = 3; + * @return the state */ - public int getGroupId() { - return groupId; + public int getState() { + return state; } /** - * optional uint32 group_id = 4; - * @param value the groupId to set + * optional uint32 state = 3; + * @param value the state to set * @return this */ - public SceneGroupRefreshInfo setGroupId(final int value) { + public SceneGroupRefreshInfo setState(final int value) { bitField0_ |= 0x00000001; - groupId = value; + state = value; return this; } /** - * optional uint32 state = 5; - * @return whether the state field is set + * optional uint32 group_id = 12; + * @return whether the groupId field is set */ - public boolean hasState() { + public boolean hasGroupId() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 state = 5; + * optional uint32 group_id = 12; * @return this */ - public SceneGroupRefreshInfo clearState() { + public SceneGroupRefreshInfo clearGroupId() { bitField0_ &= ~0x00000002; - state = 0; + groupId = 0; return this; } /** - * optional uint32 state = 5; - * @return the state + * optional uint32 group_id = 12; + * @return the groupId */ - public int getState() { - return state; + public int getGroupId() { + return groupId; } /** - * optional uint32 state = 5; - * @param value the state to set + * optional uint32 group_id = 12; + * @param value the groupId to set * @return this */ - public SceneGroupRefreshInfo setState(final int value) { + public SceneGroupRefreshInfo setGroupId(final int value) { bitField0_ |= 0x00000002; - state = value; + groupId = value; return this; } /** - * repeated .SceneEntityRefreshInfo refresh_entity = 7; + * repeated .SceneEntityRefreshInfo refresh_entity = 14; * @return whether the refreshEntity field is set */ public boolean hasRefreshEntity() { @@ -127,7 +127,7 @@ public boolean hasRefreshEntity() { } /** - * repeated .SceneEntityRefreshInfo refresh_entity = 7; + * repeated .SceneEntityRefreshInfo refresh_entity = 14; * @return this */ public SceneGroupRefreshInfo clearRefreshEntity() { @@ -137,7 +137,7 @@ public SceneGroupRefreshInfo clearRefreshEntity() { } /** - * repeated .SceneEntityRefreshInfo refresh_entity = 7; + * repeated .SceneEntityRefreshInfo refresh_entity = 14; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -152,7 +152,7 @@ public RepeatedMessage } /** - * repeated .SceneEntityRefreshInfo refresh_entity = 7; + * repeated .SceneEntityRefreshInfo refresh_entity = 14; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -167,7 +167,7 @@ public RepeatedMessage } /** - * repeated .SceneEntityRefreshInfo refresh_entity = 7; + * repeated .SceneEntityRefreshInfo refresh_entity = 14; * @param value the refreshEntity to add * @return this */ @@ -179,7 +179,7 @@ public SceneGroupRefreshInfo addRefreshEntity( } /** - * repeated .SceneEntityRefreshInfo refresh_entity = 7; + * repeated .SceneEntityRefreshInfo refresh_entity = 14; * @param values the refreshEntity to add * @return this */ @@ -195,8 +195,8 @@ public SceneGroupRefreshInfo copyFrom(final SceneGroupRefreshInfo other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - groupId = other.groupId; state = other.state; + groupId = other.groupId; refreshEntity.copyFrom(other.refreshEntity); } return this; @@ -208,12 +208,12 @@ public SceneGroupRefreshInfo mergeFrom(final SceneGroupRefreshInfo other) { return this; } cachedSize = -1; - if (other.hasGroupId()) { - setGroupId(other.groupId); - } if (other.hasState()) { setState(other.state); } + if (other.hasGroupId()) { + setGroupId(other.groupId); + } if (other.hasRefreshEntity()) { getMutableRefreshEntity().addAll(other.refreshEntity); } @@ -227,8 +227,8 @@ public SceneGroupRefreshInfo clear() { } cachedSize = -1; bitField0_ = 0; - groupId = 0; state = 0; + groupId = 0; refreshEntity.clear(); return this; } @@ -254,24 +254,24 @@ public boolean equals(Object o) { } SceneGroupRefreshInfo other = (SceneGroupRefreshInfo) o; return bitField0_ == other.bitField0_ - && (!hasGroupId() || groupId == other.groupId) && (!hasState() || state == other.state) + && (!hasGroupId() || groupId == other.groupId) && (!hasRefreshEntity() || refreshEntity.equals(other.refreshEntity)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); - output.writeUInt32NoTag(groupId); + output.writeRawByte((byte) 24); + output.writeUInt32NoTag(state); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 40); - output.writeUInt32NoTag(state); + output.writeRawByte((byte) 96); + output.writeUInt32NoTag(groupId); } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < refreshEntity.length(); i++) { - output.writeRawByte((byte) 58); + output.writeRawByte((byte) 114); output.writeMessageNoTag(refreshEntity.get(i)); } } @@ -281,10 +281,10 @@ public void writeTo(final ProtoSink output) throws IOException { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(groupId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(state); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(state); + size += 1 + ProtoSink.computeUInt32SizeNoTag(groupId); } if ((bitField0_ & 0x00000004) != 0) { size += (1 * refreshEntity.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(refreshEntity); @@ -299,25 +299,25 @@ public SceneGroupRefreshInfo mergeFrom(final ProtoSource input) throws IOExcepti int tag = input.readTag(); while (true) { switch (tag) { - case 32: { - // groupId - groupId = input.readUInt32(); + case 24: { + // state + state = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 40) { + if (tag != 96) { break; } } - case 40: { - // state - state = input.readUInt32(); + case 96: { + // groupId + groupId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 58) { + if (tag != 114) { break; } } - case 58: { + case 114: { // refreshEntity tag = input.readRepeatedMessage(refreshEntity, tag); bitField0_ |= 0x00000004; @@ -343,10 +343,10 @@ public SceneGroupRefreshInfo mergeFrom(final ProtoSource input) throws IOExcepti public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.groupId, groupId); + output.writeUInt32(FieldNames.state, state); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.state, state); + output.writeUInt32(FieldNames.groupId, groupId); } if ((bitField0_ & 0x00000004) != 0) { output.writeRepeatedMessage(FieldNames.refreshEntity, refreshEntity); @@ -361,11 +361,10 @@ public SceneGroupRefreshInfo mergeFrom(final JsonSource input) throws IOExceptio } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 293428218: - case 506361563: { - if (input.isAtField(FieldNames.groupId)) { + case 109757585: { + if (input.isAtField(FieldNames.state)) { if (!input.trySkipNullValue()) { - groupId = input.readUInt32(); + state = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -373,10 +372,11 @@ public SceneGroupRefreshInfo mergeFrom(final JsonSource input) throws IOExceptio } break; } - case 109757585: { - if (input.isAtField(FieldNames.state)) { + case 293428218: + case 506361563: { + if (input.isAtField(FieldNames.groupId)) { if (!input.trySkipNullValue()) { - state = input.readUInt32(); + groupId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -449,10 +449,10 @@ public SceneGroupRefreshInfo create() { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName groupId = FieldName.forField("groupId", "group_id"); - static final FieldName state = FieldName.forField("state"); + static final FieldName groupId = FieldName.forField("groupId", "group_id"); + static final FieldName refreshEntity = FieldName.forField("refreshEntity", "refresh_entity"); } } diff --git a/src/generated/main/emu/lunarcore/proto/SceneGroupRefreshScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneGroupRefreshScNotifyOuterClass.java index c4811ba5d..647c93a01 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneGroupRefreshScNotifyOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneGroupRefreshScNotifyOuterClass.java @@ -20,7 +20,7 @@ public static final class SceneGroupRefreshScNotify extends ProtoMessagerepeated .SceneGroupRefreshInfo group_refresh_info = 13; + * repeated .SceneGroupRefreshInfo group_refresh_info = 5; */ private final RepeatedMessage groupRefreshInfo = RepeatedMessage.newEmptyInstance(SceneGroupRefreshInfoOuterClass.SceneGroupRefreshInfo.getFactory()); @@ -35,7 +35,7 @@ public static SceneGroupRefreshScNotify newInstance() { } /** - * repeated .SceneGroupRefreshInfo group_refresh_info = 13; + * repeated .SceneGroupRefreshInfo group_refresh_info = 5; * @return whether the groupRefreshInfo field is set */ public boolean hasGroupRefreshInfo() { @@ -43,7 +43,7 @@ public boolean hasGroupRefreshInfo() { } /** - * repeated .SceneGroupRefreshInfo group_refresh_info = 13; + * repeated .SceneGroupRefreshInfo group_refresh_info = 5; * @return this */ public SceneGroupRefreshScNotify clearGroupRefreshInfo() { @@ -53,7 +53,7 @@ public SceneGroupRefreshScNotify clearGroupRefreshInfo() { } /** - * repeated .SceneGroupRefreshInfo group_refresh_info = 13; + * repeated .SceneGroupRefreshInfo group_refresh_info = 5; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -68,7 +68,7 @@ public RepeatedMessage ge } /** - * repeated .SceneGroupRefreshInfo group_refresh_info = 13; + * repeated .SceneGroupRefreshInfo group_refresh_info = 5; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -83,7 +83,7 @@ public RepeatedMessage ge } /** - * repeated .SceneGroupRefreshInfo group_refresh_info = 13; + * repeated .SceneGroupRefreshInfo group_refresh_info = 5; * @param value the groupRefreshInfo to add * @return this */ @@ -95,7 +95,7 @@ public SceneGroupRefreshScNotify addGroupRefreshInfo( } /** - * repeated .SceneGroupRefreshInfo group_refresh_info = 13; + * repeated .SceneGroupRefreshInfo group_refresh_info = 5; * @param values the groupRefreshInfo to add * @return this */ @@ -167,7 +167,7 @@ public boolean equals(Object o) { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { for (int i = 0; i < groupRefreshInfo.length(); i++) { - output.writeRawByte((byte) 106); + output.writeRawByte((byte) 42); output.writeMessageNoTag(groupRefreshInfo.get(i)); } } @@ -189,7 +189,7 @@ public SceneGroupRefreshScNotify mergeFrom(final ProtoSource input) throws IOExc int tag = input.readTag(); while (true) { switch (tag) { - case 106: { + case 42: { // groupRefreshInfo tag = input.readRepeatedMessage(groupRefreshInfo, tag); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/SceneGroupStateOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneGroupStateOuterClass.java index 5046f33fb..975c0d38d 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneGroupStateOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneGroupStateOuterClass.java @@ -19,17 +19,17 @@ public static final class SceneGroupState extends ProtoMessage private static final long serialVersionUID = 0L; /** - * optional uint32 group_id = 12; + * optional uint32 state = 11; */ - private int groupId; + private int state; /** - * optional uint32 state = 13; + * optional uint32 group_id = 15; */ - private int state; + private int groupId; /** - * optional bool is_default = 9; + * optional bool is_default = 7; */ private boolean isDefault; @@ -44,81 +44,81 @@ public static SceneGroupState newInstance() { } /** - * optional uint32 group_id = 12; - * @return whether the groupId field is set + * optional uint32 state = 11; + * @return whether the state field is set */ - public boolean hasGroupId() { + public boolean hasState() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 group_id = 12; + * optional uint32 state = 11; * @return this */ - public SceneGroupState clearGroupId() { + public SceneGroupState clearState() { bitField0_ &= ~0x00000001; - groupId = 0; + state = 0; return this; } /** - * optional uint32 group_id = 12; - * @return the groupId + * optional uint32 state = 11; + * @return the state */ - public int getGroupId() { - return groupId; + public int getState() { + return state; } /** - * optional uint32 group_id = 12; - * @param value the groupId to set + * optional uint32 state = 11; + * @param value the state to set * @return this */ - public SceneGroupState setGroupId(final int value) { + public SceneGroupState setState(final int value) { bitField0_ |= 0x00000001; - groupId = value; + state = value; return this; } /** - * optional uint32 state = 13; - * @return whether the state field is set + * optional uint32 group_id = 15; + * @return whether the groupId field is set */ - public boolean hasState() { + public boolean hasGroupId() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 state = 13; + * optional uint32 group_id = 15; * @return this */ - public SceneGroupState clearState() { + public SceneGroupState clearGroupId() { bitField0_ &= ~0x00000002; - state = 0; + groupId = 0; return this; } /** - * optional uint32 state = 13; - * @return the state + * optional uint32 group_id = 15; + * @return the groupId */ - public int getState() { - return state; + public int getGroupId() { + return groupId; } /** - * optional uint32 state = 13; - * @param value the state to set + * optional uint32 group_id = 15; + * @param value the groupId to set * @return this */ - public SceneGroupState setState(final int value) { + public SceneGroupState setGroupId(final int value) { bitField0_ |= 0x00000002; - state = value; + groupId = value; return this; } /** - * optional bool is_default = 9; + * optional bool is_default = 7; * @return whether the isDefault field is set */ public boolean hasIsDefault() { @@ -126,7 +126,7 @@ public boolean hasIsDefault() { } /** - * optional bool is_default = 9; + * optional bool is_default = 7; * @return this */ public SceneGroupState clearIsDefault() { @@ -136,7 +136,7 @@ public SceneGroupState clearIsDefault() { } /** - * optional bool is_default = 9; + * optional bool is_default = 7; * @return the isDefault */ public boolean getIsDefault() { @@ -144,7 +144,7 @@ public boolean getIsDefault() { } /** - * optional bool is_default = 9; + * optional bool is_default = 7; * @param value the isDefault to set * @return this */ @@ -159,8 +159,8 @@ public SceneGroupState copyFrom(final SceneGroupState other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - groupId = other.groupId; state = other.state; + groupId = other.groupId; isDefault = other.isDefault; } return this; @@ -172,12 +172,12 @@ public SceneGroupState mergeFrom(final SceneGroupState other) { return this; } cachedSize = -1; - if (other.hasGroupId()) { - setGroupId(other.groupId); - } if (other.hasState()) { setState(other.state); } + if (other.hasGroupId()) { + setGroupId(other.groupId); + } if (other.hasIsDefault()) { setIsDefault(other.isDefault); } @@ -191,8 +191,8 @@ public SceneGroupState clear() { } cachedSize = -1; bitField0_ = 0; - groupId = 0; state = 0; + groupId = 0; isDefault = false; return this; } @@ -217,23 +217,23 @@ public boolean equals(Object o) { } SceneGroupState other = (SceneGroupState) o; return bitField0_ == other.bitField0_ - && (!hasGroupId() || groupId == other.groupId) && (!hasState() || state == other.state) + && (!hasGroupId() || groupId == other.groupId) && (!hasIsDefault() || isDefault == other.isDefault); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 96); - output.writeUInt32NoTag(groupId); + output.writeRawByte((byte) 88); + output.writeUInt32NoTag(state); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 104); - output.writeUInt32NoTag(state); + output.writeRawByte((byte) 120); + output.writeUInt32NoTag(groupId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 56); output.writeBoolNoTag(isDefault); } } @@ -242,10 +242,10 @@ public void writeTo(final ProtoSink output) throws IOException { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(groupId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(state); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(state); + size += 1 + ProtoSink.computeUInt32SizeNoTag(groupId); } if ((bitField0_ & 0x00000004) != 0) { size += 2; @@ -260,25 +260,25 @@ public SceneGroupState mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 96: { - // groupId - groupId = input.readUInt32(); + case 88: { + // state + state = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 104) { + if (tag != 120) { break; } } - case 104: { - // state - state = input.readUInt32(); + case 120: { + // groupId + groupId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 72) { + if (tag != 56) { break; } } - case 72: { + case 56: { // isDefault isDefault = input.readBool(); bitField0_ |= 0x00000004; @@ -305,10 +305,10 @@ public SceneGroupState mergeFrom(final ProtoSource input) throws IOException { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.groupId, groupId); + output.writeUInt32(FieldNames.state, state); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.state, state); + output.writeUInt32(FieldNames.groupId, groupId); } if ((bitField0_ & 0x00000004) != 0) { output.writeBool(FieldNames.isDefault, isDefault); @@ -323,11 +323,10 @@ public SceneGroupState mergeFrom(final JsonSource input) throws IOException { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 293428218: - case 506361563: { - if (input.isAtField(FieldNames.groupId)) { + case 109757585: { + if (input.isAtField(FieldNames.state)) { if (!input.trySkipNullValue()) { - groupId = input.readUInt32(); + state = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -335,10 +334,11 @@ public SceneGroupState mergeFrom(final JsonSource input) throws IOException { } break; } - case 109757585: { - if (input.isAtField(FieldNames.state)) { + case 293428218: + case 506361563: { + if (input.isAtField(FieldNames.groupId)) { if (!input.trySkipNullValue()) { - state = input.readUInt32(); + groupId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -411,10 +411,10 @@ public SceneGroupState create() { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName groupId = FieldName.forField("groupId", "group_id"); - static final FieldName state = FieldName.forField("state"); + static final FieldName groupId = FieldName.forField("groupId", "group_id"); + static final FieldName isDefault = FieldName.forField("isDefault", "is_default"); } } diff --git a/src/generated/main/emu/lunarcore/proto/SceneInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneInfoOuterClass.java index 0bdd7f056..abbf705a4 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneInfoOuterClass.java @@ -21,62 +21,62 @@ public static final class SceneInfo extends ProtoMessage implements C private static final long serialVersionUID = 0L; /** - * optional uint32 floor_id = 3; + * optional uint32 leader_entity_id = 2; */ - private int floorId; + private int leaderEntityId; /** - * optional uint32 entry_id = 5; + * optional uint32 floor_id = 3; */ - private int entryId; + private int floorId; /** - * optional uint32 plane_id = 8; + * optional uint32 world_id = 5; */ - private int planeId; + private int worldId; /** - * optional uint32 game_mode_type = 9; + * optional uint32 client_pos_version = 7; */ - private int gameModeType; + private int clientPosVersion; /** - * optional uint32 world_id = 11; + * optional uint32 entry_id = 11; */ - private int worldId; + private int entryId; /** - * optional uint32 leader_entity_id = 14; + * optional uint32 plane_id = 13; */ - private int leaderEntityId; + private int planeId; /** - * optional uint32 client_pos_version = 15; + * optional uint32 game_mode_type = 15; */ - private int clientPosVersion; + private int gameModeType; /** - * repeated uint32 group_id_list = 7; + * repeated uint32 group_id_list = 4; */ private final RepeatedInt groupIdList = RepeatedInt.newEmptyInstance(); /** - * repeated uint32 lighten_section_list = 10; + * repeated uint32 lighten_section_list = 9; */ private final RepeatedInt lightenSectionList = RepeatedInt.newEmptyInstance(); /** - * repeated .SceneEntityInfo entity_list = 2; + * repeated .SceneEntityInfo entity_list = 1; */ private final RepeatedMessage entityList = RepeatedMessage.newEmptyInstance(SceneEntityInfoOuterClass.SceneEntityInfo.getFactory()); /** - * repeated .SceneGroupState group_state_list = 1654; + * repeated .SceneGroupState group_state_list = 347; */ private final RepeatedMessage groupStateList = RepeatedMessage.newEmptyInstance(SceneGroupStateOuterClass.SceneGroupState.getFactory()); /** - * repeated .SceneEntityGroupInfo entity_group_list = 1740; + * repeated .SceneEntityGroupInfo entity_group_list = 1538; */ private final RepeatedMessage entityGroupList = RepeatedMessage.newEmptyInstance(SceneEntityGroupInfoOuterClass.SceneEntityGroupInfo.getFactory()); @@ -91,266 +91,266 @@ public static SceneInfo newInstance() { } /** - * optional uint32 floor_id = 3; - * @return whether the floorId field is set + * optional uint32 leader_entity_id = 2; + * @return whether the leaderEntityId field is set */ - public boolean hasFloorId() { + public boolean hasLeaderEntityId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 floor_id = 3; + * optional uint32 leader_entity_id = 2; * @return this */ - public SceneInfo clearFloorId() { + public SceneInfo clearLeaderEntityId() { bitField0_ &= ~0x00000001; - floorId = 0; + leaderEntityId = 0; return this; } /** - * optional uint32 floor_id = 3; - * @return the floorId + * optional uint32 leader_entity_id = 2; + * @return the leaderEntityId */ - public int getFloorId() { - return floorId; + public int getLeaderEntityId() { + return leaderEntityId; } /** - * optional uint32 floor_id = 3; - * @param value the floorId to set + * optional uint32 leader_entity_id = 2; + * @param value the leaderEntityId to set * @return this */ - public SceneInfo setFloorId(final int value) { + public SceneInfo setLeaderEntityId(final int value) { bitField0_ |= 0x00000001; - floorId = value; + leaderEntityId = value; return this; } /** - * optional uint32 entry_id = 5; - * @return whether the entryId field is set + * optional uint32 floor_id = 3; + * @return whether the floorId field is set */ - public boolean hasEntryId() { + public boolean hasFloorId() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 entry_id = 5; + * optional uint32 floor_id = 3; * @return this */ - public SceneInfo clearEntryId() { + public SceneInfo clearFloorId() { bitField0_ &= ~0x00000002; - entryId = 0; + floorId = 0; return this; } /** - * optional uint32 entry_id = 5; - * @return the entryId + * optional uint32 floor_id = 3; + * @return the floorId */ - public int getEntryId() { - return entryId; + public int getFloorId() { + return floorId; } /** - * optional uint32 entry_id = 5; - * @param value the entryId to set + * optional uint32 floor_id = 3; + * @param value the floorId to set * @return this */ - public SceneInfo setEntryId(final int value) { + public SceneInfo setFloorId(final int value) { bitField0_ |= 0x00000002; - entryId = value; + floorId = value; return this; } /** - * optional uint32 plane_id = 8; - * @return whether the planeId field is set + * optional uint32 world_id = 5; + * @return whether the worldId field is set */ - public boolean hasPlaneId() { + public boolean hasWorldId() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 plane_id = 8; + * optional uint32 world_id = 5; * @return this */ - public SceneInfo clearPlaneId() { + public SceneInfo clearWorldId() { bitField0_ &= ~0x00000004; - planeId = 0; + worldId = 0; return this; } /** - * optional uint32 plane_id = 8; - * @return the planeId + * optional uint32 world_id = 5; + * @return the worldId */ - public int getPlaneId() { - return planeId; + public int getWorldId() { + return worldId; } /** - * optional uint32 plane_id = 8; - * @param value the planeId to set + * optional uint32 world_id = 5; + * @param value the worldId to set * @return this */ - public SceneInfo setPlaneId(final int value) { + public SceneInfo setWorldId(final int value) { bitField0_ |= 0x00000004; - planeId = value; + worldId = value; return this; } /** - * optional uint32 game_mode_type = 9; - * @return whether the gameModeType field is set + * optional uint32 client_pos_version = 7; + * @return whether the clientPosVersion field is set */ - public boolean hasGameModeType() { + public boolean hasClientPosVersion() { return (bitField0_ & 0x00000008) != 0; } /** - * optional uint32 game_mode_type = 9; + * optional uint32 client_pos_version = 7; * @return this */ - public SceneInfo clearGameModeType() { + public SceneInfo clearClientPosVersion() { bitField0_ &= ~0x00000008; - gameModeType = 0; + clientPosVersion = 0; return this; } /** - * optional uint32 game_mode_type = 9; - * @return the gameModeType + * optional uint32 client_pos_version = 7; + * @return the clientPosVersion */ - public int getGameModeType() { - return gameModeType; + public int getClientPosVersion() { + return clientPosVersion; } /** - * optional uint32 game_mode_type = 9; - * @param value the gameModeType to set + * optional uint32 client_pos_version = 7; + * @param value the clientPosVersion to set * @return this */ - public SceneInfo setGameModeType(final int value) { + public SceneInfo setClientPosVersion(final int value) { bitField0_ |= 0x00000008; - gameModeType = value; + clientPosVersion = value; return this; } /** - * optional uint32 world_id = 11; - * @return whether the worldId field is set + * optional uint32 entry_id = 11; + * @return whether the entryId field is set */ - public boolean hasWorldId() { + public boolean hasEntryId() { return (bitField0_ & 0x00000010) != 0; } /** - * optional uint32 world_id = 11; + * optional uint32 entry_id = 11; * @return this */ - public SceneInfo clearWorldId() { + public SceneInfo clearEntryId() { bitField0_ &= ~0x00000010; - worldId = 0; + entryId = 0; return this; } /** - * optional uint32 world_id = 11; - * @return the worldId + * optional uint32 entry_id = 11; + * @return the entryId */ - public int getWorldId() { - return worldId; + public int getEntryId() { + return entryId; } /** - * optional uint32 world_id = 11; - * @param value the worldId to set + * optional uint32 entry_id = 11; + * @param value the entryId to set * @return this */ - public SceneInfo setWorldId(final int value) { + public SceneInfo setEntryId(final int value) { bitField0_ |= 0x00000010; - worldId = value; + entryId = value; return this; } /** - * optional uint32 leader_entity_id = 14; - * @return whether the leaderEntityId field is set + * optional uint32 plane_id = 13; + * @return whether the planeId field is set */ - public boolean hasLeaderEntityId() { + public boolean hasPlaneId() { return (bitField0_ & 0x00000020) != 0; } /** - * optional uint32 leader_entity_id = 14; + * optional uint32 plane_id = 13; * @return this */ - public SceneInfo clearLeaderEntityId() { + public SceneInfo clearPlaneId() { bitField0_ &= ~0x00000020; - leaderEntityId = 0; + planeId = 0; return this; } /** - * optional uint32 leader_entity_id = 14; - * @return the leaderEntityId + * optional uint32 plane_id = 13; + * @return the planeId */ - public int getLeaderEntityId() { - return leaderEntityId; + public int getPlaneId() { + return planeId; } /** - * optional uint32 leader_entity_id = 14; - * @param value the leaderEntityId to set + * optional uint32 plane_id = 13; + * @param value the planeId to set * @return this */ - public SceneInfo setLeaderEntityId(final int value) { + public SceneInfo setPlaneId(final int value) { bitField0_ |= 0x00000020; - leaderEntityId = value; + planeId = value; return this; } /** - * optional uint32 client_pos_version = 15; - * @return whether the clientPosVersion field is set + * optional uint32 game_mode_type = 15; + * @return whether the gameModeType field is set */ - public boolean hasClientPosVersion() { + public boolean hasGameModeType() { return (bitField0_ & 0x00000040) != 0; } /** - * optional uint32 client_pos_version = 15; + * optional uint32 game_mode_type = 15; * @return this */ - public SceneInfo clearClientPosVersion() { + public SceneInfo clearGameModeType() { bitField0_ &= ~0x00000040; - clientPosVersion = 0; + gameModeType = 0; return this; } /** - * optional uint32 client_pos_version = 15; - * @return the clientPosVersion + * optional uint32 game_mode_type = 15; + * @return the gameModeType */ - public int getClientPosVersion() { - return clientPosVersion; + public int getGameModeType() { + return gameModeType; } /** - * optional uint32 client_pos_version = 15; - * @param value the clientPosVersion to set + * optional uint32 game_mode_type = 15; + * @param value the gameModeType to set * @return this */ - public SceneInfo setClientPosVersion(final int value) { + public SceneInfo setGameModeType(final int value) { bitField0_ |= 0x00000040; - clientPosVersion = value; + gameModeType = value; return this; } /** - * repeated uint32 group_id_list = 7; + * repeated uint32 group_id_list = 4; * @return whether the groupIdList field is set */ public boolean hasGroupIdList() { @@ -358,7 +358,7 @@ public boolean hasGroupIdList() { } /** - * repeated uint32 group_id_list = 7; + * repeated uint32 group_id_list = 4; * @return this */ public SceneInfo clearGroupIdList() { @@ -368,7 +368,7 @@ public SceneInfo clearGroupIdList() { } /** - * repeated uint32 group_id_list = 7; + * repeated uint32 group_id_list = 4; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -382,7 +382,7 @@ public RepeatedInt getGroupIdList() { } /** - * repeated uint32 group_id_list = 7; + * repeated uint32 group_id_list = 4; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -396,7 +396,7 @@ public RepeatedInt getMutableGroupIdList() { } /** - * repeated uint32 group_id_list = 7; + * repeated uint32 group_id_list = 4; * @param value the groupIdList to add * @return this */ @@ -407,7 +407,7 @@ public SceneInfo addGroupIdList(final int value) { } /** - * repeated uint32 group_id_list = 7; + * repeated uint32 group_id_list = 4; * @param values the groupIdList to add * @return this */ @@ -418,7 +418,7 @@ public SceneInfo addAllGroupIdList(final int... values) { } /** - * repeated uint32 lighten_section_list = 10; + * repeated uint32 lighten_section_list = 9; * @return whether the lightenSectionList field is set */ public boolean hasLightenSectionList() { @@ -426,7 +426,7 @@ public boolean hasLightenSectionList() { } /** - * repeated uint32 lighten_section_list = 10; + * repeated uint32 lighten_section_list = 9; * @return this */ public SceneInfo clearLightenSectionList() { @@ -436,7 +436,7 @@ public SceneInfo clearLightenSectionList() { } /** - * repeated uint32 lighten_section_list = 10; + * repeated uint32 lighten_section_list = 9; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -450,7 +450,7 @@ public RepeatedInt getLightenSectionList() { } /** - * repeated uint32 lighten_section_list = 10; + * repeated uint32 lighten_section_list = 9; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -464,7 +464,7 @@ public RepeatedInt getMutableLightenSectionList() { } /** - * repeated uint32 lighten_section_list = 10; + * repeated uint32 lighten_section_list = 9; * @param value the lightenSectionList to add * @return this */ @@ -475,7 +475,7 @@ public SceneInfo addLightenSectionList(final int value) { } /** - * repeated uint32 lighten_section_list = 10; + * repeated uint32 lighten_section_list = 9; * @param values the lightenSectionList to add * @return this */ @@ -486,7 +486,7 @@ public SceneInfo addAllLightenSectionList(final int... values) { } /** - * repeated .SceneEntityInfo entity_list = 2; + * repeated .SceneEntityInfo entity_list = 1; * @return whether the entityList field is set */ public boolean hasEntityList() { @@ -494,7 +494,7 @@ public boolean hasEntityList() { } /** - * repeated .SceneEntityInfo entity_list = 2; + * repeated .SceneEntityInfo entity_list = 1; * @return this */ public SceneInfo clearEntityList() { @@ -504,7 +504,7 @@ public SceneInfo clearEntityList() { } /** - * repeated .SceneEntityInfo entity_list = 2; + * repeated .SceneEntityInfo entity_list = 1; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -518,7 +518,7 @@ public RepeatedMessage getEntityList( } /** - * repeated .SceneEntityInfo entity_list = 2; + * repeated .SceneEntityInfo entity_list = 1; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -532,7 +532,7 @@ public RepeatedMessage getMutableEnti } /** - * repeated .SceneEntityInfo entity_list = 2; + * repeated .SceneEntityInfo entity_list = 1; * @param value the entityList to add * @return this */ @@ -543,7 +543,7 @@ public SceneInfo addEntityList(final SceneEntityInfoOuterClass.SceneEntityInfo v } /** - * repeated .SceneEntityInfo entity_list = 2; + * repeated .SceneEntityInfo entity_list = 1; * @param values the entityList to add * @return this */ @@ -554,7 +554,7 @@ public SceneInfo addAllEntityList(final SceneEntityInfoOuterClass.SceneEntityInf } /** - * repeated .SceneGroupState group_state_list = 1654; + * repeated .SceneGroupState group_state_list = 347; * @return whether the groupStateList field is set */ public boolean hasGroupStateList() { @@ -562,7 +562,7 @@ public boolean hasGroupStateList() { } /** - * repeated .SceneGroupState group_state_list = 1654; + * repeated .SceneGroupState group_state_list = 347; * @return this */ public SceneInfo clearGroupStateList() { @@ -572,7 +572,7 @@ public SceneInfo clearGroupStateList() { } /** - * repeated .SceneGroupState group_state_list = 1654; + * repeated .SceneGroupState group_state_list = 347; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -586,7 +586,7 @@ public RepeatedMessage getGroupStateL } /** - * repeated .SceneGroupState group_state_list = 1654; + * repeated .SceneGroupState group_state_list = 347; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -600,7 +600,7 @@ public RepeatedMessage getMutableGrou } /** - * repeated .SceneGroupState group_state_list = 1654; + * repeated .SceneGroupState group_state_list = 347; * @param value the groupStateList to add * @return this */ @@ -611,7 +611,7 @@ public SceneInfo addGroupStateList(final SceneGroupStateOuterClass.SceneGroupSta } /** - * repeated .SceneGroupState group_state_list = 1654; + * repeated .SceneGroupState group_state_list = 347; * @param values the groupStateList to add * @return this */ @@ -623,7 +623,7 @@ public SceneInfo addAllGroupStateList( } /** - * repeated .SceneEntityGroupInfo entity_group_list = 1740; + * repeated .SceneEntityGroupInfo entity_group_list = 1538; * @return whether the entityGroupList field is set */ public boolean hasEntityGroupList() { @@ -631,7 +631,7 @@ public boolean hasEntityGroupList() { } /** - * repeated .SceneEntityGroupInfo entity_group_list = 1740; + * repeated .SceneEntityGroupInfo entity_group_list = 1538; * @return this */ public SceneInfo clearEntityGroupList() { @@ -641,7 +641,7 @@ public SceneInfo clearEntityGroupList() { } /** - * repeated .SceneEntityGroupInfo entity_group_list = 1740; + * repeated .SceneEntityGroupInfo entity_group_list = 1538; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -656,7 +656,7 @@ public RepeatedMessage getE } /** - * repeated .SceneEntityGroupInfo entity_group_list = 1740; + * repeated .SceneEntityGroupInfo entity_group_list = 1538; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -671,7 +671,7 @@ public RepeatedMessage getM } /** - * repeated .SceneEntityGroupInfo entity_group_list = 1740; + * repeated .SceneEntityGroupInfo entity_group_list = 1538; * @param value the entityGroupList to add * @return this */ @@ -683,7 +683,7 @@ public SceneInfo addEntityGroupList( } /** - * repeated .SceneEntityGroupInfo entity_group_list = 1740; + * repeated .SceneEntityGroupInfo entity_group_list = 1538; * @param values the entityGroupList to add * @return this */ @@ -699,13 +699,13 @@ public SceneInfo copyFrom(final SceneInfo other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; + leaderEntityId = other.leaderEntityId; floorId = other.floorId; + worldId = other.worldId; + clientPosVersion = other.clientPosVersion; entryId = other.entryId; planeId = other.planeId; gameModeType = other.gameModeType; - worldId = other.worldId; - leaderEntityId = other.leaderEntityId; - clientPosVersion = other.clientPosVersion; groupIdList.copyFrom(other.groupIdList); lightenSectionList.copyFrom(other.lightenSectionList); entityList.copyFrom(other.entityList); @@ -721,9 +721,18 @@ public SceneInfo mergeFrom(final SceneInfo other) { return this; } cachedSize = -1; + if (other.hasLeaderEntityId()) { + setLeaderEntityId(other.leaderEntityId); + } if (other.hasFloorId()) { setFloorId(other.floorId); } + if (other.hasWorldId()) { + setWorldId(other.worldId); + } + if (other.hasClientPosVersion()) { + setClientPosVersion(other.clientPosVersion); + } if (other.hasEntryId()) { setEntryId(other.entryId); } @@ -733,15 +742,6 @@ public SceneInfo mergeFrom(final SceneInfo other) { if (other.hasGameModeType()) { setGameModeType(other.gameModeType); } - if (other.hasWorldId()) { - setWorldId(other.worldId); - } - if (other.hasLeaderEntityId()) { - setLeaderEntityId(other.leaderEntityId); - } - if (other.hasClientPosVersion()) { - setClientPosVersion(other.clientPosVersion); - } if (other.hasGroupIdList()) { getMutableGroupIdList().addAll(other.groupIdList); } @@ -767,13 +767,13 @@ public SceneInfo clear() { } cachedSize = -1; bitField0_ = 0; + leaderEntityId = 0; floorId = 0; + worldId = 0; + clientPosVersion = 0; entryId = 0; planeId = 0; gameModeType = 0; - worldId = 0; - leaderEntityId = 0; - clientPosVersion = 0; groupIdList.clear(); lightenSectionList.clear(); entityList.clear(); @@ -807,13 +807,13 @@ public boolean equals(Object o) { } SceneInfo other = (SceneInfo) o; return bitField0_ == other.bitField0_ + && (!hasLeaderEntityId() || leaderEntityId == other.leaderEntityId) && (!hasFloorId() || floorId == other.floorId) + && (!hasWorldId() || worldId == other.worldId) + && (!hasClientPosVersion() || clientPosVersion == other.clientPosVersion) && (!hasEntryId() || entryId == other.entryId) && (!hasPlaneId() || planeId == other.planeId) && (!hasGameModeType() || gameModeType == other.gameModeType) - && (!hasWorldId() || worldId == other.worldId) - && (!hasLeaderEntityId() || leaderEntityId == other.leaderEntityId) - && (!hasClientPosVersion() || clientPosVersion == other.clientPosVersion) && (!hasGroupIdList() || groupIdList.equals(other.groupIdList)) && (!hasLightenSectionList() || lightenSectionList.equals(other.lightenSectionList)) && (!hasEntityList() || entityList.equals(other.entityList)) @@ -824,60 +824,60 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); - output.writeUInt32NoTag(floorId); + output.writeRawByte((byte) 16); + output.writeUInt32NoTag(leaderEntityId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 40); - output.writeUInt32NoTag(entryId); + output.writeRawByte((byte) 24); + output.writeUInt32NoTag(floorId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 64); - output.writeUInt32NoTag(planeId); + output.writeRawByte((byte) 40); + output.writeUInt32NoTag(worldId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 72); - output.writeUInt32NoTag(gameModeType); + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(clientPosVersion); } if ((bitField0_ & 0x00000010) != 0) { output.writeRawByte((byte) 88); - output.writeUInt32NoTag(worldId); + output.writeUInt32NoTag(entryId); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 112); - output.writeUInt32NoTag(leaderEntityId); + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(planeId); } if ((bitField0_ & 0x00000040) != 0) { output.writeRawByte((byte) 120); - output.writeUInt32NoTag(clientPosVersion); + output.writeUInt32NoTag(gameModeType); } if ((bitField0_ & 0x00000080) != 0) { for (int i = 0; i < groupIdList.length(); i++) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(groupIdList.array()[i]); } } if ((bitField0_ & 0x00000100) != 0) { for (int i = 0; i < lightenSectionList.length(); i++) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(lightenSectionList.array()[i]); } } if ((bitField0_ & 0x00000200) != 0) { for (int i = 0; i < entityList.length(); i++) { - output.writeRawByte((byte) 18); + output.writeRawByte((byte) 10); output.writeMessageNoTag(entityList.get(i)); } } if ((bitField0_ & 0x00000400) != 0) { for (int i = 0; i < groupStateList.length(); i++) { - output.writeRawLittleEndian16((short) 26546); + output.writeRawLittleEndian16((short) 5594); output.writeMessageNoTag(groupStateList.get(i)); } } if ((bitField0_ & 0x00000800) != 0) { for (int i = 0; i < entityGroupList.length(); i++) { - output.writeRawLittleEndian16((short) 27874); + output.writeRawLittleEndian16((short) 24722); output.writeMessageNoTag(entityGroupList.get(i)); } } @@ -887,25 +887,25 @@ public void writeTo(final ProtoSink output) throws IOException { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(floorId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(leaderEntityId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(entryId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(floorId); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(planeId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(worldId); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(gameModeType); + size += 1 + ProtoSink.computeUInt32SizeNoTag(clientPosVersion); } if ((bitField0_ & 0x00000010) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(worldId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(entryId); } if ((bitField0_ & 0x00000020) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(leaderEntityId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(planeId); } if ((bitField0_ & 0x00000040) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(clientPosVersion); + size += 1 + ProtoSink.computeUInt32SizeNoTag(gameModeType); } if ((bitField0_ & 0x00000080) != 0) { size += (1 * groupIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(groupIdList); @@ -932,36 +932,36 @@ public SceneInfo mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { - // floorId - floorId = input.readUInt32(); + case 16: { + // leaderEntityId + leaderEntityId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 40) { + if (tag != 24) { break; } } - case 40: { - // entryId - entryId = input.readUInt32(); + case 24: { + // floorId + floorId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 64) { + if (tag != 40) { break; } } - case 64: { - // planeId - planeId = input.readUInt32(); + case 40: { + // worldId + worldId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 72) { + if (tag != 56) { break; } } - case 72: { - // gameModeType - gameModeType = input.readUInt32(); + case 56: { + // clientPosVersion + clientPosVersion = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); if (tag != 88) { @@ -969,17 +969,17 @@ public SceneInfo mergeFrom(final ProtoSource input) throws IOException { } } case 88: { - // worldId - worldId = input.readUInt32(); + // entryId + entryId = input.readUInt32(); bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 112) { + if (tag != 104) { break; } } - case 112: { - // leaderEntityId - leaderEntityId = input.readUInt32(); + case 104: { + // planeId + planeId = input.readUInt32(); bitField0_ |= 0x00000020; tag = input.readTag(); if (tag != 120) { @@ -987,49 +987,49 @@ public SceneInfo mergeFrom(final ProtoSource input) throws IOException { } } case 120: { - // clientPosVersion - clientPosVersion = input.readUInt32(); + // gameModeType + gameModeType = input.readUInt32(); bitField0_ |= 0x00000040; tag = input.readTag(); - if (tag != 58) { + if (tag != 34) { break; } } - case 58: { + case 34: { // groupIdList [packed=true] input.readPackedUInt32(groupIdList, tag); bitField0_ |= 0x00000080; tag = input.readTag(); - if (tag != 82) { + if (tag != 74) { break; } } - case 82: { + case 74: { // lightenSectionList [packed=true] input.readPackedUInt32(lightenSectionList, tag); bitField0_ |= 0x00000100; tag = input.readTag(); - if (tag != 18) { + if (tag != 10) { break; } } - case 18: { + case 10: { // entityList tag = input.readRepeatedMessage(entityList, tag); bitField0_ |= 0x00000200; - if (tag != 13234) { + if (tag != 2778) { break; } } - case 13234: { + case 2778: { // groupStateList tag = input.readRepeatedMessage(groupStateList, tag); bitField0_ |= 0x00000400; - if (tag != 13922) { + if (tag != 12306) { break; } } - case 13922: { + case 12306: { // entityGroupList tag = input.readRepeatedMessage(entityGroupList, tag); bitField0_ |= 0x00000800; @@ -1047,13 +1047,13 @@ public SceneInfo mergeFrom(final ProtoSource input) throws IOException { tag = input.readTag(); break; } - case 56: { + case 32: { // groupIdList [packed=false] tag = input.readRepeatedUInt32(groupIdList, tag); bitField0_ |= 0x00000080; break; } - case 80: { + case 72: { // lightenSectionList [packed=false] tag = input.readRepeatedUInt32(lightenSectionList, tag); bitField0_ |= 0x00000100; @@ -1067,25 +1067,25 @@ public SceneInfo mergeFrom(final ProtoSource input) throws IOException { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.floorId, floorId); + output.writeUInt32(FieldNames.leaderEntityId, leaderEntityId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.entryId, entryId); + output.writeUInt32(FieldNames.floorId, floorId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.planeId, planeId); + output.writeUInt32(FieldNames.worldId, worldId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.gameModeType, gameModeType); + output.writeUInt32(FieldNames.clientPosVersion, clientPosVersion); } if ((bitField0_ & 0x00000010) != 0) { - output.writeUInt32(FieldNames.worldId, worldId); + output.writeUInt32(FieldNames.entryId, entryId); } if ((bitField0_ & 0x00000020) != 0) { - output.writeUInt32(FieldNames.leaderEntityId, leaderEntityId); + output.writeUInt32(FieldNames.planeId, planeId); } if ((bitField0_ & 0x00000040) != 0) { - output.writeUInt32(FieldNames.clientPosVersion, clientPosVersion); + output.writeUInt32(FieldNames.gameModeType, gameModeType); } if ((bitField0_ & 0x00000080) != 0) { output.writeRepeatedUInt32(FieldNames.groupIdList, groupIdList); @@ -1112,11 +1112,11 @@ public SceneInfo mergeFrom(final JsonSource input) throws IOException { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -766027193: - case 2022982190: { - if (input.isAtField(FieldNames.floorId)) { + case 1693061255: + case 794634049: { + if (input.isAtField(FieldNames.leaderEntityId)) { if (!input.trySkipNullValue()) { - floorId = input.readUInt32(); + leaderEntityId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -1124,11 +1124,11 @@ public SceneInfo mergeFrom(final JsonSource input) throws IOException { } break; } - case -1591558867: - case -2093663224: { - if (input.isAtField(FieldNames.entryId)) { + case -766027193: + case 2022982190: { + if (input.isAtField(FieldNames.floorId)) { if (!input.trySkipNullValue()) { - entryId = input.readUInt32(); + floorId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -1136,11 +1136,11 @@ public SceneInfo mergeFrom(final JsonSource input) throws IOException { } break; } - case -493896553: - case 1869097438: { - if (input.isAtField(FieldNames.planeId)) { + case 1525188685: + case 36230376: { + if (input.isAtField(FieldNames.worldId)) { if (!input.trySkipNullValue()) { - planeId = input.readUInt32(); + worldId = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -1148,11 +1148,11 @@ public SceneInfo mergeFrom(final JsonSource input) throws IOException { } break; } - case -464498289: - case 1937775689: { - if (input.isAtField(FieldNames.gameModeType)) { + case 1787644431: + case 1278860153: { + if (input.isAtField(FieldNames.clientPosVersion)) { if (!input.trySkipNullValue()) { - gameModeType = input.readUInt32(); + clientPosVersion = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -1160,11 +1160,11 @@ public SceneInfo mergeFrom(final JsonSource input) throws IOException { } break; } - case 1525188685: - case 36230376: { - if (input.isAtField(FieldNames.worldId)) { + case -1591558867: + case -2093663224: { + if (input.isAtField(FieldNames.entryId)) { if (!input.trySkipNullValue()) { - worldId = input.readUInt32(); + entryId = input.readUInt32(); bitField0_ |= 0x00000010; } } else { @@ -1172,11 +1172,11 @@ public SceneInfo mergeFrom(final JsonSource input) throws IOException { } break; } - case 1693061255: - case 794634049: { - if (input.isAtField(FieldNames.leaderEntityId)) { + case -493896553: + case 1869097438: { + if (input.isAtField(FieldNames.planeId)) { if (!input.trySkipNullValue()) { - leaderEntityId = input.readUInt32(); + planeId = input.readUInt32(); bitField0_ |= 0x00000020; } } else { @@ -1184,11 +1184,11 @@ public SceneInfo mergeFrom(final JsonSource input) throws IOException { } break; } - case 1787644431: - case 1278860153: { - if (input.isAtField(FieldNames.clientPosVersion)) { + case -464498289: + case 1937775689: { + if (input.isAtField(FieldNames.gameModeType)) { if (!input.trySkipNullValue()) { - clientPosVersion = input.readUInt32(); + gameModeType = input.readUInt32(); bitField0_ |= 0x00000040; } } else { @@ -1308,20 +1308,20 @@ public SceneInfo create() { * Contains name constants used for serializing JSON */ static class FieldNames { + static final FieldName leaderEntityId = FieldName.forField("leaderEntityId", "leader_entity_id"); + static final FieldName floorId = FieldName.forField("floorId", "floor_id"); + static final FieldName worldId = FieldName.forField("worldId", "world_id"); + + static final FieldName clientPosVersion = FieldName.forField("clientPosVersion", "client_pos_version"); + static final FieldName entryId = FieldName.forField("entryId", "entry_id"); static final FieldName planeId = FieldName.forField("planeId", "plane_id"); static final FieldName gameModeType = FieldName.forField("gameModeType", "game_mode_type"); - static final FieldName worldId = FieldName.forField("worldId", "world_id"); - - static final FieldName leaderEntityId = FieldName.forField("leaderEntityId", "leader_entity_id"); - - static final FieldName clientPosVersion = FieldName.forField("clientPosVersion", "client_pos_version"); - static final FieldName groupIdList = FieldName.forField("groupIdList", "group_id_list"); static final FieldName lightenSectionList = FieldName.forField("lightenSectionList", "lighten_section_list"); diff --git a/src/generated/main/emu/lunarcore/proto/SceneMonsterOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneMonsterOuterClass.java index 83d12cfda..fd8b34892 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneMonsterOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneMonsterOuterClass.java @@ -19,19 +19,19 @@ public static final class SceneMonster extends ProtoMessage implem private static final long serialVersionUID = 0L; /** - * optional uint32 monster_id = 4; + * optional uint32 cur_hp = 2; */ - private int monsterId; + private int curHp; /** - * optional uint32 max_hp = 6; + * optional uint32 max_hp = 14; */ private int maxHp; /** - * optional uint32 cur_hp = 14; + * optional uint32 monster_id = 15; */ - private int curHp; + private int monsterId; private SceneMonster() { } @@ -44,44 +44,44 @@ public static SceneMonster newInstance() { } /** - * optional uint32 monster_id = 4; - * @return whether the monsterId field is set + * optional uint32 cur_hp = 2; + * @return whether the curHp field is set */ - public boolean hasMonsterId() { + public boolean hasCurHp() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 monster_id = 4; + * optional uint32 cur_hp = 2; * @return this */ - public SceneMonster clearMonsterId() { + public SceneMonster clearCurHp() { bitField0_ &= ~0x00000001; - monsterId = 0; + curHp = 0; return this; } /** - * optional uint32 monster_id = 4; - * @return the monsterId + * optional uint32 cur_hp = 2; + * @return the curHp */ - public int getMonsterId() { - return monsterId; + public int getCurHp() { + return curHp; } /** - * optional uint32 monster_id = 4; - * @param value the monsterId to set + * optional uint32 cur_hp = 2; + * @param value the curHp to set * @return this */ - public SceneMonster setMonsterId(final int value) { + public SceneMonster setCurHp(final int value) { bitField0_ |= 0x00000001; - monsterId = value; + curHp = value; return this; } /** - * optional uint32 max_hp = 6; + * optional uint32 max_hp = 14; * @return whether the maxHp field is set */ public boolean hasMaxHp() { @@ -89,7 +89,7 @@ public boolean hasMaxHp() { } /** - * optional uint32 max_hp = 6; + * optional uint32 max_hp = 14; * @return this */ public SceneMonster clearMaxHp() { @@ -99,7 +99,7 @@ public SceneMonster clearMaxHp() { } /** - * optional uint32 max_hp = 6; + * optional uint32 max_hp = 14; * @return the maxHp */ public int getMaxHp() { @@ -107,7 +107,7 @@ public int getMaxHp() { } /** - * optional uint32 max_hp = 6; + * optional uint32 max_hp = 14; * @param value the maxHp to set * @return this */ @@ -118,39 +118,39 @@ public SceneMonster setMaxHp(final int value) { } /** - * optional uint32 cur_hp = 14; - * @return whether the curHp field is set + * optional uint32 monster_id = 15; + * @return whether the monsterId field is set */ - public boolean hasCurHp() { + public boolean hasMonsterId() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 cur_hp = 14; + * optional uint32 monster_id = 15; * @return this */ - public SceneMonster clearCurHp() { + public SceneMonster clearMonsterId() { bitField0_ &= ~0x00000004; - curHp = 0; + monsterId = 0; return this; } /** - * optional uint32 cur_hp = 14; - * @return the curHp + * optional uint32 monster_id = 15; + * @return the monsterId */ - public int getCurHp() { - return curHp; + public int getMonsterId() { + return monsterId; } /** - * optional uint32 cur_hp = 14; - * @param value the curHp to set + * optional uint32 monster_id = 15; + * @param value the monsterId to set * @return this */ - public SceneMonster setCurHp(final int value) { + public SceneMonster setMonsterId(final int value) { bitField0_ |= 0x00000004; - curHp = value; + monsterId = value; return this; } @@ -159,9 +159,9 @@ public SceneMonster copyFrom(final SceneMonster other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - monsterId = other.monsterId; - maxHp = other.maxHp; curHp = other.curHp; + maxHp = other.maxHp; + monsterId = other.monsterId; } return this; } @@ -172,14 +172,14 @@ public SceneMonster mergeFrom(final SceneMonster other) { return this; } cachedSize = -1; - if (other.hasMonsterId()) { - setMonsterId(other.monsterId); + if (other.hasCurHp()) { + setCurHp(other.curHp); } if (other.hasMaxHp()) { setMaxHp(other.maxHp); } - if (other.hasCurHp()) { - setCurHp(other.curHp); + if (other.hasMonsterId()) { + setMonsterId(other.monsterId); } return this; } @@ -191,9 +191,9 @@ public SceneMonster clear() { } cachedSize = -1; bitField0_ = 0; - monsterId = 0; - maxHp = 0; curHp = 0; + maxHp = 0; + monsterId = 0; return this; } @@ -217,24 +217,24 @@ public boolean equals(Object o) { } SceneMonster other = (SceneMonster) o; return bitField0_ == other.bitField0_ - && (!hasMonsterId() || monsterId == other.monsterId) + && (!hasCurHp() || curHp == other.curHp) && (!hasMaxHp() || maxHp == other.maxHp) - && (!hasCurHp() || curHp == other.curHp); + && (!hasMonsterId() || monsterId == other.monsterId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); - output.writeUInt32NoTag(monsterId); + output.writeRawByte((byte) 16); + output.writeUInt32NoTag(curHp); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(maxHp); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 112); - output.writeUInt32NoTag(curHp); + output.writeRawByte((byte) 120); + output.writeUInt32NoTag(monsterId); } } @@ -242,13 +242,13 @@ public void writeTo(final ProtoSink output) throws IOException { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(monsterId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(curHp); } if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(maxHp); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(curHp); + size += 1 + ProtoSink.computeUInt32SizeNoTag(monsterId); } return size; } @@ -260,27 +260,27 @@ public SceneMonster mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { - // monsterId - monsterId = input.readUInt32(); + case 16: { + // curHp + curHp = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 48) { + if (tag != 112) { break; } } - case 48: { + case 112: { // maxHp maxHp = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 112) { + if (tag != 120) { break; } } - case 112: { - // curHp - curHp = input.readUInt32(); + case 120: { + // monsterId + monsterId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 0) { @@ -305,13 +305,13 @@ public SceneMonster mergeFrom(final ProtoSource input) throws IOException { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.monsterId, monsterId); + output.writeUInt32(FieldNames.curHp, curHp); } if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.maxHp, maxHp); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.curHp, curHp); + output.writeUInt32(FieldNames.monsterId, monsterId); } output.endObject(); } @@ -323,11 +323,11 @@ public SceneMonster mergeFrom(final JsonSource input) throws IOException { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1316830571: - case 2127946656: { - if (input.isAtField(FieldNames.monsterId)) { + case 95026024: + case -1349138585: { + if (input.isAtField(FieldNames.curHp)) { if (!input.trySkipNullValue()) { - monsterId = input.readUInt32(); + curHp = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -347,11 +347,11 @@ public SceneMonster mergeFrom(final JsonSource input) throws IOException { } break; } - case 95026024: - case -1349138585: { - if (input.isAtField(FieldNames.curHp)) { + case -1316830571: + case 2127946656: { + if (input.isAtField(FieldNames.monsterId)) { if (!input.trySkipNullValue()) { - curHp = input.readUInt32(); + monsterId = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -411,11 +411,11 @@ public SceneMonster create() { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName monsterId = FieldName.forField("monsterId", "monster_id"); + static final FieldName curHp = FieldName.forField("curHp", "cur_hp"); static final FieldName maxHp = FieldName.forField("maxHp", "max_hp"); - static final FieldName curHp = FieldName.forField("curHp", "cur_hp"); + static final FieldName monsterId = FieldName.forField("monsterId", "monster_id"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/SceneMonsterWaveOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneMonsterWaveOuterClass.java index 825e4e04a..4cafe487d 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneMonsterWaveOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneMonsterWaveOuterClass.java @@ -20,27 +20,27 @@ public static final class SceneMonsterWave extends ProtoMessageoptional uint32 stage_id = 8; + * optional uint32 wave_id = 4; */ - private int stageId; + private int waveId; /** - * optional uint32 wave_id = 15; + * optional uint32 stage_id = 15; */ - private int waveId; + private int stageId; /** - * optional .SceneMonsterWaveParam wave_param = 13; + * optional .SceneMonsterWaveParam wave_param = 11; */ private final SceneMonsterWaveParamOuterClass.SceneMonsterWaveParam waveParam = SceneMonsterWaveParamOuterClass.SceneMonsterWaveParam.newInstance(); /** - * repeated .SceneMonster monster_list = 5; + * repeated .SceneMonster monster_list = 6; */ private final RepeatedMessage monsterList = RepeatedMessage.newEmptyInstance(SceneMonsterOuterClass.SceneMonster.getFactory()); /** - * repeated .ItemList drop_list = 11; + * repeated .ItemList drop_list = 12; */ private final RepeatedMessage dropList = RepeatedMessage.newEmptyInstance(ItemListOuterClass.ItemList.getFactory()); @@ -55,81 +55,81 @@ public static SceneMonsterWave newInstance() { } /** - * optional uint32 stage_id = 8; - * @return whether the stageId field is set + * optional uint32 wave_id = 4; + * @return whether the waveId field is set */ - public boolean hasStageId() { + public boolean hasWaveId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 stage_id = 8; + * optional uint32 wave_id = 4; * @return this */ - public SceneMonsterWave clearStageId() { + public SceneMonsterWave clearWaveId() { bitField0_ &= ~0x00000001; - stageId = 0; + waveId = 0; return this; } /** - * optional uint32 stage_id = 8; - * @return the stageId + * optional uint32 wave_id = 4; + * @return the waveId */ - public int getStageId() { - return stageId; + public int getWaveId() { + return waveId; } /** - * optional uint32 stage_id = 8; - * @param value the stageId to set + * optional uint32 wave_id = 4; + * @param value the waveId to set * @return this */ - public SceneMonsterWave setStageId(final int value) { + public SceneMonsterWave setWaveId(final int value) { bitField0_ |= 0x00000001; - stageId = value; + waveId = value; return this; } /** - * optional uint32 wave_id = 15; - * @return whether the waveId field is set + * optional uint32 stage_id = 15; + * @return whether the stageId field is set */ - public boolean hasWaveId() { + public boolean hasStageId() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 wave_id = 15; + * optional uint32 stage_id = 15; * @return this */ - public SceneMonsterWave clearWaveId() { + public SceneMonsterWave clearStageId() { bitField0_ &= ~0x00000002; - waveId = 0; + stageId = 0; return this; } /** - * optional uint32 wave_id = 15; - * @return the waveId + * optional uint32 stage_id = 15; + * @return the stageId */ - public int getWaveId() { - return waveId; + public int getStageId() { + return stageId; } /** - * optional uint32 wave_id = 15; - * @param value the waveId to set + * optional uint32 stage_id = 15; + * @param value the stageId to set * @return this */ - public SceneMonsterWave setWaveId(final int value) { + public SceneMonsterWave setStageId(final int value) { bitField0_ |= 0x00000002; - waveId = value; + stageId = value; return this; } /** - * optional .SceneMonsterWaveParam wave_param = 13; + * optional .SceneMonsterWaveParam wave_param = 11; * @return whether the waveParam field is set */ public boolean hasWaveParam() { @@ -137,7 +137,7 @@ public boolean hasWaveParam() { } /** - * optional .SceneMonsterWaveParam wave_param = 13; + * optional .SceneMonsterWaveParam wave_param = 11; * @return this */ public SceneMonsterWave clearWaveParam() { @@ -147,7 +147,7 @@ public SceneMonsterWave clearWaveParam() { } /** - * optional .SceneMonsterWaveParam wave_param = 13; + * optional .SceneMonsterWaveParam wave_param = 11; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -161,7 +161,7 @@ public SceneMonsterWaveParamOuterClass.SceneMonsterWaveParam getWaveParam() { } /** - * optional .SceneMonsterWaveParam wave_param = 13; + * optional .SceneMonsterWaveParam wave_param = 11; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -175,7 +175,7 @@ public SceneMonsterWaveParamOuterClass.SceneMonsterWaveParam getMutableWaveParam } /** - * optional .SceneMonsterWaveParam wave_param = 13; + * optional .SceneMonsterWaveParam wave_param = 11; * @param value the waveParam to set * @return this */ @@ -187,7 +187,7 @@ public SceneMonsterWave setWaveParam( } /** - * repeated .SceneMonster monster_list = 5; + * repeated .SceneMonster monster_list = 6; * @return whether the monsterList field is set */ public boolean hasMonsterList() { @@ -195,7 +195,7 @@ public boolean hasMonsterList() { } /** - * repeated .SceneMonster monster_list = 5; + * repeated .SceneMonster monster_list = 6; * @return this */ public SceneMonsterWave clearMonsterList() { @@ -205,7 +205,7 @@ public SceneMonsterWave clearMonsterList() { } /** - * repeated .SceneMonster monster_list = 5; + * repeated .SceneMonster monster_list = 6; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -219,7 +219,7 @@ public RepeatedMessage getMonsterList() { } /** - * repeated .SceneMonster monster_list = 5; + * repeated .SceneMonster monster_list = 6; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -233,7 +233,7 @@ public RepeatedMessage getMutableMonsterLis } /** - * repeated .SceneMonster monster_list = 5; + * repeated .SceneMonster monster_list = 6; * @param value the monsterList to add * @return this */ @@ -244,7 +244,7 @@ public SceneMonsterWave addMonsterList(final SceneMonsterOuterClass.SceneMonster } /** - * repeated .SceneMonster monster_list = 5; + * repeated .SceneMonster monster_list = 6; * @param values the monsterList to add * @return this */ @@ -255,7 +255,7 @@ public SceneMonsterWave addAllMonsterList(final SceneMonsterOuterClass.SceneMons } /** - * repeated .ItemList drop_list = 11; + * repeated .ItemList drop_list = 12; * @return whether the dropList field is set */ public boolean hasDropList() { @@ -263,7 +263,7 @@ public boolean hasDropList() { } /** - * repeated .ItemList drop_list = 11; + * repeated .ItemList drop_list = 12; * @return this */ public SceneMonsterWave clearDropList() { @@ -273,7 +273,7 @@ public SceneMonsterWave clearDropList() { } /** - * repeated .ItemList drop_list = 11; + * repeated .ItemList drop_list = 12; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -287,7 +287,7 @@ public RepeatedMessage getDropList() { } /** - * repeated .ItemList drop_list = 11; + * repeated .ItemList drop_list = 12; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -301,7 +301,7 @@ public RepeatedMessage getMutableDropList() { } /** - * repeated .ItemList drop_list = 11; + * repeated .ItemList drop_list = 12; * @param value the dropList to add * @return this */ @@ -312,7 +312,7 @@ public SceneMonsterWave addDropList(final ItemListOuterClass.ItemList value) { } /** - * repeated .ItemList drop_list = 11; + * repeated .ItemList drop_list = 12; * @param values the dropList to add * @return this */ @@ -327,8 +327,8 @@ public SceneMonsterWave copyFrom(final SceneMonsterWave other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - stageId = other.stageId; waveId = other.waveId; + stageId = other.stageId; waveParam.copyFrom(other.waveParam); monsterList.copyFrom(other.monsterList); dropList.copyFrom(other.dropList); @@ -342,12 +342,12 @@ public SceneMonsterWave mergeFrom(final SceneMonsterWave other) { return this; } cachedSize = -1; - if (other.hasStageId()) { - setStageId(other.stageId); - } if (other.hasWaveId()) { setWaveId(other.waveId); } + if (other.hasStageId()) { + setStageId(other.stageId); + } if (other.hasWaveParam()) { getMutableWaveParam().mergeFrom(other.waveParam); } @@ -367,8 +367,8 @@ public SceneMonsterWave clear() { } cachedSize = -1; bitField0_ = 0; - stageId = 0; waveId = 0; + stageId = 0; waveParam.clear(); monsterList.clear(); dropList.clear(); @@ -398,8 +398,8 @@ public boolean equals(Object o) { } SceneMonsterWave other = (SceneMonsterWave) o; return bitField0_ == other.bitField0_ - && (!hasStageId() || stageId == other.stageId) && (!hasWaveId() || waveId == other.waveId) + && (!hasStageId() || stageId == other.stageId) && (!hasWaveParam() || waveParam.equals(other.waveParam)) && (!hasMonsterList() || monsterList.equals(other.monsterList)) && (!hasDropList() || dropList.equals(other.dropList)); @@ -408,26 +408,26 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 64); - output.writeUInt32NoTag(stageId); + output.writeRawByte((byte) 32); + output.writeUInt32NoTag(waveId); } if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 120); - output.writeUInt32NoTag(waveId); + output.writeUInt32NoTag(stageId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 106); + output.writeRawByte((byte) 90); output.writeMessageNoTag(waveParam); } if ((bitField0_ & 0x00000008) != 0) { for (int i = 0; i < monsterList.length(); i++) { - output.writeRawByte((byte) 42); + output.writeRawByte((byte) 50); output.writeMessageNoTag(monsterList.get(i)); } } if ((bitField0_ & 0x00000010) != 0) { for (int i = 0; i < dropList.length(); i++) { - output.writeRawByte((byte) 90); + output.writeRawByte((byte) 98); output.writeMessageNoTag(dropList.get(i)); } } @@ -437,10 +437,10 @@ public void writeTo(final ProtoSink output) throws IOException { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(stageId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(waveId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(waveId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(stageId); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(waveParam); @@ -461,9 +461,9 @@ public SceneMonsterWave mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { - // stageId - stageId = input.readUInt32(); + case 32: { + // waveId + waveId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 120) { @@ -471,32 +471,32 @@ public SceneMonsterWave mergeFrom(final ProtoSource input) throws IOException { } } case 120: { - // waveId - waveId = input.readUInt32(); + // stageId + stageId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 106) { + if (tag != 90) { break; } } - case 106: { + case 90: { // waveParam input.readMessage(waveParam); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 42) { + if (tag != 50) { break; } } - case 42: { + case 50: { // monsterList tag = input.readRepeatedMessage(monsterList, tag); bitField0_ |= 0x00000008; - if (tag != 90) { + if (tag != 98) { break; } } - case 90: { + case 98: { // dropList tag = input.readRepeatedMessage(dropList, tag); bitField0_ |= 0x00000010; @@ -522,10 +522,10 @@ public SceneMonsterWave mergeFrom(final ProtoSource input) throws IOException { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.stageId, stageId); + output.writeUInt32(FieldNames.waveId, waveId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.waveId, waveId); + output.writeUInt32(FieldNames.stageId, stageId); } if ((bitField0_ & 0x00000004) != 0) { output.writeMessage(FieldNames.waveParam, waveParam); @@ -546,11 +546,11 @@ public SceneMonsterWave mergeFrom(final JsonSource input) throws IOException { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1897528135: - case 1306191356: { - if (input.isAtField(FieldNames.stageId)) { + case -794902028: + case 1127862305: { + if (input.isAtField(FieldNames.waveId)) { if (!input.trySkipNullValue()) { - stageId = input.readUInt32(); + waveId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -558,11 +558,11 @@ public SceneMonsterWave mergeFrom(final JsonSource input) throws IOException { } break; } - case -794902028: - case 1127862305: { - if (input.isAtField(FieldNames.waveId)) { + case -1897528135: + case 1306191356: { + if (input.isAtField(FieldNames.stageId)) { if (!input.trySkipNullValue()) { - waveId = input.readUInt32(); + stageId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -659,10 +659,10 @@ public SceneMonsterWave create() { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName stageId = FieldName.forField("stageId", "stage_id"); - static final FieldName waveId = FieldName.forField("waveId", "wave_id"); + static final FieldName stageId = FieldName.forField("stageId", "stage_id"); + static final FieldName waveParam = FieldName.forField("waveParam", "wave_param"); static final FieldName monsterList = FieldName.forField("monsterList", "monster_list"); diff --git a/src/generated/main/emu/lunarcore/proto/SceneMonsterWaveParamOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneMonsterWaveParamOuterClass.java index d6a1697d8..d361377f1 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneMonsterWaveParamOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneMonsterWaveParamOuterClass.java @@ -18,26 +18,11 @@ public final class SceneMonsterWaveParamOuterClass { public static final class SceneMonsterWaveParam extends ProtoMessage implements Cloneable { private static final long serialVersionUID = 0L; - /** - * optional uint32 DNDLGLKFBHB = 5; - */ - private int dNDLGLKFBHB; - /** * optional uint32 level = 8; */ private int level; - /** - * optional uint32 AGFKKDONMOI = 14; - */ - private int aGFKKDONMOI; - - /** - * optional uint32 APKKFCLEGCI = 15; - */ - private int aPKKFCLEGCI; - private SceneMonsterWaveParam() { } @@ -48,49 +33,12 @@ public static SceneMonsterWaveParam newInstance() { return new SceneMonsterWaveParam(); } - /** - * optional uint32 DNDLGLKFBHB = 5; - * @return whether the dNDLGLKFBHB field is set - */ - public boolean hasDNDLGLKFBHB() { - return (bitField0_ & 0x00000001) != 0; - } - - /** - * optional uint32 DNDLGLKFBHB = 5; - * @return this - */ - public SceneMonsterWaveParam clearDNDLGLKFBHB() { - bitField0_ &= ~0x00000001; - dNDLGLKFBHB = 0; - return this; - } - - /** - * optional uint32 DNDLGLKFBHB = 5; - * @return the dNDLGLKFBHB - */ - public int getDNDLGLKFBHB() { - return dNDLGLKFBHB; - } - - /** - * optional uint32 DNDLGLKFBHB = 5; - * @param value the dNDLGLKFBHB to set - * @return this - */ - public SceneMonsterWaveParam setDNDLGLKFBHB(final int value) { - bitField0_ |= 0x00000001; - dNDLGLKFBHB = value; - return this; - } - /** * optional uint32 level = 8; * @return whether the level field is set */ public boolean hasLevel() { - return (bitField0_ & 0x00000002) != 0; + return (bitField0_ & 0x00000001) != 0; } /** @@ -98,7 +46,7 @@ public boolean hasLevel() { * @return this */ public SceneMonsterWaveParam clearLevel() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; level = 0; return this; } @@ -117,94 +65,17 @@ public int getLevel() { * @return this */ public SceneMonsterWaveParam setLevel(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; level = value; return this; } - /** - * optional uint32 AGFKKDONMOI = 14; - * @return whether the aGFKKDONMOI field is set - */ - public boolean hasAGFKKDONMOI() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 AGFKKDONMOI = 14; - * @return this - */ - public SceneMonsterWaveParam clearAGFKKDONMOI() { - bitField0_ &= ~0x00000004; - aGFKKDONMOI = 0; - return this; - } - - /** - * optional uint32 AGFKKDONMOI = 14; - * @return the aGFKKDONMOI - */ - public int getAGFKKDONMOI() { - return aGFKKDONMOI; - } - - /** - * optional uint32 AGFKKDONMOI = 14; - * @param value the aGFKKDONMOI to set - * @return this - */ - public SceneMonsterWaveParam setAGFKKDONMOI(final int value) { - bitField0_ |= 0x00000004; - aGFKKDONMOI = value; - return this; - } - - /** - * optional uint32 APKKFCLEGCI = 15; - * @return whether the aPKKFCLEGCI field is set - */ - public boolean hasAPKKFCLEGCI() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 APKKFCLEGCI = 15; - * @return this - */ - public SceneMonsterWaveParam clearAPKKFCLEGCI() { - bitField0_ &= ~0x00000008; - aPKKFCLEGCI = 0; - return this; - } - - /** - * optional uint32 APKKFCLEGCI = 15; - * @return the aPKKFCLEGCI - */ - public int getAPKKFCLEGCI() { - return aPKKFCLEGCI; - } - - /** - * optional uint32 APKKFCLEGCI = 15; - * @param value the aPKKFCLEGCI to set - * @return this - */ - public SceneMonsterWaveParam setAPKKFCLEGCI(final int value) { - bitField0_ |= 0x00000008; - aPKKFCLEGCI = value; - return this; - } - @Override public SceneMonsterWaveParam copyFrom(final SceneMonsterWaveParam other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - dNDLGLKFBHB = other.dNDLGLKFBHB; level = other.level; - aGFKKDONMOI = other.aGFKKDONMOI; - aPKKFCLEGCI = other.aPKKFCLEGCI; } return this; } @@ -215,18 +86,9 @@ public SceneMonsterWaveParam mergeFrom(final SceneMonsterWaveParam other) { return this; } cachedSize = -1; - if (other.hasDNDLGLKFBHB()) { - setDNDLGLKFBHB(other.dNDLGLKFBHB); - } if (other.hasLevel()) { setLevel(other.level); } - if (other.hasAGFKKDONMOI()) { - setAGFKKDONMOI(other.aGFKKDONMOI); - } - if (other.hasAPKKFCLEGCI()) { - setAPKKFCLEGCI(other.aPKKFCLEGCI); - } return this; } @@ -237,10 +99,7 @@ public SceneMonsterWaveParam clear() { } cachedSize = -1; bitField0_ = 0; - dNDLGLKFBHB = 0; level = 0; - aGFKKDONMOI = 0; - aPKKFCLEGCI = 0; return this; } @@ -264,47 +123,23 @@ public boolean equals(Object o) { } SceneMonsterWaveParam other = (SceneMonsterWaveParam) o; return bitField0_ == other.bitField0_ - && (!hasDNDLGLKFBHB() || dNDLGLKFBHB == other.dNDLGLKFBHB) - && (!hasLevel() || level == other.level) - && (!hasAGFKKDONMOI() || aGFKKDONMOI == other.aGFKKDONMOI) - && (!hasAPKKFCLEGCI() || aPKKFCLEGCI == other.aPKKFCLEGCI); + && (!hasLevel() || level == other.level); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 40); - output.writeUInt32NoTag(dNDLGLKFBHB); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 64); output.writeUInt32NoTag(level); } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 112); - output.writeUInt32NoTag(aGFKKDONMOI); - } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 120); - output.writeUInt32NoTag(aPKKFCLEGCI); - } } @Override protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(dNDLGLKFBHB); - } - if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(level); } - if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(aGFKKDONMOI); - } - if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(aPKKFCLEGCI); - } return size; } @@ -315,37 +150,10 @@ public SceneMonsterWaveParam mergeFrom(final ProtoSource input) throws IOExcepti int tag = input.readTag(); while (true) { switch (tag) { - case 40: { - // dNDLGLKFBHB - dNDLGLKFBHB = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 64) { - break; - } - } case 64: { // level level = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 112) { - break; - } - } - case 112: { - // aGFKKDONMOI - aGFKKDONMOI = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 120) { - break; - } - } - case 120: { - // aPKKFCLEGCI - aPKKFCLEGCI = input.readUInt32(); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 0) { break; @@ -369,17 +177,8 @@ public SceneMonsterWaveParam mergeFrom(final ProtoSource input) throws IOExcepti public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.dNDLGLKFBHB, dNDLGLKFBHB); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.level, level); } - if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.aGFKKDONMOI, aGFKKDONMOI); - } - if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.aPKKFCLEGCI, aPKKFCLEGCI); - } output.endObject(); } @@ -390,44 +189,11 @@ public SceneMonsterWaveParam mergeFrom(final JsonSource input) throws IOExceptio } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1710437610: { - if (input.isAtField(FieldNames.dNDLGLKFBHB)) { - if (!input.trySkipNullValue()) { - dNDLGLKFBHB = input.readUInt32(); - bitField0_ |= 0x00000001; - } - } else { - input.skipUnknownField(); - } - break; - } case 102865796: { if (input.isAtField(FieldNames.level)) { if (!input.trySkipNullValue()) { level = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } - case -2145842908: { - if (input.isAtField(FieldNames.aGFKKDONMOI)) { - if (!input.trySkipNullValue()) { - aGFKKDONMOI = input.readUInt32(); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } - case -241059960: { - if (input.isAtField(FieldNames.aPKKFCLEGCI)) { - if (!input.trySkipNullValue()) { - aPKKFCLEGCI = input.readUInt32(); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000001; } } else { input.skipUnknownField(); @@ -487,13 +253,7 @@ public SceneMonsterWaveParam create() { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName dNDLGLKFBHB = FieldName.forField("DNDLGLKFBHB"); - static final FieldName level = FieldName.forField("level"); - - static final FieldName aGFKKDONMOI = FieldName.forField("AGFKKDONMOI"); - - static final FieldName aPKKFCLEGCI = FieldName.forField("APKKFCLEGCI"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/SceneNpcInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneNpcInfoOuterClass.java index 848fee259..a0298c3c0 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneNpcInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneNpcInfoOuterClass.java @@ -19,12 +19,12 @@ public static final class SceneNpcInfo extends ProtoMessage implem private static final long serialVersionUID = 0L; /** - * optional uint32 npc_id = 12; + * optional uint32 npc_id = 8; */ private int npcId; /** - * optional .NpcExtraInfo extra_info = 13; + * optional .NpcExtraInfo extra_info = 4; */ private final NpcExtraInfoOuterClass.NpcExtraInfo extraInfo = NpcExtraInfoOuterClass.NpcExtraInfo.newInstance(); @@ -39,7 +39,7 @@ public static SceneNpcInfo newInstance() { } /** - * optional uint32 npc_id = 12; + * optional uint32 npc_id = 8; * @return whether the npcId field is set */ public boolean hasNpcId() { @@ -47,7 +47,7 @@ public boolean hasNpcId() { } /** - * optional uint32 npc_id = 12; + * optional uint32 npc_id = 8; * @return this */ public SceneNpcInfo clearNpcId() { @@ -57,7 +57,7 @@ public SceneNpcInfo clearNpcId() { } /** - * optional uint32 npc_id = 12; + * optional uint32 npc_id = 8; * @return the npcId */ public int getNpcId() { @@ -65,7 +65,7 @@ public int getNpcId() { } /** - * optional uint32 npc_id = 12; + * optional uint32 npc_id = 8; * @param value the npcId to set * @return this */ @@ -76,7 +76,7 @@ public SceneNpcInfo setNpcId(final int value) { } /** - * optional .NpcExtraInfo extra_info = 13; + * optional .NpcExtraInfo extra_info = 4; * @return whether the extraInfo field is set */ public boolean hasExtraInfo() { @@ -84,7 +84,7 @@ public boolean hasExtraInfo() { } /** - * optional .NpcExtraInfo extra_info = 13; + * optional .NpcExtraInfo extra_info = 4; * @return this */ public SceneNpcInfo clearExtraInfo() { @@ -94,7 +94,7 @@ public SceneNpcInfo clearExtraInfo() { } /** - * optional .NpcExtraInfo extra_info = 13; + * optional .NpcExtraInfo extra_info = 4; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -108,7 +108,7 @@ public NpcExtraInfoOuterClass.NpcExtraInfo getExtraInfo() { } /** - * optional .NpcExtraInfo extra_info = 13; + * optional .NpcExtraInfo extra_info = 4; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -122,7 +122,7 @@ public NpcExtraInfoOuterClass.NpcExtraInfo getMutableExtraInfo() { } /** - * optional .NpcExtraInfo extra_info = 13; + * optional .NpcExtraInfo extra_info = 4; * @param value the extraInfo to set * @return this */ @@ -198,11 +198,11 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(npcId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 106); + output.writeRawByte((byte) 34); output.writeMessageNoTag(extraInfo); } } @@ -226,16 +226,16 @@ public SceneNpcInfo mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 96: { + case 64: { // npcId npcId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 106) { + if (tag != 34) { break; } } - case 106: { + case 34: { // extraInfo input.readMessage(extraInfo); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/SceneNpcMonsterInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneNpcMonsterInfoOuterClass.java index 29d720d45..06d5897e5 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneNpcMonsterInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneNpcMonsterInfoOuterClass.java @@ -19,19 +19,19 @@ public static final class SceneNpcMonsterInfo extends ProtoMessageoptional uint32 world_level = 4; + * optional uint32 event_id = 3; */ - private int worldLevel; + private int eventId; /** - * optional uint32 event_id = 7; + * optional uint32 monster_id = 6; */ - private int eventId; + private int monsterId; /** - * optional uint32 monster_id = 8; + * optional uint32 world_level = 10; */ - private int monsterId; + private int worldLevel; private SceneNpcMonsterInfo() { } @@ -44,113 +44,113 @@ public static SceneNpcMonsterInfo newInstance() { } /** - * optional uint32 world_level = 4; - * @return whether the worldLevel field is set + * optional uint32 event_id = 3; + * @return whether the eventId field is set */ - public boolean hasWorldLevel() { + public boolean hasEventId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 world_level = 4; + * optional uint32 event_id = 3; * @return this */ - public SceneNpcMonsterInfo clearWorldLevel() { + public SceneNpcMonsterInfo clearEventId() { bitField0_ &= ~0x00000001; - worldLevel = 0; + eventId = 0; return this; } /** - * optional uint32 world_level = 4; - * @return the worldLevel + * optional uint32 event_id = 3; + * @return the eventId */ - public int getWorldLevel() { - return worldLevel; + public int getEventId() { + return eventId; } /** - * optional uint32 world_level = 4; - * @param value the worldLevel to set + * optional uint32 event_id = 3; + * @param value the eventId to set * @return this */ - public SceneNpcMonsterInfo setWorldLevel(final int value) { + public SceneNpcMonsterInfo setEventId(final int value) { bitField0_ |= 0x00000001; - worldLevel = value; + eventId = value; return this; } /** - * optional uint32 event_id = 7; - * @return whether the eventId field is set + * optional uint32 monster_id = 6; + * @return whether the monsterId field is set */ - public boolean hasEventId() { + public boolean hasMonsterId() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 event_id = 7; + * optional uint32 monster_id = 6; * @return this */ - public SceneNpcMonsterInfo clearEventId() { + public SceneNpcMonsterInfo clearMonsterId() { bitField0_ &= ~0x00000002; - eventId = 0; + monsterId = 0; return this; } /** - * optional uint32 event_id = 7; - * @return the eventId + * optional uint32 monster_id = 6; + * @return the monsterId */ - public int getEventId() { - return eventId; + public int getMonsterId() { + return monsterId; } /** - * optional uint32 event_id = 7; - * @param value the eventId to set + * optional uint32 monster_id = 6; + * @param value the monsterId to set * @return this */ - public SceneNpcMonsterInfo setEventId(final int value) { + public SceneNpcMonsterInfo setMonsterId(final int value) { bitField0_ |= 0x00000002; - eventId = value; + monsterId = value; return this; } /** - * optional uint32 monster_id = 8; - * @return whether the monsterId field is set + * optional uint32 world_level = 10; + * @return whether the worldLevel field is set */ - public boolean hasMonsterId() { + public boolean hasWorldLevel() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 monster_id = 8; + * optional uint32 world_level = 10; * @return this */ - public SceneNpcMonsterInfo clearMonsterId() { + public SceneNpcMonsterInfo clearWorldLevel() { bitField0_ &= ~0x00000004; - monsterId = 0; + worldLevel = 0; return this; } /** - * optional uint32 monster_id = 8; - * @return the monsterId + * optional uint32 world_level = 10; + * @return the worldLevel */ - public int getMonsterId() { - return monsterId; + public int getWorldLevel() { + return worldLevel; } /** - * optional uint32 monster_id = 8; - * @param value the monsterId to set + * optional uint32 world_level = 10; + * @param value the worldLevel to set * @return this */ - public SceneNpcMonsterInfo setMonsterId(final int value) { + public SceneNpcMonsterInfo setWorldLevel(final int value) { bitField0_ |= 0x00000004; - monsterId = value; + worldLevel = value; return this; } @@ -159,9 +159,9 @@ public SceneNpcMonsterInfo copyFrom(final SceneNpcMonsterInfo other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - worldLevel = other.worldLevel; eventId = other.eventId; monsterId = other.monsterId; + worldLevel = other.worldLevel; } return this; } @@ -172,15 +172,15 @@ public SceneNpcMonsterInfo mergeFrom(final SceneNpcMonsterInfo other) { return this; } cachedSize = -1; - if (other.hasWorldLevel()) { - setWorldLevel(other.worldLevel); - } if (other.hasEventId()) { setEventId(other.eventId); } if (other.hasMonsterId()) { setMonsterId(other.monsterId); } + if (other.hasWorldLevel()) { + setWorldLevel(other.worldLevel); + } return this; } @@ -191,9 +191,9 @@ public SceneNpcMonsterInfo clear() { } cachedSize = -1; bitField0_ = 0; - worldLevel = 0; eventId = 0; monsterId = 0; + worldLevel = 0; return this; } @@ -217,24 +217,24 @@ public boolean equals(Object o) { } SceneNpcMonsterInfo other = (SceneNpcMonsterInfo) o; return bitField0_ == other.bitField0_ - && (!hasWorldLevel() || worldLevel == other.worldLevel) && (!hasEventId() || eventId == other.eventId) - && (!hasMonsterId() || monsterId == other.monsterId); + && (!hasMonsterId() || monsterId == other.monsterId) + && (!hasWorldLevel() || worldLevel == other.worldLevel); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); - output.writeUInt32NoTag(worldLevel); + output.writeRawByte((byte) 24); + output.writeUInt32NoTag(eventId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 56); - output.writeUInt32NoTag(eventId); + output.writeRawByte((byte) 48); + output.writeUInt32NoTag(monsterId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 64); - output.writeUInt32NoTag(monsterId); + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(worldLevel); } } @@ -242,13 +242,13 @@ public void writeTo(final ProtoSink output) throws IOException { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(worldLevel); + size += 1 + ProtoSink.computeUInt32SizeNoTag(eventId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(eventId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(monsterId); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(monsterId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(worldLevel); } return size; } @@ -260,27 +260,27 @@ public SceneNpcMonsterInfo mergeFrom(final ProtoSource input) throws IOException int tag = input.readTag(); while (true) { switch (tag) { - case 32: { - // worldLevel - worldLevel = input.readUInt32(); + case 24: { + // eventId + eventId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 56) { + if (tag != 48) { break; } } - case 56: { - // eventId - eventId = input.readUInt32(); + case 48: { + // monsterId + monsterId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 64) { + if (tag != 80) { break; } } - case 64: { - // monsterId - monsterId = input.readUInt32(); + case 80: { + // worldLevel + worldLevel = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 0) { @@ -305,13 +305,13 @@ public SceneNpcMonsterInfo mergeFrom(final ProtoSource input) throws IOException public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.worldLevel, worldLevel); + output.writeUInt32(FieldNames.eventId, eventId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.eventId, eventId); + output.writeUInt32(FieldNames.monsterId, monsterId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.monsterId, monsterId); + output.writeUInt32(FieldNames.worldLevel, worldLevel); } output.endObject(); } @@ -323,11 +323,11 @@ public SceneNpcMonsterInfo mergeFrom(final JsonSource input) throws IOException } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 440007442: - case 1305257111: { - if (input.isAtField(FieldNames.worldLevel)) { + case -1376502443: + case 278118624: { + if (input.isAtField(FieldNames.eventId)) { if (!input.trySkipNullValue()) { - worldLevel = input.readUInt32(); + eventId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -335,11 +335,11 @@ public SceneNpcMonsterInfo mergeFrom(final JsonSource input) throws IOException } break; } - case -1376502443: - case 278118624: { - if (input.isAtField(FieldNames.eventId)) { + case -1316830571: + case 2127946656: { + if (input.isAtField(FieldNames.monsterId)) { if (!input.trySkipNullValue()) { - eventId = input.readUInt32(); + monsterId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -347,11 +347,11 @@ public SceneNpcMonsterInfo mergeFrom(final JsonSource input) throws IOException } break; } - case -1316830571: - case 2127946656: { - if (input.isAtField(FieldNames.monsterId)) { + case 440007442: + case 1305257111: { + if (input.isAtField(FieldNames.worldLevel)) { if (!input.trySkipNullValue()) { - monsterId = input.readUInt32(); + worldLevel = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -412,11 +412,11 @@ public SceneNpcMonsterInfo create() { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName worldLevel = FieldName.forField("worldLevel", "world_level"); - static final FieldName eventId = FieldName.forField("eventId", "event_id"); static final FieldName monsterId = FieldName.forField("monsterId", "monster_id"); + + static final FieldName worldLevel = FieldName.forField("worldLevel", "world_level"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/ScenePlaneEventScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/ScenePlaneEventScNotifyOuterClass.java index a9c1947e1..bf9015056 100644 --- a/src/generated/main/emu/lunarcore/proto/ScenePlaneEventScNotifyOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ScenePlaneEventScNotifyOuterClass.java @@ -19,7 +19,7 @@ public static final class ScenePlaneEventScNotify extends ProtoMessageoptional .ItemList get_item_list = 8; + * optional .ItemList get_item_list = 1; */ private final ItemListOuterClass.ItemList getItemList = ItemListOuterClass.ItemList.newInstance(); @@ -34,7 +34,7 @@ public static ScenePlaneEventScNotify newInstance() { } /** - * optional .ItemList get_item_list = 8; + * optional .ItemList get_item_list = 1; * @return whether the getItemList field is set */ public boolean hasGetItemList() { @@ -42,7 +42,7 @@ public boolean hasGetItemList() { } /** - * optional .ItemList get_item_list = 8; + * optional .ItemList get_item_list = 1; * @return this */ public ScenePlaneEventScNotify clearGetItemList() { @@ -52,7 +52,7 @@ public ScenePlaneEventScNotify clearGetItemList() { } /** - * optional .ItemList get_item_list = 8; + * optional .ItemList get_item_list = 1; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -66,7 +66,7 @@ public ItemListOuterClass.ItemList getGetItemList() { } /** - * optional .ItemList get_item_list = 8; + * optional .ItemList get_item_list = 1; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -80,7 +80,7 @@ public ItemListOuterClass.ItemList getMutableGetItemList() { } /** - * optional .ItemList get_item_list = 8; + * optional .ItemList get_item_list = 1; * @param value the getItemList to set * @return this */ @@ -150,7 +150,7 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 66); + output.writeRawByte((byte) 10); output.writeMessageNoTag(getItemList); } } @@ -171,7 +171,7 @@ public ScenePlaneEventScNotify mergeFrom(final ProtoSource input) throws IOExcep int tag = input.readTag(); while (true) { switch (tag) { - case 66: { + case 10: { // getItemList input.readMessage(getItemList); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/ScenePropInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/ScenePropInfoOuterClass.java index 04d7c0b72..db1d7eedc 100644 --- a/src/generated/main/emu/lunarcore/proto/ScenePropInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ScenePropInfoOuterClass.java @@ -19,27 +19,27 @@ public static final class ScenePropInfo extends ProtoMessage impl private static final long serialVersionUID = 0L; /** - * optional uint64 create_time_ms = 11; + * optional uint64 create_time_ms = 7; */ private long createTimeMs; /** - * optional uint32 prop_id = 1; + * optional uint32 prop_state = 1; */ - private int propId; + private int propState; /** - * optional uint32 prop_state = 5; + * optional uint32 life_time_ms = 11; */ - private int propState; + private int lifeTimeMs; /** - * optional uint32 life_time_ms = 6; + * optional uint32 prop_id = 12; */ - private int lifeTimeMs; + private int propId; /** - * optional .PropExtraInfo extra_info = 15; + * optional .PropExtraInfo extra_info = 9; */ private final PropExtraInfoOuterClass.PropExtraInfo extraInfo = PropExtraInfoOuterClass.PropExtraInfo.newInstance(); @@ -54,7 +54,7 @@ public static ScenePropInfo newInstance() { } /** - * optional uint64 create_time_ms = 11; + * optional uint64 create_time_ms = 7; * @return whether the createTimeMs field is set */ public boolean hasCreateTimeMs() { @@ -62,7 +62,7 @@ public boolean hasCreateTimeMs() { } /** - * optional uint64 create_time_ms = 11; + * optional uint64 create_time_ms = 7; * @return this */ public ScenePropInfo clearCreateTimeMs() { @@ -72,7 +72,7 @@ public ScenePropInfo clearCreateTimeMs() { } /** - * optional uint64 create_time_ms = 11; + * optional uint64 create_time_ms = 7; * @return the createTimeMs */ public long getCreateTimeMs() { @@ -80,7 +80,7 @@ public long getCreateTimeMs() { } /** - * optional uint64 create_time_ms = 11; + * optional uint64 create_time_ms = 7; * @param value the createTimeMs to set * @return this */ @@ -91,118 +91,118 @@ public ScenePropInfo setCreateTimeMs(final long value) { } /** - * optional uint32 prop_id = 1; - * @return whether the propId field is set + * optional uint32 prop_state = 1; + * @return whether the propState field is set */ - public boolean hasPropId() { + public boolean hasPropState() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 prop_id = 1; + * optional uint32 prop_state = 1; * @return this */ - public ScenePropInfo clearPropId() { + public ScenePropInfo clearPropState() { bitField0_ &= ~0x00000002; - propId = 0; + propState = 0; return this; } /** - * optional uint32 prop_id = 1; - * @return the propId + * optional uint32 prop_state = 1; + * @return the propState */ - public int getPropId() { - return propId; + public int getPropState() { + return propState; } /** - * optional uint32 prop_id = 1; - * @param value the propId to set + * optional uint32 prop_state = 1; + * @param value the propState to set * @return this */ - public ScenePropInfo setPropId(final int value) { + public ScenePropInfo setPropState(final int value) { bitField0_ |= 0x00000002; - propId = value; + propState = value; return this; } /** - * optional uint32 prop_state = 5; - * @return whether the propState field is set + * optional uint32 life_time_ms = 11; + * @return whether the lifeTimeMs field is set */ - public boolean hasPropState() { + public boolean hasLifeTimeMs() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 prop_state = 5; + * optional uint32 life_time_ms = 11; * @return this */ - public ScenePropInfo clearPropState() { + public ScenePropInfo clearLifeTimeMs() { bitField0_ &= ~0x00000004; - propState = 0; + lifeTimeMs = 0; return this; } /** - * optional uint32 prop_state = 5; - * @return the propState + * optional uint32 life_time_ms = 11; + * @return the lifeTimeMs */ - public int getPropState() { - return propState; + public int getLifeTimeMs() { + return lifeTimeMs; } /** - * optional uint32 prop_state = 5; - * @param value the propState to set + * optional uint32 life_time_ms = 11; + * @param value the lifeTimeMs to set * @return this */ - public ScenePropInfo setPropState(final int value) { + public ScenePropInfo setLifeTimeMs(final int value) { bitField0_ |= 0x00000004; - propState = value; + lifeTimeMs = value; return this; } /** - * optional uint32 life_time_ms = 6; - * @return whether the lifeTimeMs field is set + * optional uint32 prop_id = 12; + * @return whether the propId field is set */ - public boolean hasLifeTimeMs() { + public boolean hasPropId() { return (bitField0_ & 0x00000008) != 0; } /** - * optional uint32 life_time_ms = 6; + * optional uint32 prop_id = 12; * @return this */ - public ScenePropInfo clearLifeTimeMs() { + public ScenePropInfo clearPropId() { bitField0_ &= ~0x00000008; - lifeTimeMs = 0; + propId = 0; return this; } /** - * optional uint32 life_time_ms = 6; - * @return the lifeTimeMs + * optional uint32 prop_id = 12; + * @return the propId */ - public int getLifeTimeMs() { - return lifeTimeMs; + public int getPropId() { + return propId; } /** - * optional uint32 life_time_ms = 6; - * @param value the lifeTimeMs to set + * optional uint32 prop_id = 12; + * @param value the propId to set * @return this */ - public ScenePropInfo setLifeTimeMs(final int value) { + public ScenePropInfo setPropId(final int value) { bitField0_ |= 0x00000008; - lifeTimeMs = value; + propId = value; return this; } /** - * optional .PropExtraInfo extra_info = 15; + * optional .PropExtraInfo extra_info = 9; * @return whether the extraInfo field is set */ public boolean hasExtraInfo() { @@ -210,7 +210,7 @@ public boolean hasExtraInfo() { } /** - * optional .PropExtraInfo extra_info = 15; + * optional .PropExtraInfo extra_info = 9; * @return this */ public ScenePropInfo clearExtraInfo() { @@ -220,7 +220,7 @@ public ScenePropInfo clearExtraInfo() { } /** - * optional .PropExtraInfo extra_info = 15; + * optional .PropExtraInfo extra_info = 9; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -234,7 +234,7 @@ public PropExtraInfoOuterClass.PropExtraInfo getExtraInfo() { } /** - * optional .PropExtraInfo extra_info = 15; + * optional .PropExtraInfo extra_info = 9; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -248,7 +248,7 @@ public PropExtraInfoOuterClass.PropExtraInfo getMutableExtraInfo() { } /** - * optional .PropExtraInfo extra_info = 15; + * optional .PropExtraInfo extra_info = 9; * @param value the extraInfo to set * @return this */ @@ -264,9 +264,9 @@ public ScenePropInfo copyFrom(final ScenePropInfo other) { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; createTimeMs = other.createTimeMs; - propId = other.propId; propState = other.propState; lifeTimeMs = other.lifeTimeMs; + propId = other.propId; extraInfo.copyFrom(other.extraInfo); } return this; @@ -281,15 +281,15 @@ public ScenePropInfo mergeFrom(final ScenePropInfo other) { if (other.hasCreateTimeMs()) { setCreateTimeMs(other.createTimeMs); } - if (other.hasPropId()) { - setPropId(other.propId); - } if (other.hasPropState()) { setPropState(other.propState); } if (other.hasLifeTimeMs()) { setLifeTimeMs(other.lifeTimeMs); } + if (other.hasPropId()) { + setPropId(other.propId); + } if (other.hasExtraInfo()) { getMutableExtraInfo().mergeFrom(other.extraInfo); } @@ -304,9 +304,9 @@ public ScenePropInfo clear() { cachedSize = -1; bitField0_ = 0; createTimeMs = 0L; - propId = 0; propState = 0; lifeTimeMs = 0; + propId = 0; extraInfo.clear(); return this; } @@ -333,32 +333,32 @@ public boolean equals(Object o) { ScenePropInfo other = (ScenePropInfo) o; return bitField0_ == other.bitField0_ && (!hasCreateTimeMs() || createTimeMs == other.createTimeMs) - && (!hasPropId() || propId == other.propId) && (!hasPropState() || propState == other.propState) && (!hasLifeTimeMs() || lifeTimeMs == other.lifeTimeMs) + && (!hasPropId() || propId == other.propId) && (!hasExtraInfo() || extraInfo.equals(other.extraInfo)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 56); output.writeUInt64NoTag(createTimeMs); } if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 8); - output.writeUInt32NoTag(propId); + output.writeUInt32NoTag(propState); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 40); - output.writeUInt32NoTag(propState); + output.writeRawByte((byte) 88); + output.writeUInt32NoTag(lifeTimeMs); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 48); - output.writeUInt32NoTag(lifeTimeMs); + output.writeRawByte((byte) 96); + output.writeUInt32NoTag(propId); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 122); + output.writeRawByte((byte) 74); output.writeMessageNoTag(extraInfo); } } @@ -370,13 +370,13 @@ protected int computeSerializedSize() { size += 1 + ProtoSink.computeUInt64SizeNoTag(createTimeMs); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(propId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(propState); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(propState); + size += 1 + ProtoSink.computeUInt32SizeNoTag(lifeTimeMs); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(lifeTimeMs); + size += 1 + ProtoSink.computeUInt32SizeNoTag(propId); } if ((bitField0_ & 0x00000010) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(extraInfo); @@ -391,7 +391,7 @@ public ScenePropInfo mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 88: { + case 56: { // createTimeMs createTimeMs = input.readUInt64(); bitField0_ |= 0x00000001; @@ -401,33 +401,33 @@ public ScenePropInfo mergeFrom(final ProtoSource input) throws IOException { } } case 8: { - // propId - propId = input.readUInt32(); + // propState + propState = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 40) { + if (tag != 88) { break; } } - case 40: { - // propState - propState = input.readUInt32(); + case 88: { + // lifeTimeMs + lifeTimeMs = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 48) { + if (tag != 96) { break; } } - case 48: { - // lifeTimeMs - lifeTimeMs = input.readUInt32(); + case 96: { + // propId + propId = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 122) { + if (tag != 74) { break; } } - case 122: { + case 74: { // extraInfo input.readMessage(extraInfo); bitField0_ |= 0x00000010; @@ -457,13 +457,13 @@ public void writeTo(final JsonSink output) throws IOException { output.writeUInt64(FieldNames.createTimeMs, createTimeMs); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.propId, propId); + output.writeUInt32(FieldNames.propState, propState); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.propState, propState); + output.writeUInt32(FieldNames.lifeTimeMs, lifeTimeMs); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.lifeTimeMs, lifeTimeMs); + output.writeUInt32(FieldNames.propId, propId); } if ((bitField0_ & 0x00000010) != 0) { output.writeMessage(FieldNames.extraInfo, extraInfo); @@ -490,11 +490,11 @@ public ScenePropInfo mergeFrom(final JsonSource input) throws IOException { } break; } - case -979804194: - case -309137545: { - if (input.isAtField(FieldNames.propId)) { + case -739191058: + case -1096911691: { + if (input.isAtField(FieldNames.propState)) { if (!input.trySkipNullValue()) { - propId = input.readUInt32(); + propState = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -502,11 +502,11 @@ public ScenePropInfo mergeFrom(final JsonSource input) throws IOException { } break; } - case -739191058: - case -1096911691: { - if (input.isAtField(FieldNames.propState)) { + case -1226028177: + case 1665182229: { + if (input.isAtField(FieldNames.lifeTimeMs)) { if (!input.trySkipNullValue()) { - propState = input.readUInt32(); + lifeTimeMs = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -514,11 +514,11 @@ public ScenePropInfo mergeFrom(final JsonSource input) throws IOException { } break; } - case -1226028177: - case 1665182229: { - if (input.isAtField(FieldNames.lifeTimeMs)) { + case -979804194: + case -309137545: { + if (input.isAtField(FieldNames.propId)) { if (!input.trySkipNullValue()) { - lifeTimeMs = input.readUInt32(); + propId = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -592,12 +592,12 @@ public ScenePropInfo create() { static class FieldNames { static final FieldName createTimeMs = FieldName.forField("createTimeMs", "create_time_ms"); - static final FieldName propId = FieldName.forField("propId", "prop_id"); - static final FieldName propState = FieldName.forField("propState", "prop_state"); static final FieldName lifeTimeMs = FieldName.forField("lifeTimeMs", "life_time_ms"); + static final FieldName propId = FieldName.forField("propId", "prop_id"); + static final FieldName extraInfo = FieldName.forField("extraInfo", "extra_info"); } } diff --git a/src/generated/main/emu/lunarcore/proto/SceneSummonUnitInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneSummonUnitInfoOuterClass.java index 4421a0515..8edabbdd8 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneSummonUnitInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneSummonUnitInfoOuterClass.java @@ -25,27 +25,27 @@ public static final class SceneSummonUnitInfo extends ProtoMessageoptional uint32 summon_unit_id = 2; + * optional uint32 summon_unit_id = 3; */ private int summonUnitId; /** - * optional uint32 caster_entity_id = 9; + * optional uint32 attach_entity_id = 4; */ - private int casterEntityId; + private int attachEntityId; /** - * optional uint32 attach_entity_id = 11; + * optional uint32 caster_entity_id = 14; */ - private int attachEntityId; + private int casterEntityId; /** - * optional sint32 life_time_ms = 8; + * optional sint32 life_time_ms = 6; */ private int lifeTimeMs; /** - * repeated string trigger_name_list = 4; + * repeated string trigger_name_list = 12; */ private final RepeatedString triggerNameList = RepeatedString.newEmptyInstance(); @@ -97,7 +97,7 @@ public SceneSummonUnitInfo setCreateTimeMs(final long value) { } /** - * optional uint32 summon_unit_id = 2; + * optional uint32 summon_unit_id = 3; * @return whether the summonUnitId field is set */ public boolean hasSummonUnitId() { @@ -105,7 +105,7 @@ public boolean hasSummonUnitId() { } /** - * optional uint32 summon_unit_id = 2; + * optional uint32 summon_unit_id = 3; * @return this */ public SceneSummonUnitInfo clearSummonUnitId() { @@ -115,7 +115,7 @@ public SceneSummonUnitInfo clearSummonUnitId() { } /** - * optional uint32 summon_unit_id = 2; + * optional uint32 summon_unit_id = 3; * @return the summonUnitId */ public int getSummonUnitId() { @@ -123,7 +123,7 @@ public int getSummonUnitId() { } /** - * optional uint32 summon_unit_id = 2; + * optional uint32 summon_unit_id = 3; * @param value the summonUnitId to set * @return this */ @@ -134,81 +134,81 @@ public SceneSummonUnitInfo setSummonUnitId(final int value) { } /** - * optional uint32 caster_entity_id = 9; - * @return whether the casterEntityId field is set + * optional uint32 attach_entity_id = 4; + * @return whether the attachEntityId field is set */ - public boolean hasCasterEntityId() { + public boolean hasAttachEntityId() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 caster_entity_id = 9; + * optional uint32 attach_entity_id = 4; * @return this */ - public SceneSummonUnitInfo clearCasterEntityId() { + public SceneSummonUnitInfo clearAttachEntityId() { bitField0_ &= ~0x00000004; - casterEntityId = 0; + attachEntityId = 0; return this; } /** - * optional uint32 caster_entity_id = 9; - * @return the casterEntityId + * optional uint32 attach_entity_id = 4; + * @return the attachEntityId */ - public int getCasterEntityId() { - return casterEntityId; + public int getAttachEntityId() { + return attachEntityId; } /** - * optional uint32 caster_entity_id = 9; - * @param value the casterEntityId to set + * optional uint32 attach_entity_id = 4; + * @param value the attachEntityId to set * @return this */ - public SceneSummonUnitInfo setCasterEntityId(final int value) { + public SceneSummonUnitInfo setAttachEntityId(final int value) { bitField0_ |= 0x00000004; - casterEntityId = value; + attachEntityId = value; return this; } /** - * optional uint32 attach_entity_id = 11; - * @return whether the attachEntityId field is set + * optional uint32 caster_entity_id = 14; + * @return whether the casterEntityId field is set */ - public boolean hasAttachEntityId() { + public boolean hasCasterEntityId() { return (bitField0_ & 0x00000008) != 0; } /** - * optional uint32 attach_entity_id = 11; + * optional uint32 caster_entity_id = 14; * @return this */ - public SceneSummonUnitInfo clearAttachEntityId() { + public SceneSummonUnitInfo clearCasterEntityId() { bitField0_ &= ~0x00000008; - attachEntityId = 0; + casterEntityId = 0; return this; } /** - * optional uint32 attach_entity_id = 11; - * @return the attachEntityId + * optional uint32 caster_entity_id = 14; + * @return the casterEntityId */ - public int getAttachEntityId() { - return attachEntityId; + public int getCasterEntityId() { + return casterEntityId; } /** - * optional uint32 attach_entity_id = 11; - * @param value the attachEntityId to set + * optional uint32 caster_entity_id = 14; + * @param value the casterEntityId to set * @return this */ - public SceneSummonUnitInfo setAttachEntityId(final int value) { + public SceneSummonUnitInfo setCasterEntityId(final int value) { bitField0_ |= 0x00000008; - attachEntityId = value; + casterEntityId = value; return this; } /** - * optional sint32 life_time_ms = 8; + * optional sint32 life_time_ms = 6; * @return whether the lifeTimeMs field is set */ public boolean hasLifeTimeMs() { @@ -216,7 +216,7 @@ public boolean hasLifeTimeMs() { } /** - * optional sint32 life_time_ms = 8; + * optional sint32 life_time_ms = 6; * @return this */ public SceneSummonUnitInfo clearLifeTimeMs() { @@ -226,7 +226,7 @@ public SceneSummonUnitInfo clearLifeTimeMs() { } /** - * optional sint32 life_time_ms = 8; + * optional sint32 life_time_ms = 6; * @return the lifeTimeMs */ public int getLifeTimeMs() { @@ -234,7 +234,7 @@ public int getLifeTimeMs() { } /** - * optional sint32 life_time_ms = 8; + * optional sint32 life_time_ms = 6; * @param value the lifeTimeMs to set * @return this */ @@ -245,7 +245,7 @@ public SceneSummonUnitInfo setLifeTimeMs(final int value) { } /** - * repeated string trigger_name_list = 4; + * repeated string trigger_name_list = 12; * @return whether the triggerNameList field is set */ public boolean hasTriggerNameList() { @@ -253,7 +253,7 @@ public boolean hasTriggerNameList() { } /** - * repeated string trigger_name_list = 4; + * repeated string trigger_name_list = 12; * @return this */ public SceneSummonUnitInfo clearTriggerNameList() { @@ -263,7 +263,7 @@ public SceneSummonUnitInfo clearTriggerNameList() { } /** - * repeated string trigger_name_list = 4; + * repeated string trigger_name_list = 12; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -277,7 +277,7 @@ public RepeatedString getTriggerNameList() { } /** - * repeated string trigger_name_list = 4; + * repeated string trigger_name_list = 12; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -291,7 +291,7 @@ public RepeatedString getMutableTriggerNameList() { } /** - * repeated string trigger_name_list = 4; + * repeated string trigger_name_list = 12; * @param value the triggerNameList to add * @return this */ @@ -302,7 +302,7 @@ public SceneSummonUnitInfo addTriggerNameList(final CharSequence value) { } /** - * repeated string trigger_name_list = 4; + * repeated string trigger_name_list = 12; * @param values the triggerNameList to add * @return this */ @@ -319,8 +319,8 @@ public SceneSummonUnitInfo copyFrom(final SceneSummonUnitInfo other) { bitField0_ = other.bitField0_; createTimeMs = other.createTimeMs; summonUnitId = other.summonUnitId; - casterEntityId = other.casterEntityId; attachEntityId = other.attachEntityId; + casterEntityId = other.casterEntityId; lifeTimeMs = other.lifeTimeMs; triggerNameList.copyFrom(other.triggerNameList); } @@ -339,12 +339,12 @@ public SceneSummonUnitInfo mergeFrom(final SceneSummonUnitInfo other) { if (other.hasSummonUnitId()) { setSummonUnitId(other.summonUnitId); } - if (other.hasCasterEntityId()) { - setCasterEntityId(other.casterEntityId); - } if (other.hasAttachEntityId()) { setAttachEntityId(other.attachEntityId); } + if (other.hasCasterEntityId()) { + setCasterEntityId(other.casterEntityId); + } if (other.hasLifeTimeMs()) { setLifeTimeMs(other.lifeTimeMs); } @@ -363,8 +363,8 @@ public SceneSummonUnitInfo clear() { bitField0_ = 0; createTimeMs = 0L; summonUnitId = 0; - casterEntityId = 0; attachEntityId = 0; + casterEntityId = 0; lifeTimeMs = 0; triggerNameList.clear(); return this; @@ -393,8 +393,8 @@ public boolean equals(Object o) { return bitField0_ == other.bitField0_ && (!hasCreateTimeMs() || createTimeMs == other.createTimeMs) && (!hasSummonUnitId() || summonUnitId == other.summonUnitId) - && (!hasCasterEntityId() || casterEntityId == other.casterEntityId) && (!hasAttachEntityId() || attachEntityId == other.attachEntityId) + && (!hasCasterEntityId() || casterEntityId == other.casterEntityId) && (!hasLifeTimeMs() || lifeTimeMs == other.lifeTimeMs) && (!hasTriggerNameList() || triggerNameList.equals(other.triggerNameList)); } @@ -406,24 +406,24 @@ public void writeTo(final ProtoSink output) throws IOException { output.writeUInt64NoTag(createTimeMs); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(summonUnitId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 72); - output.writeUInt32NoTag(casterEntityId); + output.writeRawByte((byte) 32); + output.writeUInt32NoTag(attachEntityId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 88); - output.writeUInt32NoTag(attachEntityId); + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(casterEntityId); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 48); output.writeSInt32NoTag(lifeTimeMs); } if ((bitField0_ & 0x00000020) != 0) { for (int i = 0; i < triggerNameList.length(); i++) { - output.writeRawByte((byte) 34); + output.writeRawByte((byte) 98); output.writeStringNoTag(triggerNameList.get(i)); } } @@ -439,10 +439,10 @@ protected int computeSerializedSize() { size += 1 + ProtoSink.computeUInt32SizeNoTag(summonUnitId); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(casterEntityId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(attachEntityId); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(attachEntityId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(casterEntityId); } if ((bitField0_ & 0x00000010) != 0) { size += 1 + ProtoSink.computeSInt32SizeNoTag(lifeTimeMs); @@ -465,47 +465,47 @@ public SceneSummonUnitInfo mergeFrom(final ProtoSource input) throws IOException createTimeMs = input.readUInt64(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 16) { + if (tag != 24) { break; } } - case 16: { + case 24: { // summonUnitId summonUnitId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 72) { + if (tag != 32) { break; } } - case 72: { - // casterEntityId - casterEntityId = input.readUInt32(); + case 32: { + // attachEntityId + attachEntityId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 88) { + if (tag != 112) { break; } } - case 88: { - // attachEntityId - attachEntityId = input.readUInt32(); + case 112: { + // casterEntityId + casterEntityId = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 64) { + if (tag != 48) { break; } } - case 64: { + case 48: { // lifeTimeMs lifeTimeMs = input.readSInt32(); bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 34) { + if (tag != 98) { break; } } - case 34: { + case 98: { // triggerNameList tag = input.readRepeatedString(triggerNameList, tag); bitField0_ |= 0x00000020; @@ -537,10 +537,10 @@ public void writeTo(final JsonSink output) throws IOException { output.writeUInt32(FieldNames.summonUnitId, summonUnitId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.casterEntityId, casterEntityId); + output.writeUInt32(FieldNames.attachEntityId, attachEntityId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.attachEntityId, attachEntityId); + output.writeUInt32(FieldNames.casterEntityId, casterEntityId); } if ((bitField0_ & 0x00000010) != 0) { output.writeSInt32(FieldNames.lifeTimeMs, lifeTimeMs); @@ -582,11 +582,11 @@ public SceneSummonUnitInfo mergeFrom(final JsonSource input) throws IOException } break; } - case -1831162710: - case -1550367068: { - if (input.isAtField(FieldNames.casterEntityId)) { + case -900612669: + case -644975235: { + if (input.isAtField(FieldNames.attachEntityId)) { if (!input.trySkipNullValue()) { - casterEntityId = input.readUInt32(); + attachEntityId = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -594,11 +594,11 @@ public SceneSummonUnitInfo mergeFrom(final JsonSource input) throws IOException } break; } - case -900612669: - case -644975235: { - if (input.isAtField(FieldNames.attachEntityId)) { + case -1831162710: + case -1550367068: { + if (input.isAtField(FieldNames.casterEntityId)) { if (!input.trySkipNullValue()) { - attachEntityId = input.readUInt32(); + casterEntityId = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -687,10 +687,10 @@ static class FieldNames { static final FieldName summonUnitId = FieldName.forField("summonUnitId", "summon_unit_id"); - static final FieldName casterEntityId = FieldName.forField("casterEntityId", "caster_entity_id"); - static final FieldName attachEntityId = FieldName.forField("attachEntityId", "attach_entity_id"); + static final FieldName casterEntityId = FieldName.forField("casterEntityId", "caster_entity_id"); + static final FieldName lifeTimeMs = FieldName.forField("lifeTimeMs", "life_time_ms"); static final FieldName triggerNameList = FieldName.forField("triggerNameList", "trigger_name_list"); diff --git a/src/generated/main/emu/lunarcore/proto/SearchPlayerCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SearchPlayerCsReqOuterClass.java index 022c084da..73de33f09 100644 --- a/src/generated/main/emu/lunarcore/proto/SearchPlayerCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SearchPlayerCsReqOuterClass.java @@ -20,7 +20,7 @@ public static final class SearchPlayerCsReq extends ProtoMessagerepeated uint32 search_uid_list = 4; + * repeated uint32 search_uid_list = 5; */ private final RepeatedInt searchUidList = RepeatedInt.newEmptyInstance(); @@ -35,7 +35,7 @@ public static SearchPlayerCsReq newInstance() { } /** - * repeated uint32 search_uid_list = 4; + * repeated uint32 search_uid_list = 5; * @return whether the searchUidList field is set */ public boolean hasSearchUidList() { @@ -43,7 +43,7 @@ public boolean hasSearchUidList() { } /** - * repeated uint32 search_uid_list = 4; + * repeated uint32 search_uid_list = 5; * @return this */ public SearchPlayerCsReq clearSearchUidList() { @@ -53,7 +53,7 @@ public SearchPlayerCsReq clearSearchUidList() { } /** - * repeated uint32 search_uid_list = 4; + * repeated uint32 search_uid_list = 5; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -67,7 +67,7 @@ public RepeatedInt getSearchUidList() { } /** - * repeated uint32 search_uid_list = 4; + * repeated uint32 search_uid_list = 5; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -81,7 +81,7 @@ public RepeatedInt getMutableSearchUidList() { } /** - * repeated uint32 search_uid_list = 4; + * repeated uint32 search_uid_list = 5; * @param value the searchUidList to add * @return this */ @@ -92,7 +92,7 @@ public SearchPlayerCsReq addSearchUidList(final int value) { } /** - * repeated uint32 search_uid_list = 4; + * repeated uint32 search_uid_list = 5; * @param values the searchUidList to add * @return this */ @@ -163,7 +163,7 @@ public boolean equals(Object o) { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { for (int i = 0; i < searchUidList.length(); i++) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(searchUidList.array()[i]); } } @@ -185,7 +185,7 @@ public SearchPlayerCsReq mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 34: { + case 42: { // searchUidList [packed=true] input.readPackedUInt32(searchUidList, tag); bitField0_ |= 0x00000001; @@ -204,7 +204,7 @@ public SearchPlayerCsReq mergeFrom(final ProtoSource input) throws IOException { tag = input.readTag(); break; } - case 32: { + case 40: { // searchUidList [packed=false] tag = input.readRepeatedUInt32(searchUidList, tag); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/SearchPlayerScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/SearchPlayerScRspOuterClass.java index dfea3aa6d..0f231e3e9 100644 --- a/src/generated/main/emu/lunarcore/proto/SearchPlayerScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SearchPlayerScRspOuterClass.java @@ -20,12 +20,12 @@ public static final class SearchPlayerScRsp extends ProtoMessageoptional uint32 retcode = 15; + * optional uint32 retcode = 1; */ private int retcode; /** - * repeated .SimpleInfo search_result_list = 6; + * repeated .SimpleInfo search_result_list = 15; */ private final RepeatedMessage searchResultList = RepeatedMessage.newEmptyInstance(SimpleInfoOuterClass.SimpleInfo.getFactory()); @@ -40,7 +40,7 @@ public static SearchPlayerScRsp newInstance() { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 1; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -48,7 +48,7 @@ public boolean hasRetcode() { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 1; * @return this */ public SearchPlayerScRsp clearRetcode() { @@ -58,7 +58,7 @@ public SearchPlayerScRsp clearRetcode() { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 1; * @return the retcode */ public int getRetcode() { @@ -66,7 +66,7 @@ public int getRetcode() { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 1; * @param value the retcode to set * @return this */ @@ -77,7 +77,7 @@ public SearchPlayerScRsp setRetcode(final int value) { } /** - * repeated .SimpleInfo search_result_list = 6; + * repeated .SimpleInfo search_result_list = 15; * @return whether the searchResultList field is set */ public boolean hasSearchResultList() { @@ -85,7 +85,7 @@ public boolean hasSearchResultList() { } /** - * repeated .SimpleInfo search_result_list = 6; + * repeated .SimpleInfo search_result_list = 15; * @return this */ public SearchPlayerScRsp clearSearchResultList() { @@ -95,7 +95,7 @@ public SearchPlayerScRsp clearSearchResultList() { } /** - * repeated .SimpleInfo search_result_list = 6; + * repeated .SimpleInfo search_result_list = 15; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -109,7 +109,7 @@ public RepeatedMessage getSearchResultList() { } /** - * repeated .SimpleInfo search_result_list = 6; + * repeated .SimpleInfo search_result_list = 15; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -123,7 +123,7 @@ public RepeatedMessage getMutableSearchResultLi } /** - * repeated .SimpleInfo search_result_list = 6; + * repeated .SimpleInfo search_result_list = 15; * @param value the searchResultList to add * @return this */ @@ -134,7 +134,7 @@ public SearchPlayerScRsp addSearchResultList(final SimpleInfoOuterClass.SimpleIn } /** - * repeated .SimpleInfo search_result_list = 6; + * repeated .SimpleInfo search_result_list = 15; * @param values the searchResultList to add * @return this */ @@ -211,12 +211,12 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < searchResultList.length(); i++) { - output.writeRawByte((byte) 50); + output.writeRawByte((byte) 122); output.writeMessageNoTag(searchResultList.get(i)); } } @@ -241,16 +241,16 @@ public SearchPlayerScRsp mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 120: { + case 8: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 50) { + if (tag != 122) { break; } } - case 50: { + case 122: { // searchResultList tag = input.readRepeatedMessage(searchResultList, tag); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/SelectChatBubbleCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SelectChatBubbleCsReqOuterClass.java index fe885d04a..6884462e6 100644 --- a/src/generated/main/emu/lunarcore/proto/SelectChatBubbleCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SelectChatBubbleCsReqOuterClass.java @@ -19,7 +19,7 @@ public static final class SelectChatBubbleCsReq extends ProtoMessageoptional uint32 bubble_id = 10; + * optional uint32 bubble_id = 2; */ private int bubbleId; @@ -34,7 +34,7 @@ public static SelectChatBubbleCsReq newInstance() { } /** - * optional uint32 bubble_id = 10; + * optional uint32 bubble_id = 2; * @return whether the bubbleId field is set */ public boolean hasBubbleId() { @@ -42,7 +42,7 @@ public boolean hasBubbleId() { } /** - * optional uint32 bubble_id = 10; + * optional uint32 bubble_id = 2; * @return this */ public SelectChatBubbleCsReq clearBubbleId() { @@ -52,7 +52,7 @@ public SelectChatBubbleCsReq clearBubbleId() { } /** - * optional uint32 bubble_id = 10; + * optional uint32 bubble_id = 2; * @return the bubbleId */ public int getBubbleId() { @@ -60,7 +60,7 @@ public int getBubbleId() { } /** - * optional uint32 bubble_id = 10; + * optional uint32 bubble_id = 2; * @param value the bubbleId to set * @return this */ @@ -129,7 +129,7 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(bubbleId); } } @@ -150,7 +150,7 @@ public SelectChatBubbleCsReq mergeFrom(final ProtoSource input) throws IOExcepti int tag = input.readTag(); while (true) { switch (tag) { - case 80: { + case 16: { // bubbleId bubbleId = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/SelectChatBubbleScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/SelectChatBubbleScRspOuterClass.java index 712776e87..fbd33f160 100644 --- a/src/generated/main/emu/lunarcore/proto/SelectChatBubbleScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SelectChatBubbleScRspOuterClass.java @@ -19,14 +19,14 @@ public static final class SelectChatBubbleScRsp extends ProtoMessageoptional uint32 cur_chat_bubble = 5; + * optional uint32 retcode = 11; */ - private int curChatBubble; + private int retcode; /** - * optional uint32 retcode = 6; + * optional uint32 cur_chat_bubble = 15; */ - private int retcode; + private int curChatBubble; private SelectChatBubbleScRsp() { } @@ -39,76 +39,76 @@ public static SelectChatBubbleScRsp newInstance() { } /** - * optional uint32 cur_chat_bubble = 5; - * @return whether the curChatBubble field is set + * optional uint32 retcode = 11; + * @return whether the retcode field is set */ - public boolean hasCurChatBubble() { + public boolean hasRetcode() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 cur_chat_bubble = 5; + * optional uint32 retcode = 11; * @return this */ - public SelectChatBubbleScRsp clearCurChatBubble() { + public SelectChatBubbleScRsp clearRetcode() { bitField0_ &= ~0x00000001; - curChatBubble = 0; + retcode = 0; return this; } /** - * optional uint32 cur_chat_bubble = 5; - * @return the curChatBubble + * optional uint32 retcode = 11; + * @return the retcode */ - public int getCurChatBubble() { - return curChatBubble; + public int getRetcode() { + return retcode; } /** - * optional uint32 cur_chat_bubble = 5; - * @param value the curChatBubble to set + * optional uint32 retcode = 11; + * @param value the retcode to set * @return this */ - public SelectChatBubbleScRsp setCurChatBubble(final int value) { + public SelectChatBubbleScRsp setRetcode(final int value) { bitField0_ |= 0x00000001; - curChatBubble = value; + retcode = value; return this; } /** - * optional uint32 retcode = 6; - * @return whether the retcode field is set + * optional uint32 cur_chat_bubble = 15; + * @return whether the curChatBubble field is set */ - public boolean hasRetcode() { + public boolean hasCurChatBubble() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 retcode = 6; + * optional uint32 cur_chat_bubble = 15; * @return this */ - public SelectChatBubbleScRsp clearRetcode() { + public SelectChatBubbleScRsp clearCurChatBubble() { bitField0_ &= ~0x00000002; - retcode = 0; + curChatBubble = 0; return this; } /** - * optional uint32 retcode = 6; - * @return the retcode + * optional uint32 cur_chat_bubble = 15; + * @return the curChatBubble */ - public int getRetcode() { - return retcode; + public int getCurChatBubble() { + return curChatBubble; } /** - * optional uint32 retcode = 6; - * @param value the retcode to set + * optional uint32 cur_chat_bubble = 15; + * @param value the curChatBubble to set * @return this */ - public SelectChatBubbleScRsp setRetcode(final int value) { + public SelectChatBubbleScRsp setCurChatBubble(final int value) { bitField0_ |= 0x00000002; - retcode = value; + curChatBubble = value; return this; } @@ -117,8 +117,8 @@ public SelectChatBubbleScRsp copyFrom(final SelectChatBubbleScRsp other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - curChatBubble = other.curChatBubble; retcode = other.retcode; + curChatBubble = other.curChatBubble; } return this; } @@ -129,12 +129,12 @@ public SelectChatBubbleScRsp mergeFrom(final SelectChatBubbleScRsp other) { return this; } cachedSize = -1; - if (other.hasCurChatBubble()) { - setCurChatBubble(other.curChatBubble); - } if (other.hasRetcode()) { setRetcode(other.retcode); } + if (other.hasCurChatBubble()) { + setCurChatBubble(other.curChatBubble); + } return this; } @@ -145,8 +145,8 @@ public SelectChatBubbleScRsp clear() { } cachedSize = -1; bitField0_ = 0; - curChatBubble = 0; retcode = 0; + curChatBubble = 0; return this; } @@ -170,19 +170,19 @@ public boolean equals(Object o) { } SelectChatBubbleScRsp other = (SelectChatBubbleScRsp) o; return bitField0_ == other.bitField0_ - && (!hasCurChatBubble() || curChatBubble == other.curChatBubble) - && (!hasRetcode() || retcode == other.retcode); + && (!hasRetcode() || retcode == other.retcode) + && (!hasCurChatBubble() || curChatBubble == other.curChatBubble); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 40); - output.writeUInt32NoTag(curChatBubble); + output.writeRawByte((byte) 88); + output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 48); - output.writeUInt32NoTag(retcode); + output.writeRawByte((byte) 120); + output.writeUInt32NoTag(curChatBubble); } } @@ -190,10 +190,10 @@ public void writeTo(final ProtoSink output) throws IOException { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(curChatBubble); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(curChatBubble); } return size; } @@ -205,18 +205,18 @@ public SelectChatBubbleScRsp mergeFrom(final ProtoSource input) throws IOExcepti int tag = input.readTag(); while (true) { switch (tag) { - case 40: { - // curChatBubble - curChatBubble = input.readUInt32(); + case 88: { + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 48) { + if (tag != 120) { break; } } - case 48: { - // retcode - retcode = input.readUInt32(); + case 120: { + // curChatBubble + curChatBubble = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -241,10 +241,10 @@ public SelectChatBubbleScRsp mergeFrom(final ProtoSource input) throws IOExcepti public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.curChatBubble, curChatBubble); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.curChatBubble, curChatBubble); } output.endObject(); } @@ -256,11 +256,10 @@ public SelectChatBubbleScRsp mergeFrom(final JsonSource input) throws IOExceptio } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 94167140: - case 1828957140: { - if (input.isAtField(FieldNames.curChatBubble)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - curChatBubble = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -268,10 +267,11 @@ public SelectChatBubbleScRsp mergeFrom(final JsonSource input) throws IOExceptio } break; } - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case 94167140: + case 1828957140: { + if (input.isAtField(FieldNames.curChatBubble)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + curChatBubble = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -332,9 +332,9 @@ public SelectChatBubbleScRsp create() { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName curChatBubble = FieldName.forField("curChatBubble", "cur_chat_bubble"); - static final FieldName retcode = FieldName.forField("retcode"); + + static final FieldName curChatBubble = FieldName.forField("curChatBubble", "cur_chat_bubble"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/SelectPhoneThemeCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SelectPhoneThemeCsReqOuterClass.java index 9333a0493..ed0335bad 100644 --- a/src/generated/main/emu/lunarcore/proto/SelectPhoneThemeCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SelectPhoneThemeCsReqOuterClass.java @@ -19,7 +19,7 @@ public static final class SelectPhoneThemeCsReq extends ProtoMessageoptional uint32 theme_id = 3; + * optional uint32 theme_id = 12; */ private int themeId; @@ -34,7 +34,7 @@ public static SelectPhoneThemeCsReq newInstance() { } /** - * optional uint32 theme_id = 3; + * optional uint32 theme_id = 12; * @return whether the themeId field is set */ public boolean hasThemeId() { @@ -42,7 +42,7 @@ public boolean hasThemeId() { } /** - * optional uint32 theme_id = 3; + * optional uint32 theme_id = 12; * @return this */ public SelectPhoneThemeCsReq clearThemeId() { @@ -52,7 +52,7 @@ public SelectPhoneThemeCsReq clearThemeId() { } /** - * optional uint32 theme_id = 3; + * optional uint32 theme_id = 12; * @return the themeId */ public int getThemeId() { @@ -60,7 +60,7 @@ public int getThemeId() { } /** - * optional uint32 theme_id = 3; + * optional uint32 theme_id = 12; * @param value the themeId to set * @return this */ @@ -129,7 +129,7 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(themeId); } } @@ -150,7 +150,7 @@ public SelectPhoneThemeCsReq mergeFrom(final ProtoSource input) throws IOExcepti int tag = input.readTag(); while (true) { switch (tag) { - case 24: { + case 96: { // themeId themeId = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/SelectPhoneThemeScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/SelectPhoneThemeScRspOuterClass.java index b8e7a4c45..88b52ed93 100644 --- a/src/generated/main/emu/lunarcore/proto/SelectPhoneThemeScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SelectPhoneThemeScRspOuterClass.java @@ -19,12 +19,12 @@ public static final class SelectPhoneThemeScRsp extends ProtoMessageoptional uint32 cur_phone_theme = 5; + * optional uint32 cur_phone_theme = 2; */ private int curPhoneTheme; /** - * optional uint32 retcode = 6; + * optional uint32 retcode = 14; */ private int retcode; @@ -39,7 +39,7 @@ public static SelectPhoneThemeScRsp newInstance() { } /** - * optional uint32 cur_phone_theme = 5; + * optional uint32 cur_phone_theme = 2; * @return whether the curPhoneTheme field is set */ public boolean hasCurPhoneTheme() { @@ -47,7 +47,7 @@ public boolean hasCurPhoneTheme() { } /** - * optional uint32 cur_phone_theme = 5; + * optional uint32 cur_phone_theme = 2; * @return this */ public SelectPhoneThemeScRsp clearCurPhoneTheme() { @@ -57,7 +57,7 @@ public SelectPhoneThemeScRsp clearCurPhoneTheme() { } /** - * optional uint32 cur_phone_theme = 5; + * optional uint32 cur_phone_theme = 2; * @return the curPhoneTheme */ public int getCurPhoneTheme() { @@ -65,7 +65,7 @@ public int getCurPhoneTheme() { } /** - * optional uint32 cur_phone_theme = 5; + * optional uint32 cur_phone_theme = 2; * @param value the curPhoneTheme to set * @return this */ @@ -76,7 +76,7 @@ public SelectPhoneThemeScRsp setCurPhoneTheme(final int value) { } /** - * optional uint32 retcode = 6; + * optional uint32 retcode = 14; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -84,7 +84,7 @@ public boolean hasRetcode() { } /** - * optional uint32 retcode = 6; + * optional uint32 retcode = 14; * @return this */ public SelectPhoneThemeScRsp clearRetcode() { @@ -94,7 +94,7 @@ public SelectPhoneThemeScRsp clearRetcode() { } /** - * optional uint32 retcode = 6; + * optional uint32 retcode = 14; * @return the retcode */ public int getRetcode() { @@ -102,7 +102,7 @@ public int getRetcode() { } /** - * optional uint32 retcode = 6; + * optional uint32 retcode = 14; * @param value the retcode to set * @return this */ @@ -177,11 +177,11 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(curPhoneTheme); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(retcode); } } @@ -205,16 +205,16 @@ public SelectPhoneThemeScRsp mergeFrom(final ProtoSource input) throws IOExcepti int tag = input.readTag(); while (true) { switch (tag) { - case 40: { + case 16: { // curPhoneTheme curPhoneTheme = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 48) { + if (tag != 112) { break; } } - case 48: { + case 112: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/SellItemCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SellItemCsReqOuterClass.java index 7a59f57fc..c85d3ab72 100644 --- a/src/generated/main/emu/lunarcore/proto/SellItemCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SellItemCsReqOuterClass.java @@ -19,7 +19,7 @@ public static final class SellItemCsReq extends ProtoMessage impl private static final long serialVersionUID = 0L; /** - * optional .ItemCostList item_cost_list = 4; + * optional .ItemCostList item_cost_list = 8; */ private final ItemCostListOuterClass.ItemCostList itemCostList = ItemCostListOuterClass.ItemCostList.newInstance(); @@ -34,7 +34,7 @@ public static SellItemCsReq newInstance() { } /** - * optional .ItemCostList item_cost_list = 4; + * optional .ItemCostList item_cost_list = 8; * @return whether the itemCostList field is set */ public boolean hasItemCostList() { @@ -42,7 +42,7 @@ public boolean hasItemCostList() { } /** - * optional .ItemCostList item_cost_list = 4; + * optional .ItemCostList item_cost_list = 8; * @return this */ public SellItemCsReq clearItemCostList() { @@ -52,7 +52,7 @@ public SellItemCsReq clearItemCostList() { } /** - * optional .ItemCostList item_cost_list = 4; + * optional .ItemCostList item_cost_list = 8; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -66,7 +66,7 @@ public ItemCostListOuterClass.ItemCostList getItemCostList() { } /** - * optional .ItemCostList item_cost_list = 4; + * optional .ItemCostList item_cost_list = 8; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -80,7 +80,7 @@ public ItemCostListOuterClass.ItemCostList getMutableItemCostList() { } /** - * optional .ItemCostList item_cost_list = 4; + * optional .ItemCostList item_cost_list = 8; * @param value the itemCostList to set * @return this */ @@ -150,7 +150,7 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 34); + output.writeRawByte((byte) 66); output.writeMessageNoTag(itemCostList); } } @@ -171,7 +171,7 @@ public SellItemCsReq mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 34: { + case 66: { // itemCostList input.readMessage(itemCostList); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/SellItemScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/SellItemScRspOuterClass.java index 2c0e40dd2..1dbe2e5e6 100644 --- a/src/generated/main/emu/lunarcore/proto/SellItemScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SellItemScRspOuterClass.java @@ -19,12 +19,12 @@ public static final class SellItemScRsp extends ProtoMessage impl private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 1; */ private int retcode; /** - * optional .ItemList return_item_list = 15; + * optional .ItemList return_item_list = 2; */ private final ItemListOuterClass.ItemList returnItemList = ItemListOuterClass.ItemList.newInstance(); @@ -39,7 +39,7 @@ public static SellItemScRsp newInstance() { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 1; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public boolean hasRetcode() { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 1; * @return this */ public SellItemScRsp clearRetcode() { @@ -57,7 +57,7 @@ public SellItemScRsp clearRetcode() { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 1; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public int getRetcode() { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 1; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public SellItemScRsp setRetcode(final int value) { } /** - * optional .ItemList return_item_list = 15; + * optional .ItemList return_item_list = 2; * @return whether the returnItemList field is set */ public boolean hasReturnItemList() { @@ -84,7 +84,7 @@ public boolean hasReturnItemList() { } /** - * optional .ItemList return_item_list = 15; + * optional .ItemList return_item_list = 2; * @return this */ public SellItemScRsp clearReturnItemList() { @@ -94,7 +94,7 @@ public SellItemScRsp clearReturnItemList() { } /** - * optional .ItemList return_item_list = 15; + * optional .ItemList return_item_list = 2; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -108,7 +108,7 @@ public ItemListOuterClass.ItemList getReturnItemList() { } /** - * optional .ItemList return_item_list = 15; + * optional .ItemList return_item_list = 2; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -122,7 +122,7 @@ public ItemListOuterClass.ItemList getMutableReturnItemList() { } /** - * optional .ItemList return_item_list = 15; + * optional .ItemList return_item_list = 2; * @param value the returnItemList to set * @return this */ @@ -198,11 +198,11 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 122); + output.writeRawByte((byte) 18); output.writeMessageNoTag(returnItemList); } } @@ -226,16 +226,16 @@ public SellItemScRsp mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { + case 8: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 122) { + if (tag != 18) { break; } } - case 122: { + case 18: { // returnItemList input.readMessage(returnItemList); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/SendMsgCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SendMsgCsReqOuterClass.java index c03ee1b03..60c59f052 100644 --- a/src/generated/main/emu/lunarcore/proto/SendMsgCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SendMsgCsReqOuterClass.java @@ -26,22 +26,22 @@ public static final class SendMsgCsReq extends ProtoMessage implem private int emote; /** - * optional .ChatType chat_type = 6; + * optional .MsgType msg_type = 5; */ - private int chatType; + private int msgType; /** - * optional .MsgType msg_type = 10; + * optional .ChatType chat_type = 6; */ - private int msgType; + private int chatType; /** - * optional string text = 8; + * optional string text = 12; */ private final Utf8String text = Utf8String.newEmptyInstance(); /** - * repeated uint32 to_uid_list = 2; + * repeated uint32 to_uid_list = 4; */ private final RepeatedInt toUidList = RepeatedInt.newEmptyInstance(); @@ -93,131 +93,131 @@ public SendMsgCsReq setEmote(final int value) { } /** - * optional .ChatType chat_type = 6; - * @return whether the chatType field is set + * optional .MsgType msg_type = 5; + * @return whether the msgType field is set */ - public boolean hasChatType() { + public boolean hasMsgType() { return (bitField0_ & 0x00000002) != 0; } /** - * optional .ChatType chat_type = 6; + * optional .MsgType msg_type = 5; * @return this */ - public SendMsgCsReq clearChatType() { + public SendMsgCsReq clearMsgType() { bitField0_ &= ~0x00000002; - chatType = 0; + msgType = 0; return this; } /** - * optional .ChatType chat_type = 6; - * @return the chatType + * optional .MsgType msg_type = 5; + * @return the msgType */ - public ChatTypeOuterClass.ChatType getChatType() { - return ChatTypeOuterClass.ChatType.forNumber(chatType); + public MsgTypeOuterClass.MsgType getMsgType() { + return MsgTypeOuterClass.MsgType.forNumber(msgType); } /** * Gets the value of the internal enum store. The result is - * equivalent to {@link SendMsgCsReq#getChatType()}.getNumber(). + * equivalent to {@link SendMsgCsReq#getMsgType()}.getNumber(). * * @return numeric wire representation */ - public int getChatTypeValue() { - return chatType; + public int getMsgTypeValue() { + return msgType; } /** * Sets the value of the internal enum store. This does not * do any validity checks, so be sure to use appropriate value - * constants from {@link ChatTypeOuterClass.ChatType}. Setting an invalid value - * can cause {@link SendMsgCsReq#getChatType()} to return null + * constants from {@link MsgTypeOuterClass.MsgType}. Setting an invalid value + * can cause {@link SendMsgCsReq#getMsgType()} to return null * * @param value the numeric wire value to set * @return this */ - public SendMsgCsReq setChatTypeValue(final int value) { + public SendMsgCsReq setMsgTypeValue(final int value) { bitField0_ |= 0x00000002; - chatType = value; + msgType = value; return this; } /** - * optional .ChatType chat_type = 6; - * @param value the chatType to set + * optional .MsgType msg_type = 5; + * @param value the msgType to set * @return this */ - public SendMsgCsReq setChatType(final ChatTypeOuterClass.ChatType value) { + public SendMsgCsReq setMsgType(final MsgTypeOuterClass.MsgType value) { bitField0_ |= 0x00000002; - chatType = value.getNumber(); + msgType = value.getNumber(); return this; } /** - * optional .MsgType msg_type = 10; - * @return whether the msgType field is set + * optional .ChatType chat_type = 6; + * @return whether the chatType field is set */ - public boolean hasMsgType() { + public boolean hasChatType() { return (bitField0_ & 0x00000004) != 0; } /** - * optional .MsgType msg_type = 10; + * optional .ChatType chat_type = 6; * @return this */ - public SendMsgCsReq clearMsgType() { + public SendMsgCsReq clearChatType() { bitField0_ &= ~0x00000004; - msgType = 0; + chatType = 0; return this; } /** - * optional .MsgType msg_type = 10; - * @return the msgType + * optional .ChatType chat_type = 6; + * @return the chatType */ - public MsgTypeOuterClass.MsgType getMsgType() { - return MsgTypeOuterClass.MsgType.forNumber(msgType); + public ChatTypeOuterClass.ChatType getChatType() { + return ChatTypeOuterClass.ChatType.forNumber(chatType); } /** * Gets the value of the internal enum store. The result is - * equivalent to {@link SendMsgCsReq#getMsgType()}.getNumber(). + * equivalent to {@link SendMsgCsReq#getChatType()}.getNumber(). * * @return numeric wire representation */ - public int getMsgTypeValue() { - return msgType; + public int getChatTypeValue() { + return chatType; } /** * Sets the value of the internal enum store. This does not * do any validity checks, so be sure to use appropriate value - * constants from {@link MsgTypeOuterClass.MsgType}. Setting an invalid value - * can cause {@link SendMsgCsReq#getMsgType()} to return null + * constants from {@link ChatTypeOuterClass.ChatType}. Setting an invalid value + * can cause {@link SendMsgCsReq#getChatType()} to return null * * @param value the numeric wire value to set * @return this */ - public SendMsgCsReq setMsgTypeValue(final int value) { + public SendMsgCsReq setChatTypeValue(final int value) { bitField0_ |= 0x00000004; - msgType = value; + chatType = value; return this; } /** - * optional .MsgType msg_type = 10; - * @param value the msgType to set + * optional .ChatType chat_type = 6; + * @param value the chatType to set * @return this */ - public SendMsgCsReq setMsgType(final MsgTypeOuterClass.MsgType value) { + public SendMsgCsReq setChatType(final ChatTypeOuterClass.ChatType value) { bitField0_ |= 0x00000004; - msgType = value.getNumber(); + chatType = value.getNumber(); return this; } /** - * optional string text = 8; + * optional string text = 12; * @return whether the text field is set */ public boolean hasText() { @@ -225,7 +225,7 @@ public boolean hasText() { } /** - * optional string text = 8; + * optional string text = 12; * @return this */ public SendMsgCsReq clearText() { @@ -235,7 +235,7 @@ public SendMsgCsReq clearText() { } /** - * optional string text = 8; + * optional string text = 12; * @return the text */ public String getText() { @@ -243,7 +243,7 @@ public String getText() { } /** - * optional string text = 8; + * optional string text = 12; * @return internal {@code Utf8String} representation of text for reading */ public Utf8String getTextBytes() { @@ -251,7 +251,7 @@ public Utf8String getTextBytes() { } /** - * optional string text = 8; + * optional string text = 12; * @return internal {@code Utf8String} representation of text for modifications */ public Utf8String getMutableTextBytes() { @@ -260,7 +260,7 @@ public Utf8String getMutableTextBytes() { } /** - * optional string text = 8; + * optional string text = 12; * @param value the text to set * @return this */ @@ -271,7 +271,7 @@ public SendMsgCsReq setText(final CharSequence value) { } /** - * optional string text = 8; + * optional string text = 12; * @param value the text to set * @return this */ @@ -282,7 +282,7 @@ public SendMsgCsReq setText(final Utf8String value) { } /** - * repeated uint32 to_uid_list = 2; + * repeated uint32 to_uid_list = 4; * @return whether the toUidList field is set */ public boolean hasToUidList() { @@ -290,7 +290,7 @@ public boolean hasToUidList() { } /** - * repeated uint32 to_uid_list = 2; + * repeated uint32 to_uid_list = 4; * @return this */ public SendMsgCsReq clearToUidList() { @@ -300,7 +300,7 @@ public SendMsgCsReq clearToUidList() { } /** - * repeated uint32 to_uid_list = 2; + * repeated uint32 to_uid_list = 4; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -314,7 +314,7 @@ public RepeatedInt getToUidList() { } /** - * repeated uint32 to_uid_list = 2; + * repeated uint32 to_uid_list = 4; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -328,7 +328,7 @@ public RepeatedInt getMutableToUidList() { } /** - * repeated uint32 to_uid_list = 2; + * repeated uint32 to_uid_list = 4; * @param value the toUidList to add * @return this */ @@ -339,7 +339,7 @@ public SendMsgCsReq addToUidList(final int value) { } /** - * repeated uint32 to_uid_list = 2; + * repeated uint32 to_uid_list = 4; * @param values the toUidList to add * @return this */ @@ -355,8 +355,8 @@ public SendMsgCsReq copyFrom(final SendMsgCsReq other) { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; emote = other.emote; - chatType = other.chatType; msgType = other.msgType; + chatType = other.chatType; text.copyFrom(other.text); toUidList.copyFrom(other.toUidList); } @@ -372,12 +372,12 @@ public SendMsgCsReq mergeFrom(final SendMsgCsReq other) { if (other.hasEmote()) { setEmote(other.emote); } - if (other.hasChatType()) { - setChatTypeValue(other.chatType); - } if (other.hasMsgType()) { setMsgTypeValue(other.msgType); } + if (other.hasChatType()) { + setChatTypeValue(other.chatType); + } if (other.hasText()) { getMutableTextBytes().copyFrom(other.text); } @@ -395,8 +395,8 @@ public SendMsgCsReq clear() { cachedSize = -1; bitField0_ = 0; emote = 0; - chatType = 0; msgType = 0; + chatType = 0; text.clear(); toUidList.clear(); return this; @@ -425,8 +425,8 @@ public boolean equals(Object o) { SendMsgCsReq other = (SendMsgCsReq) o; return bitField0_ == other.bitField0_ && (!hasEmote() || emote == other.emote) - && (!hasChatType() || chatType == other.chatType) && (!hasMsgType() || msgType == other.msgType) + && (!hasChatType() || chatType == other.chatType) && (!hasText() || text.equals(other.text)) && (!hasToUidList() || toUidList.equals(other.toUidList)); } @@ -438,20 +438,20 @@ public void writeTo(final ProtoSink output) throws IOException { output.writeUInt32NoTag(emote); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 48); - output.writeEnumNoTag(chatType); + output.writeRawByte((byte) 40); + output.writeEnumNoTag(msgType); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 80); - output.writeEnumNoTag(msgType); + output.writeRawByte((byte) 48); + output.writeEnumNoTag(chatType); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 66); + output.writeRawByte((byte) 98); output.writeStringNoTag(text); } if ((bitField0_ & 0x00000010) != 0) { for (int i = 0; i < toUidList.length(); i++) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(toUidList.array()[i]); } } @@ -464,10 +464,10 @@ protected int computeSerializedSize() { size += 1 + ProtoSink.computeUInt32SizeNoTag(emote); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeEnumSizeNoTag(chatType); + size += 1 + ProtoSink.computeEnumSizeNoTag(msgType); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeEnumSizeNoTag(msgType); + size += 1 + ProtoSink.computeEnumSizeNoTag(chatType); } if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeStringSizeNoTag(text); @@ -490,44 +490,44 @@ public SendMsgCsReq mergeFrom(final ProtoSource input) throws IOException { emote = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 48) { + if (tag != 40) { break; } } - case 48: { - // chatType + case 40: { + // msgType final int value = input.readInt32(); - if (ChatTypeOuterClass.ChatType.forNumber(value) != null) { - chatType = value; + if (MsgTypeOuterClass.MsgType.forNumber(value) != null) { + msgType = value; bitField0_ |= 0x00000002; } tag = input.readTag(); - if (tag != 80) { + if (tag != 48) { break; } } - case 80: { - // msgType + case 48: { + // chatType final int value = input.readInt32(); - if (MsgTypeOuterClass.MsgType.forNumber(value) != null) { - msgType = value; + if (ChatTypeOuterClass.ChatType.forNumber(value) != null) { + chatType = value; bitField0_ |= 0x00000004; } tag = input.readTag(); - if (tag != 66) { + if (tag != 98) { break; } } - case 66: { + case 98: { // text input.readString(text); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 18) { + if (tag != 34) { break; } } - case 18: { + case 34: { // toUidList [packed=true] input.readPackedUInt32(toUidList, tag); bitField0_ |= 0x00000010; @@ -546,7 +546,7 @@ public SendMsgCsReq mergeFrom(final ProtoSource input) throws IOException { tag = input.readTag(); break; } - case 16: { + case 32: { // toUidList [packed=false] tag = input.readRepeatedUInt32(toUidList, tag); bitField0_ |= 0x00000010; @@ -563,10 +563,10 @@ public void writeTo(final JsonSink output) throws IOException { output.writeUInt32(FieldNames.emote, emote); } if ((bitField0_ & 0x00000002) != 0) { - output.writeEnum(FieldNames.chatType, chatType, ChatTypeOuterClass.ChatType.converter()); + output.writeEnum(FieldNames.msgType, msgType, MsgTypeOuterClass.MsgType.converter()); } if ((bitField0_ & 0x00000004) != 0) { - output.writeEnum(FieldNames.msgType, msgType, MsgTypeOuterClass.MsgType.converter()); + output.writeEnum(FieldNames.chatType, chatType, ChatTypeOuterClass.ChatType.converter()); } if ((bitField0_ & 0x00000008) != 0) { output.writeString(FieldNames.text, text); @@ -595,13 +595,13 @@ public SendMsgCsReq mergeFrom(final JsonSource input) throws IOException { } break; } - case 1437412018: - case 1620118465: { - if (input.isAtField(FieldNames.chatType)) { + case 1343750747: + case -1283380936: { + if (input.isAtField(FieldNames.msgType)) { if (!input.trySkipNullValue()) { - final ChatTypeOuterClass.ChatType value = input.readEnum(ChatTypeOuterClass.ChatType.converter()); + final MsgTypeOuterClass.MsgType value = input.readEnum(MsgTypeOuterClass.MsgType.converter()); if (value != null) { - chatType = value.getNumber(); + msgType = value.getNumber(); bitField0_ |= 0x00000002; } else { input.skipUnknownEnumValue(); @@ -612,13 +612,13 @@ public SendMsgCsReq mergeFrom(final JsonSource input) throws IOException { } break; } - case 1343750747: - case -1283380936: { - if (input.isAtField(FieldNames.msgType)) { + case 1437412018: + case 1620118465: { + if (input.isAtField(FieldNames.chatType)) { if (!input.trySkipNullValue()) { - final MsgTypeOuterClass.MsgType value = input.readEnum(MsgTypeOuterClass.MsgType.converter()); + final ChatTypeOuterClass.ChatType value = input.readEnum(ChatTypeOuterClass.ChatType.converter()); if (value != null) { - msgType = value.getNumber(); + chatType = value.getNumber(); bitField0_ |= 0x00000004; } else { input.skipUnknownEnumValue(); @@ -706,10 +706,10 @@ public SendMsgCsReq create() { static class FieldNames { static final FieldName emote = FieldName.forField("emote"); - static final FieldName chatType = FieldName.forField("chatType", "chat_type"); - static final FieldName msgType = FieldName.forField("msgType", "msg_type"); + static final FieldName chatType = FieldName.forField("chatType", "chat_type"); + static final FieldName text = FieldName.forField("text"); static final FieldName toUidList = FieldName.forField("toUidList", "to_uid_list"); diff --git a/src/generated/main/emu/lunarcore/proto/SetClientPausedCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SetClientPausedCsReqOuterClass.java index 50cfb15e9..8afb33279 100644 --- a/src/generated/main/emu/lunarcore/proto/SetClientPausedCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SetClientPausedCsReqOuterClass.java @@ -19,7 +19,7 @@ public static final class SetClientPausedCsReq extends ProtoMessageoptional bool paused = 2; + * optional bool paused = 13; */ private boolean paused; @@ -34,7 +34,7 @@ public static SetClientPausedCsReq newInstance() { } /** - * optional bool paused = 2; + * optional bool paused = 13; * @return whether the paused field is set */ public boolean hasPaused() { @@ -42,7 +42,7 @@ public boolean hasPaused() { } /** - * optional bool paused = 2; + * optional bool paused = 13; * @return this */ public SetClientPausedCsReq clearPaused() { @@ -52,7 +52,7 @@ public SetClientPausedCsReq clearPaused() { } /** - * optional bool paused = 2; + * optional bool paused = 13; * @return the paused */ public boolean getPaused() { @@ -60,7 +60,7 @@ public boolean getPaused() { } /** - * optional bool paused = 2; + * optional bool paused = 13; * @param value the paused to set * @return this */ @@ -129,7 +129,7 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 104); output.writeBoolNoTag(paused); } } @@ -150,7 +150,7 @@ public SetClientPausedCsReq mergeFrom(final ProtoSource input) throws IOExceptio int tag = input.readTag(); while (true) { switch (tag) { - case 16: { + case 104: { // paused paused = input.readBool(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/SetClientPausedScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/SetClientPausedScRspOuterClass.java index 260f9c111..f1635feac 100644 --- a/src/generated/main/emu/lunarcore/proto/SetClientPausedScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SetClientPausedScRspOuterClass.java @@ -19,12 +19,12 @@ public static final class SetClientPausedScRsp extends ProtoMessageoptional uint32 retcode = 2; + * optional uint32 retcode = 14; */ private int retcode; /** - * optional bool paused = 12; + * optional bool paused = 1; */ private boolean paused; @@ -39,7 +39,7 @@ public static SetClientPausedScRsp newInstance() { } /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 14; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public boolean hasRetcode() { } /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 14; * @return this */ public SetClientPausedScRsp clearRetcode() { @@ -57,7 +57,7 @@ public SetClientPausedScRsp clearRetcode() { } /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 14; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public int getRetcode() { } /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 14; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public SetClientPausedScRsp setRetcode(final int value) { } /** - * optional bool paused = 12; + * optional bool paused = 1; * @return whether the paused field is set */ public boolean hasPaused() { @@ -84,7 +84,7 @@ public boolean hasPaused() { } /** - * optional bool paused = 12; + * optional bool paused = 1; * @return this */ public SetClientPausedScRsp clearPaused() { @@ -94,7 +94,7 @@ public SetClientPausedScRsp clearPaused() { } /** - * optional bool paused = 12; + * optional bool paused = 1; * @return the paused */ public boolean getPaused() { @@ -102,7 +102,7 @@ public boolean getPaused() { } /** - * optional bool paused = 12; + * optional bool paused = 1; * @param value the paused to set * @return this */ @@ -177,11 +177,11 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 8); output.writeBoolNoTag(paused); } } @@ -205,16 +205,16 @@ public SetClientPausedScRsp mergeFrom(final ProtoSource input) throws IOExceptio int tag = input.readTag(); while (true) { switch (tag) { - case 16: { + case 112: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 96) { + if (tag != 8) { break; } } - case 96: { + case 8: { // paused paused = input.readBool(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/SetFriendMarkCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SetFriendMarkCsReqOuterClass.java new file mode 100644 index 000000000..0d29848fb --- /dev/null +++ b/src/generated/main/emu/lunarcore/proto/SetFriendMarkCsReqOuterClass.java @@ -0,0 +1,340 @@ +// Code generated by protocol buffer compiler. Do not edit! +package emu.lunarcore.proto; + +import java.io.IOException; +import us.hebi.quickbuf.FieldName; +import us.hebi.quickbuf.InvalidProtocolBufferException; +import us.hebi.quickbuf.JsonSink; +import us.hebi.quickbuf.JsonSource; +import us.hebi.quickbuf.MessageFactory; +import us.hebi.quickbuf.ProtoMessage; +import us.hebi.quickbuf.ProtoSink; +import us.hebi.quickbuf.ProtoSource; + +public final class SetFriendMarkCsReqOuterClass { + /** + * Protobuf type {@code SetFriendMarkCsReq} + */ + public static final class SetFriendMarkCsReq extends ProtoMessage implements Cloneable { + private static final long serialVersionUID = 0L; + + /** + * optional uint32 uid = 11; + */ + private int uid; + + /** + * optional bool is_set_mark = 4; + */ + private boolean isSetMark; + + private SetFriendMarkCsReq() { + } + + /** + * @return a new empty instance of {@code SetFriendMarkCsReq} + */ + public static SetFriendMarkCsReq newInstance() { + return new SetFriendMarkCsReq(); + } + + /** + * optional uint32 uid = 11; + * @return whether the uid field is set + */ + public boolean hasUid() { + return (bitField0_ & 0x00000001) != 0; + } + + /** + * optional uint32 uid = 11; + * @return this + */ + public SetFriendMarkCsReq clearUid() { + bitField0_ &= ~0x00000001; + uid = 0; + return this; + } + + /** + * optional uint32 uid = 11; + * @return the uid + */ + public int getUid() { + return uid; + } + + /** + * optional uint32 uid = 11; + * @param value the uid to set + * @return this + */ + public SetFriendMarkCsReq setUid(final int value) { + bitField0_ |= 0x00000001; + uid = value; + return this; + } + + /** + * optional bool is_set_mark = 4; + * @return whether the isSetMark field is set + */ + public boolean hasIsSetMark() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional bool is_set_mark = 4; + * @return this + */ + public SetFriendMarkCsReq clearIsSetMark() { + bitField0_ &= ~0x00000002; + isSetMark = false; + return this; + } + + /** + * optional bool is_set_mark = 4; + * @return the isSetMark + */ + public boolean getIsSetMark() { + return isSetMark; + } + + /** + * optional bool is_set_mark = 4; + * @param value the isSetMark to set + * @return this + */ + public SetFriendMarkCsReq setIsSetMark(final boolean value) { + bitField0_ |= 0x00000002; + isSetMark = value; + return this; + } + + @Override + public SetFriendMarkCsReq copyFrom(final SetFriendMarkCsReq other) { + cachedSize = other.cachedSize; + if ((bitField0_ | other.bitField0_) != 0) { + bitField0_ = other.bitField0_; + uid = other.uid; + isSetMark = other.isSetMark; + } + return this; + } + + @Override + public SetFriendMarkCsReq mergeFrom(final SetFriendMarkCsReq other) { + if (other.isEmpty()) { + return this; + } + cachedSize = -1; + if (other.hasUid()) { + setUid(other.uid); + } + if (other.hasIsSetMark()) { + setIsSetMark(other.isSetMark); + } + return this; + } + + @Override + public SetFriendMarkCsReq clear() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + uid = 0; + isSetMark = false; + return this; + } + + @Override + public SetFriendMarkCsReq clearQuick() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + return this; + } + + @Override + public boolean equals(Object o) { + if (o == this) { + return true; + } + if (!(o instanceof SetFriendMarkCsReq)) { + return false; + } + SetFriendMarkCsReq other = (SetFriendMarkCsReq) o; + return bitField0_ == other.bitField0_ + && (!hasUid() || uid == other.uid) + && (!hasIsSetMark() || isSetMark == other.isSetMark); + } + + @Override + public void writeTo(final ProtoSink output) throws IOException { + if ((bitField0_ & 0x00000001) != 0) { + output.writeRawByte((byte) 88); + output.writeUInt32NoTag(uid); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 32); + output.writeBoolNoTag(isSetMark); + } + } + + @Override + protected int computeSerializedSize() { + int size = 0; + if ((bitField0_ & 0x00000001) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(uid); + } + if ((bitField0_ & 0x00000002) != 0) { + size += 2; + } + return size; + } + + @Override + @SuppressWarnings("fallthrough") + public SetFriendMarkCsReq mergeFrom(final ProtoSource input) throws IOException { + // Enabled Fall-Through Optimization (QuickBuffers) + int tag = input.readTag(); + while (true) { + switch (tag) { + case 88: { + // uid + uid = input.readUInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 32) { + break; + } + } + case 32: { + // isSetMark + isSetMark = input.readBool(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 0) { + break; + } + } + case 0: { + return this; + } + default: { + if (!input.skipField(tag)) { + return this; + } + tag = input.readTag(); + break; + } + } + } + } + + @Override + public void writeTo(final JsonSink output) throws IOException { + output.beginObject(); + if ((bitField0_ & 0x00000001) != 0) { + output.writeUInt32(FieldNames.uid, uid); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeBool(FieldNames.isSetMark, isSetMark); + } + output.endObject(); + } + + @Override + public SetFriendMarkCsReq mergeFrom(final JsonSource input) throws IOException { + if (!input.beginObject()) { + return this; + } + while (!input.isAtEnd()) { + switch (input.readFieldHash()) { + case 115792: { + if (input.isAtField(FieldNames.uid)) { + if (!input.trySkipNullValue()) { + uid = input.readUInt32(); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } + case 1404992965: + case 680313855: { + if (input.isAtField(FieldNames.isSetMark)) { + if (!input.trySkipNullValue()) { + isSetMark = input.readBool(); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + default: { + input.skipUnknownField(); + break; + } + } + } + input.endObject(); + return this; + } + + @Override + public SetFriendMarkCsReq clone() { + return new SetFriendMarkCsReq().copyFrom(this); + } + + @Override + public boolean isEmpty() { + return ((bitField0_) == 0); + } + + public static SetFriendMarkCsReq parseFrom(final byte[] data) throws + InvalidProtocolBufferException { + return ProtoMessage.mergeFrom(new SetFriendMarkCsReq(), data).checkInitialized(); + } + + public static SetFriendMarkCsReq parseFrom(final ProtoSource input) throws IOException { + return ProtoMessage.mergeFrom(new SetFriendMarkCsReq(), input).checkInitialized(); + } + + public static SetFriendMarkCsReq parseFrom(final JsonSource input) throws IOException { + return ProtoMessage.mergeFrom(new SetFriendMarkCsReq(), input).checkInitialized(); + } + + /** + * @return factory for creating SetFriendMarkCsReq messages + */ + public static MessageFactory getFactory() { + return SetFriendMarkCsReqFactory.INSTANCE; + } + + private enum SetFriendMarkCsReqFactory implements MessageFactory { + INSTANCE; + + @Override + public SetFriendMarkCsReq create() { + return SetFriendMarkCsReq.newInstance(); + } + } + + /** + * Contains name constants used for serializing JSON + */ + static class FieldNames { + static final FieldName uid = FieldName.forField("uid"); + + static final FieldName isSetMark = FieldName.forField("isSetMark", "is_set_mark"); + } + } +} diff --git a/src/generated/main/emu/lunarcore/proto/SetFriendMarkScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/SetFriendMarkScRspOuterClass.java new file mode 100644 index 000000000..c745731a2 --- /dev/null +++ b/src/generated/main/emu/lunarcore/proto/SetFriendMarkScRspOuterClass.java @@ -0,0 +1,420 @@ +// Code generated by protocol buffer compiler. Do not edit! +package emu.lunarcore.proto; + +import java.io.IOException; +import us.hebi.quickbuf.FieldName; +import us.hebi.quickbuf.InvalidProtocolBufferException; +import us.hebi.quickbuf.JsonSink; +import us.hebi.quickbuf.JsonSource; +import us.hebi.quickbuf.MessageFactory; +import us.hebi.quickbuf.ProtoMessage; +import us.hebi.quickbuf.ProtoSink; +import us.hebi.quickbuf.ProtoSource; + +public final class SetFriendMarkScRspOuterClass { + /** + * Protobuf type {@code SetFriendMarkScRsp} + */ + public static final class SetFriendMarkScRsp extends ProtoMessage implements Cloneable { + private static final long serialVersionUID = 0L; + + /** + * optional uint32 uid = 2; + */ + private int uid; + + /** + * optional uint32 retcode = 8; + */ + private int retcode; + + /** + * optional bool is_set_mark = 4; + */ + private boolean isSetMark; + + private SetFriendMarkScRsp() { + } + + /** + * @return a new empty instance of {@code SetFriendMarkScRsp} + */ + public static SetFriendMarkScRsp newInstance() { + return new SetFriendMarkScRsp(); + } + + /** + * optional uint32 uid = 2; + * @return whether the uid field is set + */ + public boolean hasUid() { + return (bitField0_ & 0x00000001) != 0; + } + + /** + * optional uint32 uid = 2; + * @return this + */ + public SetFriendMarkScRsp clearUid() { + bitField0_ &= ~0x00000001; + uid = 0; + return this; + } + + /** + * optional uint32 uid = 2; + * @return the uid + */ + public int getUid() { + return uid; + } + + /** + * optional uint32 uid = 2; + * @param value the uid to set + * @return this + */ + public SetFriendMarkScRsp setUid(final int value) { + bitField0_ |= 0x00000001; + uid = value; + return this; + } + + /** + * optional uint32 retcode = 8; + * @return whether the retcode field is set + */ + public boolean hasRetcode() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 retcode = 8; + * @return this + */ + public SetFriendMarkScRsp clearRetcode() { + bitField0_ &= ~0x00000002; + retcode = 0; + return this; + } + + /** + * optional uint32 retcode = 8; + * @return the retcode + */ + public int getRetcode() { + return retcode; + } + + /** + * optional uint32 retcode = 8; + * @param value the retcode to set + * @return this + */ + public SetFriendMarkScRsp setRetcode(final int value) { + bitField0_ |= 0x00000002; + retcode = value; + return this; + } + + /** + * optional bool is_set_mark = 4; + * @return whether the isSetMark field is set + */ + public boolean hasIsSetMark() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional bool is_set_mark = 4; + * @return this + */ + public SetFriendMarkScRsp clearIsSetMark() { + bitField0_ &= ~0x00000004; + isSetMark = false; + return this; + } + + /** + * optional bool is_set_mark = 4; + * @return the isSetMark + */ + public boolean getIsSetMark() { + return isSetMark; + } + + /** + * optional bool is_set_mark = 4; + * @param value the isSetMark to set + * @return this + */ + public SetFriendMarkScRsp setIsSetMark(final boolean value) { + bitField0_ |= 0x00000004; + isSetMark = value; + return this; + } + + @Override + public SetFriendMarkScRsp copyFrom(final SetFriendMarkScRsp other) { + cachedSize = other.cachedSize; + if ((bitField0_ | other.bitField0_) != 0) { + bitField0_ = other.bitField0_; + uid = other.uid; + retcode = other.retcode; + isSetMark = other.isSetMark; + } + return this; + } + + @Override + public SetFriendMarkScRsp mergeFrom(final SetFriendMarkScRsp other) { + if (other.isEmpty()) { + return this; + } + cachedSize = -1; + if (other.hasUid()) { + setUid(other.uid); + } + if (other.hasRetcode()) { + setRetcode(other.retcode); + } + if (other.hasIsSetMark()) { + setIsSetMark(other.isSetMark); + } + return this; + } + + @Override + public SetFriendMarkScRsp clear() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + uid = 0; + retcode = 0; + isSetMark = false; + return this; + } + + @Override + public SetFriendMarkScRsp clearQuick() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + return this; + } + + @Override + public boolean equals(Object o) { + if (o == this) { + return true; + } + if (!(o instanceof SetFriendMarkScRsp)) { + return false; + } + SetFriendMarkScRsp other = (SetFriendMarkScRsp) o; + return bitField0_ == other.bitField0_ + && (!hasUid() || uid == other.uid) + && (!hasRetcode() || retcode == other.retcode) + && (!hasIsSetMark() || isSetMark == other.isSetMark); + } + + @Override + public void writeTo(final ProtoSink output) throws IOException { + if ((bitField0_ & 0x00000001) != 0) { + output.writeRawByte((byte) 16); + output.writeUInt32NoTag(uid); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 64); + output.writeUInt32NoTag(retcode); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 32); + output.writeBoolNoTag(isSetMark); + } + } + + @Override + protected int computeSerializedSize() { + int size = 0; + if ((bitField0_ & 0x00000001) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(uid); + } + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + } + if ((bitField0_ & 0x00000004) != 0) { + size += 2; + } + return size; + } + + @Override + @SuppressWarnings("fallthrough") + public SetFriendMarkScRsp mergeFrom(final ProtoSource input) throws IOException { + // Enabled Fall-Through Optimization (QuickBuffers) + int tag = input.readTag(); + while (true) { + switch (tag) { + case 16: { + // uid + uid = input.readUInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 64) { + break; + } + } + case 64: { + // retcode + retcode = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 32) { + break; + } + } + case 32: { + // isSetMark + isSetMark = input.readBool(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 0) { + break; + } + } + case 0: { + return this; + } + default: { + if (!input.skipField(tag)) { + return this; + } + tag = input.readTag(); + break; + } + } + } + } + + @Override + public void writeTo(final JsonSink output) throws IOException { + output.beginObject(); + if ((bitField0_ & 0x00000001) != 0) { + output.writeUInt32(FieldNames.uid, uid); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeUInt32(FieldNames.retcode, retcode); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeBool(FieldNames.isSetMark, isSetMark); + } + output.endObject(); + } + + @Override + public SetFriendMarkScRsp mergeFrom(final JsonSource input) throws IOException { + if (!input.beginObject()) { + return this; + } + while (!input.isAtEnd()) { + switch (input.readFieldHash()) { + case 115792: { + if (input.isAtField(FieldNames.uid)) { + if (!input.trySkipNullValue()) { + uid = input.readUInt32(); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { + if (!input.trySkipNullValue()) { + retcode = input.readUInt32(); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + case 1404992965: + case 680313855: { + if (input.isAtField(FieldNames.isSetMark)) { + if (!input.trySkipNullValue()) { + isSetMark = input.readBool(); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } + default: { + input.skipUnknownField(); + break; + } + } + } + input.endObject(); + return this; + } + + @Override + public SetFriendMarkScRsp clone() { + return new SetFriendMarkScRsp().copyFrom(this); + } + + @Override + public boolean isEmpty() { + return ((bitField0_) == 0); + } + + public static SetFriendMarkScRsp parseFrom(final byte[] data) throws + InvalidProtocolBufferException { + return ProtoMessage.mergeFrom(new SetFriendMarkScRsp(), data).checkInitialized(); + } + + public static SetFriendMarkScRsp parseFrom(final ProtoSource input) throws IOException { + return ProtoMessage.mergeFrom(new SetFriendMarkScRsp(), input).checkInitialized(); + } + + public static SetFriendMarkScRsp parseFrom(final JsonSource input) throws IOException { + return ProtoMessage.mergeFrom(new SetFriendMarkScRsp(), input).checkInitialized(); + } + + /** + * @return factory for creating SetFriendMarkScRsp messages + */ + public static MessageFactory getFactory() { + return SetFriendMarkScRspFactory.INSTANCE; + } + + private enum SetFriendMarkScRspFactory implements MessageFactory { + INSTANCE; + + @Override + public SetFriendMarkScRsp create() { + return SetFriendMarkScRsp.newInstance(); + } + } + + /** + * Contains name constants used for serializing JSON + */ + static class FieldNames { + static final FieldName uid = FieldName.forField("uid"); + + static final FieldName retcode = FieldName.forField("retcode"); + + static final FieldName isSetMark = FieldName.forField("isSetMark", "is_set_mark"); + } + } +} diff --git a/src/generated/main/emu/lunarcore/proto/SetGameplayBirthdayScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/SetGameplayBirthdayScRspOuterClass.java index ec48b3b6f..87cbeee39 100644 --- a/src/generated/main/emu/lunarcore/proto/SetGameplayBirthdayScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SetGameplayBirthdayScRspOuterClass.java @@ -19,14 +19,14 @@ public static final class SetGameplayBirthdayScRsp extends ProtoMessageoptional uint32 birthday = 5; + * optional uint32 retcode = 1; */ - private int birthday; + private int retcode; /** - * optional uint32 retcode = 15; + * optional uint32 birthday = 11; */ - private int retcode; + private int birthday; private SetGameplayBirthdayScRsp() { } @@ -39,76 +39,76 @@ public static SetGameplayBirthdayScRsp newInstance() { } /** - * optional uint32 birthday = 5; - * @return whether the birthday field is set + * optional uint32 retcode = 1; + * @return whether the retcode field is set */ - public boolean hasBirthday() { + public boolean hasRetcode() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 birthday = 5; + * optional uint32 retcode = 1; * @return this */ - public SetGameplayBirthdayScRsp clearBirthday() { + public SetGameplayBirthdayScRsp clearRetcode() { bitField0_ &= ~0x00000001; - birthday = 0; + retcode = 0; return this; } /** - * optional uint32 birthday = 5; - * @return the birthday + * optional uint32 retcode = 1; + * @return the retcode */ - public int getBirthday() { - return birthday; + public int getRetcode() { + return retcode; } /** - * optional uint32 birthday = 5; - * @param value the birthday to set + * optional uint32 retcode = 1; + * @param value the retcode to set * @return this */ - public SetGameplayBirthdayScRsp setBirthday(final int value) { + public SetGameplayBirthdayScRsp setRetcode(final int value) { bitField0_ |= 0x00000001; - birthday = value; + retcode = value; return this; } /** - * optional uint32 retcode = 15; - * @return whether the retcode field is set + * optional uint32 birthday = 11; + * @return whether the birthday field is set */ - public boolean hasRetcode() { + public boolean hasBirthday() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 retcode = 15; + * optional uint32 birthday = 11; * @return this */ - public SetGameplayBirthdayScRsp clearRetcode() { + public SetGameplayBirthdayScRsp clearBirthday() { bitField0_ &= ~0x00000002; - retcode = 0; + birthday = 0; return this; } /** - * optional uint32 retcode = 15; - * @return the retcode + * optional uint32 birthday = 11; + * @return the birthday */ - public int getRetcode() { - return retcode; + public int getBirthday() { + return birthday; } /** - * optional uint32 retcode = 15; - * @param value the retcode to set + * optional uint32 birthday = 11; + * @param value the birthday to set * @return this */ - public SetGameplayBirthdayScRsp setRetcode(final int value) { + public SetGameplayBirthdayScRsp setBirthday(final int value) { bitField0_ |= 0x00000002; - retcode = value; + birthday = value; return this; } @@ -117,8 +117,8 @@ public SetGameplayBirthdayScRsp copyFrom(final SetGameplayBirthdayScRsp other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - birthday = other.birthday; retcode = other.retcode; + birthday = other.birthday; } return this; } @@ -129,12 +129,12 @@ public SetGameplayBirthdayScRsp mergeFrom(final SetGameplayBirthdayScRsp other) return this; } cachedSize = -1; - if (other.hasBirthday()) { - setBirthday(other.birthday); - } if (other.hasRetcode()) { setRetcode(other.retcode); } + if (other.hasBirthday()) { + setBirthday(other.birthday); + } return this; } @@ -145,8 +145,8 @@ public SetGameplayBirthdayScRsp clear() { } cachedSize = -1; bitField0_ = 0; - birthday = 0; retcode = 0; + birthday = 0; return this; } @@ -170,19 +170,19 @@ public boolean equals(Object o) { } SetGameplayBirthdayScRsp other = (SetGameplayBirthdayScRsp) o; return bitField0_ == other.bitField0_ - && (!hasBirthday() || birthday == other.birthday) - && (!hasRetcode() || retcode == other.retcode); + && (!hasRetcode() || retcode == other.retcode) + && (!hasBirthday() || birthday == other.birthday); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 40); - output.writeUInt32NoTag(birthday); + output.writeRawByte((byte) 8); + output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 120); - output.writeUInt32NoTag(retcode); + output.writeRawByte((byte) 88); + output.writeUInt32NoTag(birthday); } } @@ -190,10 +190,10 @@ public void writeTo(final ProtoSink output) throws IOException { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(birthday); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(birthday); } return size; } @@ -205,18 +205,18 @@ public SetGameplayBirthdayScRsp mergeFrom(final ProtoSource input) throws IOExce int tag = input.readTag(); while (true) { switch (tag) { - case 40: { - // birthday - birthday = input.readUInt32(); + case 8: { + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 120) { + if (tag != 88) { break; } } - case 120: { - // retcode - retcode = input.readUInt32(); + case 88: { + // birthday + birthday = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -241,10 +241,10 @@ public SetGameplayBirthdayScRsp mergeFrom(final ProtoSource input) throws IOExce public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.birthday, birthday); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.birthday, birthday); } output.endObject(); } @@ -256,10 +256,10 @@ public SetGameplayBirthdayScRsp mergeFrom(final JsonSource input) throws IOExcep } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1069376125: { - if (input.isAtField(FieldNames.birthday)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - birthday = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -267,10 +267,10 @@ public SetGameplayBirthdayScRsp mergeFrom(final JsonSource input) throws IOExcep } break; } - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case 1069376125: { + if (input.isAtField(FieldNames.birthday)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + birthday = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -331,9 +331,9 @@ public SetGameplayBirthdayScRsp create() { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName birthday = FieldName.forField("birthday"); - static final FieldName retcode = FieldName.forField("retcode"); + + static final FieldName birthday = FieldName.forField("birthday"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/SetHeadIconCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SetHeadIconCsReqOuterClass.java index dffad3421..a14934440 100644 --- a/src/generated/main/emu/lunarcore/proto/SetHeadIconCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SetHeadIconCsReqOuterClass.java @@ -19,7 +19,7 @@ public static final class SetHeadIconCsReq extends ProtoMessageoptional uint32 id = 5; + * optional uint32 id = 1; */ private int id; @@ -34,7 +34,7 @@ public static SetHeadIconCsReq newInstance() { } /** - * optional uint32 id = 5; + * optional uint32 id = 1; * @return whether the id field is set */ public boolean hasId() { @@ -42,7 +42,7 @@ public boolean hasId() { } /** - * optional uint32 id = 5; + * optional uint32 id = 1; * @return this */ public SetHeadIconCsReq clearId() { @@ -52,7 +52,7 @@ public SetHeadIconCsReq clearId() { } /** - * optional uint32 id = 5; + * optional uint32 id = 1; * @return the id */ public int getId() { @@ -60,7 +60,7 @@ public int getId() { } /** - * optional uint32 id = 5; + * optional uint32 id = 1; * @param value the id to set * @return this */ @@ -129,7 +129,7 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(id); } } @@ -150,7 +150,7 @@ public SetHeadIconCsReq mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { + case 8: { // id id = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/SetHeadIconScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/SetHeadIconScRspOuterClass.java index 677ffed7c..c3b0faf2c 100644 --- a/src/generated/main/emu/lunarcore/proto/SetHeadIconScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SetHeadIconScRspOuterClass.java @@ -19,12 +19,12 @@ public static final class SetHeadIconScRsp extends ProtoMessageoptional uint32 retcode = 7; + * optional uint32 retcode = 2; */ private int retcode; /** - * optional uint32 current_head_icon_id = 11; + * optional uint32 current_head_icon_id = 13; */ private int currentHeadIconId; @@ -39,7 +39,7 @@ public static SetHeadIconScRsp newInstance() { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 2; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public boolean hasRetcode() { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 2; * @return this */ public SetHeadIconScRsp clearRetcode() { @@ -57,7 +57,7 @@ public SetHeadIconScRsp clearRetcode() { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 2; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public int getRetcode() { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 2; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public SetHeadIconScRsp setRetcode(final int value) { } /** - * optional uint32 current_head_icon_id = 11; + * optional uint32 current_head_icon_id = 13; * @return whether the currentHeadIconId field is set */ public boolean hasCurrentHeadIconId() { @@ -84,7 +84,7 @@ public boolean hasCurrentHeadIconId() { } /** - * optional uint32 current_head_icon_id = 11; + * optional uint32 current_head_icon_id = 13; * @return this */ public SetHeadIconScRsp clearCurrentHeadIconId() { @@ -94,7 +94,7 @@ public SetHeadIconScRsp clearCurrentHeadIconId() { } /** - * optional uint32 current_head_icon_id = 11; + * optional uint32 current_head_icon_id = 13; * @return the currentHeadIconId */ public int getCurrentHeadIconId() { @@ -102,7 +102,7 @@ public int getCurrentHeadIconId() { } /** - * optional uint32 current_head_icon_id = 11; + * optional uint32 current_head_icon_id = 13; * @param value the currentHeadIconId to set * @return this */ @@ -177,11 +177,11 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(currentHeadIconId); } } @@ -205,16 +205,16 @@ public SetHeadIconScRsp mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { + case 16: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 88) { + if (tag != 104) { break; } } - case 88: { + case 104: { // currentHeadIconId currentHeadIconId = input.readUInt32(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/SetHeroBasicTypeCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SetHeroBasicTypeCsReqOuterClass.java index cdd1825af..5ca71efa8 100644 --- a/src/generated/main/emu/lunarcore/proto/SetHeroBasicTypeCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SetHeroBasicTypeCsReqOuterClass.java @@ -19,7 +19,7 @@ public static final class SetHeroBasicTypeCsReq extends ProtoMessageoptional .HeroBasicType basic_type = 7; + * optional .HeroBasicType basic_type = 15; */ private int basicType; @@ -34,7 +34,7 @@ public static SetHeroBasicTypeCsReq newInstance() { } /** - * optional .HeroBasicType basic_type = 7; + * optional .HeroBasicType basic_type = 15; * @return whether the basicType field is set */ public boolean hasBasicType() { @@ -42,7 +42,7 @@ public boolean hasBasicType() { } /** - * optional .HeroBasicType basic_type = 7; + * optional .HeroBasicType basic_type = 15; * @return this */ public SetHeroBasicTypeCsReq clearBasicType() { @@ -52,7 +52,7 @@ public SetHeroBasicTypeCsReq clearBasicType() { } /** - * optional .HeroBasicType basic_type = 7; + * optional .HeroBasicType basic_type = 15; * @return the basicType */ public HeroBasicTypeOuterClass.HeroBasicType getBasicType() { @@ -85,7 +85,7 @@ public SetHeroBasicTypeCsReq setBasicTypeValue(final int value) { } /** - * optional .HeroBasicType basic_type = 7; + * optional .HeroBasicType basic_type = 15; * @param value the basicType to set * @return this */ @@ -154,7 +154,7 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 120); output.writeEnumNoTag(basicType); } } @@ -175,7 +175,7 @@ public SetHeroBasicTypeCsReq mergeFrom(final ProtoSource input) throws IOExcepti int tag = input.readTag(); while (true) { switch (tag) { - case 56: { + case 120: { // basicType final int value = input.readInt32(); if (HeroBasicTypeOuterClass.HeroBasicType.forNumber(value) != null) { diff --git a/src/generated/main/emu/lunarcore/proto/SetHeroBasicTypeScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/SetHeroBasicTypeScRspOuterClass.java index 54a237cc2..04ec17180 100644 --- a/src/generated/main/emu/lunarcore/proto/SetHeroBasicTypeScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SetHeroBasicTypeScRspOuterClass.java @@ -19,12 +19,12 @@ public static final class SetHeroBasicTypeScRsp extends ProtoMessageoptional uint32 retcode = 13; + * optional uint32 retcode = 2; */ private int retcode; /** - * optional .HeroBasicType basic_type = 12; + * optional .HeroBasicType basic_type = 10; */ private int basicType; @@ -39,7 +39,7 @@ public static SetHeroBasicTypeScRsp newInstance() { } /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 2; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public boolean hasRetcode() { } /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 2; * @return this */ public SetHeroBasicTypeScRsp clearRetcode() { @@ -57,7 +57,7 @@ public SetHeroBasicTypeScRsp clearRetcode() { } /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 2; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public int getRetcode() { } /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 2; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public SetHeroBasicTypeScRsp setRetcode(final int value) { } /** - * optional .HeroBasicType basic_type = 12; + * optional .HeroBasicType basic_type = 10; * @return whether the basicType field is set */ public boolean hasBasicType() { @@ -84,7 +84,7 @@ public boolean hasBasicType() { } /** - * optional .HeroBasicType basic_type = 12; + * optional .HeroBasicType basic_type = 10; * @return this */ public SetHeroBasicTypeScRsp clearBasicType() { @@ -94,7 +94,7 @@ public SetHeroBasicTypeScRsp clearBasicType() { } /** - * optional .HeroBasicType basic_type = 12; + * optional .HeroBasicType basic_type = 10; * @return the basicType */ public HeroBasicTypeOuterClass.HeroBasicType getBasicType() { @@ -127,7 +127,7 @@ public SetHeroBasicTypeScRsp setBasicTypeValue(final int value) { } /** - * optional .HeroBasicType basic_type = 12; + * optional .HeroBasicType basic_type = 10; * @param value the basicType to set * @return this */ @@ -202,11 +202,11 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 80); output.writeEnumNoTag(basicType); } } @@ -230,16 +230,16 @@ public SetHeroBasicTypeScRsp mergeFrom(final ProtoSource input) throws IOExcepti int tag = input.readTag(); while (true) { switch (tag) { - case 104: { + case 16: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 96) { + if (tag != 80) { break; } } - case 96: { + case 80: { // basicType final int value = input.readInt32(); if (HeroBasicTypeOuterClass.HeroBasicType.forNumber(value) != null) { diff --git a/src/generated/main/emu/lunarcore/proto/SetLineupNameCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SetLineupNameCsReqOuterClass.java index 76d68c15a..b332a73b0 100644 --- a/src/generated/main/emu/lunarcore/proto/SetLineupNameCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SetLineupNameCsReqOuterClass.java @@ -20,12 +20,12 @@ public static final class SetLineupNameCsReq extends ProtoMessageoptional uint32 index = 13; + * optional uint32 index = 8; */ private int index; /** - * optional string name = 15; + * optional string name = 7; */ private final Utf8String name = Utf8String.newEmptyInstance(); @@ -40,7 +40,7 @@ public static SetLineupNameCsReq newInstance() { } /** - * optional uint32 index = 13; + * optional uint32 index = 8; * @return whether the index field is set */ public boolean hasIndex() { @@ -48,7 +48,7 @@ public boolean hasIndex() { } /** - * optional uint32 index = 13; + * optional uint32 index = 8; * @return this */ public SetLineupNameCsReq clearIndex() { @@ -58,7 +58,7 @@ public SetLineupNameCsReq clearIndex() { } /** - * optional uint32 index = 13; + * optional uint32 index = 8; * @return the index */ public int getIndex() { @@ -66,7 +66,7 @@ public int getIndex() { } /** - * optional uint32 index = 13; + * optional uint32 index = 8; * @param value the index to set * @return this */ @@ -77,7 +77,7 @@ public SetLineupNameCsReq setIndex(final int value) { } /** - * optional string name = 15; + * optional string name = 7; * @return whether the name field is set */ public boolean hasName() { @@ -85,7 +85,7 @@ public boolean hasName() { } /** - * optional string name = 15; + * optional string name = 7; * @return this */ public SetLineupNameCsReq clearName() { @@ -95,7 +95,7 @@ public SetLineupNameCsReq clearName() { } /** - * optional string name = 15; + * optional string name = 7; * @return the name */ public String getName() { @@ -103,7 +103,7 @@ public String getName() { } /** - * optional string name = 15; + * optional string name = 7; * @return internal {@code Utf8String} representation of name for reading */ public Utf8String getNameBytes() { @@ -111,7 +111,7 @@ public Utf8String getNameBytes() { } /** - * optional string name = 15; + * optional string name = 7; * @return internal {@code Utf8String} representation of name for modifications */ public Utf8String getMutableNameBytes() { @@ -120,7 +120,7 @@ public Utf8String getMutableNameBytes() { } /** - * optional string name = 15; + * optional string name = 7; * @param value the name to set * @return this */ @@ -131,7 +131,7 @@ public SetLineupNameCsReq setName(final CharSequence value) { } /** - * optional string name = 15; + * optional string name = 7; * @param value the name to set * @return this */ @@ -207,11 +207,11 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(index); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 122); + output.writeRawByte((byte) 58); output.writeStringNoTag(name); } } @@ -235,16 +235,16 @@ public SetLineupNameCsReq mergeFrom(final ProtoSource input) throws IOException int tag = input.readTag(); while (true) { switch (tag) { - case 104: { + case 64: { // index index = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 122) { + if (tag != 58) { break; } } - case 122: { + case 58: { // name input.readString(name); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/SetLineupNameScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/SetLineupNameScRspOuterClass.java index 76f94d884..76468e72a 100644 --- a/src/generated/main/emu/lunarcore/proto/SetLineupNameScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SetLineupNameScRspOuterClass.java @@ -20,17 +20,17 @@ public static final class SetLineupNameScRsp extends ProtoMessageoptional uint32 index = 8; + * optional uint32 index = 6; */ private int index; /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 9; */ private int retcode; /** - * optional string name = 7; + * optional string name = 15; */ private final Utf8String name = Utf8String.newEmptyInstance(); @@ -45,7 +45,7 @@ public static SetLineupNameScRsp newInstance() { } /** - * optional uint32 index = 8; + * optional uint32 index = 6; * @return whether the index field is set */ public boolean hasIndex() { @@ -53,7 +53,7 @@ public boolean hasIndex() { } /** - * optional uint32 index = 8; + * optional uint32 index = 6; * @return this */ public SetLineupNameScRsp clearIndex() { @@ -63,7 +63,7 @@ public SetLineupNameScRsp clearIndex() { } /** - * optional uint32 index = 8; + * optional uint32 index = 6; * @return the index */ public int getIndex() { @@ -71,7 +71,7 @@ public int getIndex() { } /** - * optional uint32 index = 8; + * optional uint32 index = 6; * @param value the index to set * @return this */ @@ -82,7 +82,7 @@ public SetLineupNameScRsp setIndex(final int value) { } /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 9; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -90,7 +90,7 @@ public boolean hasRetcode() { } /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 9; * @return this */ public SetLineupNameScRsp clearRetcode() { @@ -100,7 +100,7 @@ public SetLineupNameScRsp clearRetcode() { } /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 9; * @return the retcode */ public int getRetcode() { @@ -108,7 +108,7 @@ public int getRetcode() { } /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 9; * @param value the retcode to set * @return this */ @@ -119,7 +119,7 @@ public SetLineupNameScRsp setRetcode(final int value) { } /** - * optional string name = 7; + * optional string name = 15; * @return whether the name field is set */ public boolean hasName() { @@ -127,7 +127,7 @@ public boolean hasName() { } /** - * optional string name = 7; + * optional string name = 15; * @return this */ public SetLineupNameScRsp clearName() { @@ -137,7 +137,7 @@ public SetLineupNameScRsp clearName() { } /** - * optional string name = 7; + * optional string name = 15; * @return the name */ public String getName() { @@ -145,7 +145,7 @@ public String getName() { } /** - * optional string name = 7; + * optional string name = 15; * @return internal {@code Utf8String} representation of name for reading */ public Utf8String getNameBytes() { @@ -153,7 +153,7 @@ public Utf8String getNameBytes() { } /** - * optional string name = 7; + * optional string name = 15; * @return internal {@code Utf8String} representation of name for modifications */ public Utf8String getMutableNameBytes() { @@ -162,7 +162,7 @@ public Utf8String getMutableNameBytes() { } /** - * optional string name = 7; + * optional string name = 15; * @param value the name to set * @return this */ @@ -173,7 +173,7 @@ public SetLineupNameScRsp setName(final CharSequence value) { } /** - * optional string name = 7; + * optional string name = 15; * @param value the name to set * @return this */ @@ -255,15 +255,15 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(index); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 58); + output.writeRawByte((byte) 122); output.writeStringNoTag(name); } } @@ -290,25 +290,25 @@ public SetLineupNameScRsp mergeFrom(final ProtoSource input) throws IOException int tag = input.readTag(); while (true) { switch (tag) { - case 64: { + case 48: { // index index = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 104) { + if (tag != 72) { break; } } - case 104: { + case 72: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 58) { + if (tag != 122) { break; } } - case 58: { + case 122: { // name input.readString(name); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/SetNicknameCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SetNicknameCsReqOuterClass.java index 93a1b7756..1394222d2 100644 --- a/src/generated/main/emu/lunarcore/proto/SetNicknameCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SetNicknameCsReqOuterClass.java @@ -20,7 +20,7 @@ public static final class SetNicknameCsReq extends ProtoMessageoptional string nickname = 3; + * optional string nickname = 14; */ private final Utf8String nickname = Utf8String.newEmptyInstance(); @@ -35,7 +35,7 @@ public static SetNicknameCsReq newInstance() { } /** - * optional string nickname = 3; + * optional string nickname = 14; * @return whether the nickname field is set */ public boolean hasNickname() { @@ -43,7 +43,7 @@ public boolean hasNickname() { } /** - * optional string nickname = 3; + * optional string nickname = 14; * @return this */ public SetNicknameCsReq clearNickname() { @@ -53,7 +53,7 @@ public SetNicknameCsReq clearNickname() { } /** - * optional string nickname = 3; + * optional string nickname = 14; * @return the nickname */ public String getNickname() { @@ -61,7 +61,7 @@ public String getNickname() { } /** - * optional string nickname = 3; + * optional string nickname = 14; * @return internal {@code Utf8String} representation of nickname for reading */ public Utf8String getNicknameBytes() { @@ -69,7 +69,7 @@ public Utf8String getNicknameBytes() { } /** - * optional string nickname = 3; + * optional string nickname = 14; * @return internal {@code Utf8String} representation of nickname for modifications */ public Utf8String getMutableNicknameBytes() { @@ -78,7 +78,7 @@ public Utf8String getMutableNicknameBytes() { } /** - * optional string nickname = 3; + * optional string nickname = 14; * @param value the nickname to set * @return this */ @@ -89,7 +89,7 @@ public SetNicknameCsReq setNickname(final CharSequence value) { } /** - * optional string nickname = 3; + * optional string nickname = 14; * @param value the nickname to set * @return this */ @@ -159,7 +159,7 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 26); + output.writeRawByte((byte) 114); output.writeStringNoTag(nickname); } } @@ -180,7 +180,7 @@ public SetNicknameCsReq mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 26: { + case 114: { // nickname input.readString(nickname); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/SetSignatureCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SetSignatureCsReqOuterClass.java index 8a8545dab..11d25a7d9 100644 --- a/src/generated/main/emu/lunarcore/proto/SetSignatureCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SetSignatureCsReqOuterClass.java @@ -20,7 +20,7 @@ public static final class SetSignatureCsReq extends ProtoMessageoptional string signature = 15; + * optional string signature = 8; */ private final Utf8String signature = Utf8String.newEmptyInstance(); @@ -35,7 +35,7 @@ public static SetSignatureCsReq newInstance() { } /** - * optional string signature = 15; + * optional string signature = 8; * @return whether the signature field is set */ public boolean hasSignature() { @@ -43,7 +43,7 @@ public boolean hasSignature() { } /** - * optional string signature = 15; + * optional string signature = 8; * @return this */ public SetSignatureCsReq clearSignature() { @@ -53,7 +53,7 @@ public SetSignatureCsReq clearSignature() { } /** - * optional string signature = 15; + * optional string signature = 8; * @return the signature */ public String getSignature() { @@ -61,7 +61,7 @@ public String getSignature() { } /** - * optional string signature = 15; + * optional string signature = 8; * @return internal {@code Utf8String} representation of signature for reading */ public Utf8String getSignatureBytes() { @@ -69,7 +69,7 @@ public Utf8String getSignatureBytes() { } /** - * optional string signature = 15; + * optional string signature = 8; * @return internal {@code Utf8String} representation of signature for modifications */ public Utf8String getMutableSignatureBytes() { @@ -78,7 +78,7 @@ public Utf8String getMutableSignatureBytes() { } /** - * optional string signature = 15; + * optional string signature = 8; * @param value the signature to set * @return this */ @@ -89,7 +89,7 @@ public SetSignatureCsReq setSignature(final CharSequence value) { } /** - * optional string signature = 15; + * optional string signature = 8; * @param value the signature to set * @return this */ @@ -159,7 +159,7 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 122); + output.writeRawByte((byte) 66); output.writeStringNoTag(signature); } } @@ -180,7 +180,7 @@ public SetSignatureCsReq mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 122: { + case 66: { // signature input.readString(signature); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/SetSignatureScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/SetSignatureScRspOuterClass.java index 4bfeb69ec..39ad9ed0d 100644 --- a/src/generated/main/emu/lunarcore/proto/SetSignatureScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SetSignatureScRspOuterClass.java @@ -20,12 +20,12 @@ public static final class SetSignatureScRsp extends ProtoMessageoptional uint32 retcode = 4; + * optional uint32 retcode = 14; */ private int retcode; /** - * optional string signature = 1; + * optional string signature = 8; */ private final Utf8String signature = Utf8String.newEmptyInstance(); @@ -40,7 +40,7 @@ public static SetSignatureScRsp newInstance() { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 14; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -48,7 +48,7 @@ public boolean hasRetcode() { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 14; * @return this */ public SetSignatureScRsp clearRetcode() { @@ -58,7 +58,7 @@ public SetSignatureScRsp clearRetcode() { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 14; * @return the retcode */ public int getRetcode() { @@ -66,7 +66,7 @@ public int getRetcode() { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 14; * @param value the retcode to set * @return this */ @@ -77,7 +77,7 @@ public SetSignatureScRsp setRetcode(final int value) { } /** - * optional string signature = 1; + * optional string signature = 8; * @return whether the signature field is set */ public boolean hasSignature() { @@ -85,7 +85,7 @@ public boolean hasSignature() { } /** - * optional string signature = 1; + * optional string signature = 8; * @return this */ public SetSignatureScRsp clearSignature() { @@ -95,7 +95,7 @@ public SetSignatureScRsp clearSignature() { } /** - * optional string signature = 1; + * optional string signature = 8; * @return the signature */ public String getSignature() { @@ -103,7 +103,7 @@ public String getSignature() { } /** - * optional string signature = 1; + * optional string signature = 8; * @return internal {@code Utf8String} representation of signature for reading */ public Utf8String getSignatureBytes() { @@ -111,7 +111,7 @@ public Utf8String getSignatureBytes() { } /** - * optional string signature = 1; + * optional string signature = 8; * @return internal {@code Utf8String} representation of signature for modifications */ public Utf8String getMutableSignatureBytes() { @@ -120,7 +120,7 @@ public Utf8String getMutableSignatureBytes() { } /** - * optional string signature = 1; + * optional string signature = 8; * @param value the signature to set * @return this */ @@ -131,7 +131,7 @@ public SetSignatureScRsp setSignature(final CharSequence value) { } /** - * optional string signature = 1; + * optional string signature = 8; * @param value the signature to set * @return this */ @@ -207,11 +207,11 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 10); + output.writeRawByte((byte) 66); output.writeStringNoTag(signature); } } @@ -235,16 +235,16 @@ public SetSignatureScRsp mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { + case 112: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 10) { + if (tag != 66) { break; } } - case 10: { + case 66: { // signature input.readString(signature); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/ShopOuterClass.java b/src/generated/main/emu/lunarcore/proto/ShopOuterClass.java index 19d1ff6cb..0ab7db275 100644 --- a/src/generated/main/emu/lunarcore/proto/ShopOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ShopOuterClass.java @@ -20,37 +20,37 @@ public static final class Shop extends ProtoMessage implements Cloneable { private static final long serialVersionUID = 0L; /** - * optional int64 begin_time = 8; + * optional int64 begin_time = 4; */ private long beginTime; /** - * optional int64 end_time = 13; + * optional int64 end_time = 10; */ private long endTime; /** - * optional uint64 city_taken_level_reward = 3; + * optional uint64 city_taken_level_reward = 14; */ private long cityTakenLevelReward; /** - * optional uint32 city_level = 5; + * optional uint32 city_exp = 1; */ - private int cityLevel; + private int cityExp; /** - * optional uint32 city_exp = 10; + * optional uint32 shop_id = 7; */ - private int cityExp; + private int shopId; /** - * optional uint32 shop_id = 11; + * optional uint32 city_level = 13; */ - private int shopId; + private int cityLevel; /** - * repeated .Goods goods_list = 2; + * repeated .Goods goods_list = 8; */ private final RepeatedMessage goodsList = RepeatedMessage.newEmptyInstance(GoodsOuterClass.Goods.getFactory()); @@ -65,7 +65,7 @@ public static Shop newInstance() { } /** - * optional int64 begin_time = 8; + * optional int64 begin_time = 4; * @return whether the beginTime field is set */ public boolean hasBeginTime() { @@ -73,7 +73,7 @@ public boolean hasBeginTime() { } /** - * optional int64 begin_time = 8; + * optional int64 begin_time = 4; * @return this */ public Shop clearBeginTime() { @@ -83,7 +83,7 @@ public Shop clearBeginTime() { } /** - * optional int64 begin_time = 8; + * optional int64 begin_time = 4; * @return the beginTime */ public long getBeginTime() { @@ -91,7 +91,7 @@ public long getBeginTime() { } /** - * optional int64 begin_time = 8; + * optional int64 begin_time = 4; * @param value the beginTime to set * @return this */ @@ -102,7 +102,7 @@ public Shop setBeginTime(final long value) { } /** - * optional int64 end_time = 13; + * optional int64 end_time = 10; * @return whether the endTime field is set */ public boolean hasEndTime() { @@ -110,7 +110,7 @@ public boolean hasEndTime() { } /** - * optional int64 end_time = 13; + * optional int64 end_time = 10; * @return this */ public Shop clearEndTime() { @@ -120,7 +120,7 @@ public Shop clearEndTime() { } /** - * optional int64 end_time = 13; + * optional int64 end_time = 10; * @return the endTime */ public long getEndTime() { @@ -128,7 +128,7 @@ public long getEndTime() { } /** - * optional int64 end_time = 13; + * optional int64 end_time = 10; * @param value the endTime to set * @return this */ @@ -139,7 +139,7 @@ public Shop setEndTime(final long value) { } /** - * optional uint64 city_taken_level_reward = 3; + * optional uint64 city_taken_level_reward = 14; * @return whether the cityTakenLevelReward field is set */ public boolean hasCityTakenLevelReward() { @@ -147,7 +147,7 @@ public boolean hasCityTakenLevelReward() { } /** - * optional uint64 city_taken_level_reward = 3; + * optional uint64 city_taken_level_reward = 14; * @return this */ public Shop clearCityTakenLevelReward() { @@ -157,7 +157,7 @@ public Shop clearCityTakenLevelReward() { } /** - * optional uint64 city_taken_level_reward = 3; + * optional uint64 city_taken_level_reward = 14; * @return the cityTakenLevelReward */ public long getCityTakenLevelReward() { @@ -165,7 +165,7 @@ public long getCityTakenLevelReward() { } /** - * optional uint64 city_taken_level_reward = 3; + * optional uint64 city_taken_level_reward = 14; * @param value the cityTakenLevelReward to set * @return this */ @@ -176,118 +176,118 @@ public Shop setCityTakenLevelReward(final long value) { } /** - * optional uint32 city_level = 5; - * @return whether the cityLevel field is set + * optional uint32 city_exp = 1; + * @return whether the cityExp field is set */ - public boolean hasCityLevel() { + public boolean hasCityExp() { return (bitField0_ & 0x00000008) != 0; } /** - * optional uint32 city_level = 5; + * optional uint32 city_exp = 1; * @return this */ - public Shop clearCityLevel() { + public Shop clearCityExp() { bitField0_ &= ~0x00000008; - cityLevel = 0; + cityExp = 0; return this; } /** - * optional uint32 city_level = 5; - * @return the cityLevel + * optional uint32 city_exp = 1; + * @return the cityExp */ - public int getCityLevel() { - return cityLevel; + public int getCityExp() { + return cityExp; } /** - * optional uint32 city_level = 5; - * @param value the cityLevel to set + * optional uint32 city_exp = 1; + * @param value the cityExp to set * @return this */ - public Shop setCityLevel(final int value) { + public Shop setCityExp(final int value) { bitField0_ |= 0x00000008; - cityLevel = value; + cityExp = value; return this; } /** - * optional uint32 city_exp = 10; - * @return whether the cityExp field is set + * optional uint32 shop_id = 7; + * @return whether the shopId field is set */ - public boolean hasCityExp() { + public boolean hasShopId() { return (bitField0_ & 0x00000010) != 0; } /** - * optional uint32 city_exp = 10; + * optional uint32 shop_id = 7; * @return this */ - public Shop clearCityExp() { + public Shop clearShopId() { bitField0_ &= ~0x00000010; - cityExp = 0; + shopId = 0; return this; } /** - * optional uint32 city_exp = 10; - * @return the cityExp + * optional uint32 shop_id = 7; + * @return the shopId */ - public int getCityExp() { - return cityExp; + public int getShopId() { + return shopId; } /** - * optional uint32 city_exp = 10; - * @param value the cityExp to set + * optional uint32 shop_id = 7; + * @param value the shopId to set * @return this */ - public Shop setCityExp(final int value) { + public Shop setShopId(final int value) { bitField0_ |= 0x00000010; - cityExp = value; + shopId = value; return this; } /** - * optional uint32 shop_id = 11; - * @return whether the shopId field is set + * optional uint32 city_level = 13; + * @return whether the cityLevel field is set */ - public boolean hasShopId() { + public boolean hasCityLevel() { return (bitField0_ & 0x00000020) != 0; } /** - * optional uint32 shop_id = 11; + * optional uint32 city_level = 13; * @return this */ - public Shop clearShopId() { + public Shop clearCityLevel() { bitField0_ &= ~0x00000020; - shopId = 0; + cityLevel = 0; return this; } /** - * optional uint32 shop_id = 11; - * @return the shopId + * optional uint32 city_level = 13; + * @return the cityLevel */ - public int getShopId() { - return shopId; + public int getCityLevel() { + return cityLevel; } /** - * optional uint32 shop_id = 11; - * @param value the shopId to set + * optional uint32 city_level = 13; + * @param value the cityLevel to set * @return this */ - public Shop setShopId(final int value) { + public Shop setCityLevel(final int value) { bitField0_ |= 0x00000020; - shopId = value; + cityLevel = value; return this; } /** - * repeated .Goods goods_list = 2; + * repeated .Goods goods_list = 8; * @return whether the goodsList field is set */ public boolean hasGoodsList() { @@ -295,7 +295,7 @@ public boolean hasGoodsList() { } /** - * repeated .Goods goods_list = 2; + * repeated .Goods goods_list = 8; * @return this */ public Shop clearGoodsList() { @@ -305,7 +305,7 @@ public Shop clearGoodsList() { } /** - * repeated .Goods goods_list = 2; + * repeated .Goods goods_list = 8; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -319,7 +319,7 @@ public RepeatedMessage getGoodsList() { } /** - * repeated .Goods goods_list = 2; + * repeated .Goods goods_list = 8; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -333,7 +333,7 @@ public RepeatedMessage getMutableGoodsList() { } /** - * repeated .Goods goods_list = 2; + * repeated .Goods goods_list = 8; * @param value the goodsList to add * @return this */ @@ -344,7 +344,7 @@ public Shop addGoodsList(final GoodsOuterClass.Goods value) { } /** - * repeated .Goods goods_list = 2; + * repeated .Goods goods_list = 8; * @param values the goodsList to add * @return this */ @@ -362,9 +362,9 @@ public Shop copyFrom(final Shop other) { beginTime = other.beginTime; endTime = other.endTime; cityTakenLevelReward = other.cityTakenLevelReward; - cityLevel = other.cityLevel; cityExp = other.cityExp; shopId = other.shopId; + cityLevel = other.cityLevel; goodsList.copyFrom(other.goodsList); } return this; @@ -385,15 +385,15 @@ public Shop mergeFrom(final Shop other) { if (other.hasCityTakenLevelReward()) { setCityTakenLevelReward(other.cityTakenLevelReward); } - if (other.hasCityLevel()) { - setCityLevel(other.cityLevel); - } if (other.hasCityExp()) { setCityExp(other.cityExp); } if (other.hasShopId()) { setShopId(other.shopId); } + if (other.hasCityLevel()) { + setCityLevel(other.cityLevel); + } if (other.hasGoodsList()) { getMutableGoodsList().addAll(other.goodsList); } @@ -410,9 +410,9 @@ public Shop clear() { beginTime = 0L; endTime = 0L; cityTakenLevelReward = 0L; - cityLevel = 0; cityExp = 0; shopId = 0; + cityLevel = 0; goodsList.clear(); return this; } @@ -441,41 +441,41 @@ public boolean equals(Object o) { && (!hasBeginTime() || beginTime == other.beginTime) && (!hasEndTime() || endTime == other.endTime) && (!hasCityTakenLevelReward() || cityTakenLevelReward == other.cityTakenLevelReward) - && (!hasCityLevel() || cityLevel == other.cityLevel) && (!hasCityExp() || cityExp == other.cityExp) && (!hasShopId() || shopId == other.shopId) + && (!hasCityLevel() || cityLevel == other.cityLevel) && (!hasGoodsList() || goodsList.equals(other.goodsList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 32); output.writeInt64NoTag(beginTime); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 80); output.writeInt64NoTag(endTime); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 112); output.writeUInt64NoTag(cityTakenLevelReward); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 40); - output.writeUInt32NoTag(cityLevel); + output.writeRawByte((byte) 8); + output.writeUInt32NoTag(cityExp); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 80); - output.writeUInt32NoTag(cityExp); + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(shopId); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 88); - output.writeUInt32NoTag(shopId); + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(cityLevel); } if ((bitField0_ & 0x00000040) != 0) { for (int i = 0; i < goodsList.length(); i++) { - output.writeRawByte((byte) 18); + output.writeRawByte((byte) 66); output.writeMessageNoTag(goodsList.get(i)); } } @@ -494,13 +494,13 @@ protected int computeSerializedSize() { size += 1 + ProtoSink.computeUInt64SizeNoTag(cityTakenLevelReward); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(cityLevel); + size += 1 + ProtoSink.computeUInt32SizeNoTag(cityExp); } if ((bitField0_ & 0x00000010) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(cityExp); + size += 1 + ProtoSink.computeUInt32SizeNoTag(shopId); } if ((bitField0_ & 0x00000020) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(shopId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(cityLevel); } if ((bitField0_ & 0x00000040) != 0) { size += (1 * goodsList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(goodsList); @@ -515,61 +515,61 @@ public Shop mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { + case 32: { // beginTime beginTime = input.readInt64(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 104) { + if (tag != 80) { break; } } - case 104: { + case 80: { // endTime endTime = input.readInt64(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 24) { + if (tag != 112) { break; } } - case 24: { + case 112: { // cityTakenLevelReward cityTakenLevelReward = input.readUInt64(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 40) { + if (tag != 8) { break; } } - case 40: { - // cityLevel - cityLevel = input.readUInt32(); + case 8: { + // cityExp + cityExp = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 80) { + if (tag != 56) { break; } } - case 80: { - // cityExp - cityExp = input.readUInt32(); + case 56: { + // shopId + shopId = input.readUInt32(); bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 88) { + if (tag != 104) { break; } } - case 88: { - // shopId - shopId = input.readUInt32(); + case 104: { + // cityLevel + cityLevel = input.readUInt32(); bitField0_ |= 0x00000020; tag = input.readTag(); - if (tag != 18) { + if (tag != 66) { break; } } - case 18: { + case 66: { // goodsList tag = input.readRepeatedMessage(goodsList, tag); bitField0_ |= 0x00000040; @@ -604,13 +604,13 @@ public void writeTo(final JsonSink output) throws IOException { output.writeUInt64(FieldNames.cityTakenLevelReward, cityTakenLevelReward); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.cityLevel, cityLevel); + output.writeUInt32(FieldNames.cityExp, cityExp); } if ((bitField0_ & 0x00000010) != 0) { - output.writeUInt32(FieldNames.cityExp, cityExp); + output.writeUInt32(FieldNames.shopId, shopId); } if ((bitField0_ & 0x00000020) != 0) { - output.writeUInt32(FieldNames.shopId, shopId); + output.writeUInt32(FieldNames.cityLevel, cityLevel); } if ((bitField0_ & 0x00000040) != 0) { output.writeRepeatedMessage(FieldNames.goodsList, goodsList); @@ -661,11 +661,11 @@ public Shop mergeFrom(final JsonSource input) throws IOException { } break; } - case -1124188967: - case 59808688: { - if (input.isAtField(FieldNames.cityLevel)) { + case 785415346: + case -1421171383: { + if (input.isAtField(FieldNames.cityExp)) { if (!input.trySkipNullValue()) { - cityLevel = input.readUInt32(); + cityExp = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -673,11 +673,11 @@ public Shop mergeFrom(final JsonSource input) throws IOException { } break; } - case 785415346: - case -1421171383: { - if (input.isAtField(FieldNames.cityExp)) { + case -903151951: + case 2067081988: { + if (input.isAtField(FieldNames.shopId)) { if (!input.trySkipNullValue()) { - cityExp = input.readUInt32(); + shopId = input.readUInt32(); bitField0_ |= 0x00000010; } } else { @@ -685,11 +685,11 @@ public Shop mergeFrom(final JsonSource input) throws IOException { } break; } - case -903151951: - case 2067081988: { - if (input.isAtField(FieldNames.shopId)) { + case -1124188967: + case 59808688: { + if (input.isAtField(FieldNames.cityLevel)) { if (!input.trySkipNullValue()) { - shopId = input.readUInt32(); + cityLevel = input.readUInt32(); bitField0_ |= 0x00000020; } } else { @@ -767,12 +767,12 @@ static class FieldNames { static final FieldName cityTakenLevelReward = FieldName.forField("cityTakenLevelReward", "city_taken_level_reward"); - static final FieldName cityLevel = FieldName.forField("cityLevel", "city_level"); - static final FieldName cityExp = FieldName.forField("cityExp", "city_exp"); static final FieldName shopId = FieldName.forField("shopId", "shop_id"); + static final FieldName cityLevel = FieldName.forField("cityLevel", "city_level"); + static final FieldName goodsList = FieldName.forField("goodsList", "goods_list"); } } diff --git a/src/generated/main/emu/lunarcore/proto/SimpleInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/SimpleInfoOuterClass.java index 6bfbcc0a7..cacafe005 100644 --- a/src/generated/main/emu/lunarcore/proto/SimpleInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SimpleInfoOuterClass.java @@ -10,6 +10,7 @@ import us.hebi.quickbuf.ProtoMessage; import us.hebi.quickbuf.ProtoSink; import us.hebi.quickbuf.ProtoSource; +import us.hebi.quickbuf.RepeatedMessage; import us.hebi.quickbuf.Utf8String; public final class SimpleInfoOuterClass { @@ -20,7 +21,7 @@ public static final class SimpleInfo extends ProtoMessage implements private static final long serialVersionUID = 0L; /** - * optional int64 last_active_time = 12; + * optional int64 last_active_time = 9; */ private long lastActiveTime; @@ -30,44 +31,49 @@ public static final class SimpleInfo extends ProtoMessage implements private int uid; /** - * optional uint32 chat_bubble_id = 11; + * optional uint32 chat_bubble_id = 2; */ private int chatBubbleId; /** - * optional uint32 head_icon = 13; + * optional uint32 head_icon = 3; */ private int headIcon; /** - * optional uint32 level = 14; + * optional uint32 level = 8; */ private int level; /** - * optional .FriendOnlineStatus online_status = 3; + * optional .FriendOnlineStatus online_status = 4; */ private int onlineStatus; /** - * optional .PlatformType platform_type = 15; + * optional .PlatformType platform_type = 5; */ private int platformType; /** - * optional .SimpleAvatarInfo simple_avatar_info = 6; + * optional bool is_banned = 12; */ - private final SimpleAvatarInfoOuterClass.SimpleAvatarInfo simpleAvatarInfo = SimpleAvatarInfoOuterClass.SimpleAvatarInfo.newInstance(); + private boolean isBanned; /** - * optional string nickname = 2; + * optional string signature = 6; + */ + private final Utf8String signature = Utf8String.newEmptyInstance(); + + /** + * optional string nickname = 13; */ private final Utf8String nickname = Utf8String.newEmptyInstance(); /** - * optional string signature = 9; + * repeated .AssistSimpleInfo assist_simple_info = 11; */ - private final Utf8String signature = Utf8String.newEmptyInstance(); + private final RepeatedMessage assistSimpleInfo = RepeatedMessage.newEmptyInstance(AssistSimpleInfoOuterClass.AssistSimpleInfo.getFactory()); private SimpleInfo() { } @@ -80,7 +86,7 @@ public static SimpleInfo newInstance() { } /** - * optional int64 last_active_time = 12; + * optional int64 last_active_time = 9; * @return whether the lastActiveTime field is set */ public boolean hasLastActiveTime() { @@ -88,7 +94,7 @@ public boolean hasLastActiveTime() { } /** - * optional int64 last_active_time = 12; + * optional int64 last_active_time = 9; * @return this */ public SimpleInfo clearLastActiveTime() { @@ -98,7 +104,7 @@ public SimpleInfo clearLastActiveTime() { } /** - * optional int64 last_active_time = 12; + * optional int64 last_active_time = 9; * @return the lastActiveTime */ public long getLastActiveTime() { @@ -106,7 +112,7 @@ public long getLastActiveTime() { } /** - * optional int64 last_active_time = 12; + * optional int64 last_active_time = 9; * @param value the lastActiveTime to set * @return this */ @@ -154,7 +160,7 @@ public SimpleInfo setUid(final int value) { } /** - * optional uint32 chat_bubble_id = 11; + * optional uint32 chat_bubble_id = 2; * @return whether the chatBubbleId field is set */ public boolean hasChatBubbleId() { @@ -162,7 +168,7 @@ public boolean hasChatBubbleId() { } /** - * optional uint32 chat_bubble_id = 11; + * optional uint32 chat_bubble_id = 2; * @return this */ public SimpleInfo clearChatBubbleId() { @@ -172,7 +178,7 @@ public SimpleInfo clearChatBubbleId() { } /** - * optional uint32 chat_bubble_id = 11; + * optional uint32 chat_bubble_id = 2; * @return the chatBubbleId */ public int getChatBubbleId() { @@ -180,7 +186,7 @@ public int getChatBubbleId() { } /** - * optional uint32 chat_bubble_id = 11; + * optional uint32 chat_bubble_id = 2; * @param value the chatBubbleId to set * @return this */ @@ -191,7 +197,7 @@ public SimpleInfo setChatBubbleId(final int value) { } /** - * optional uint32 head_icon = 13; + * optional uint32 head_icon = 3; * @return whether the headIcon field is set */ public boolean hasHeadIcon() { @@ -199,7 +205,7 @@ public boolean hasHeadIcon() { } /** - * optional uint32 head_icon = 13; + * optional uint32 head_icon = 3; * @return this */ public SimpleInfo clearHeadIcon() { @@ -209,7 +215,7 @@ public SimpleInfo clearHeadIcon() { } /** - * optional uint32 head_icon = 13; + * optional uint32 head_icon = 3; * @return the headIcon */ public int getHeadIcon() { @@ -217,7 +223,7 @@ public int getHeadIcon() { } /** - * optional uint32 head_icon = 13; + * optional uint32 head_icon = 3; * @param value the headIcon to set * @return this */ @@ -228,7 +234,7 @@ public SimpleInfo setHeadIcon(final int value) { } /** - * optional uint32 level = 14; + * optional uint32 level = 8; * @return whether the level field is set */ public boolean hasLevel() { @@ -236,7 +242,7 @@ public boolean hasLevel() { } /** - * optional uint32 level = 14; + * optional uint32 level = 8; * @return this */ public SimpleInfo clearLevel() { @@ -246,7 +252,7 @@ public SimpleInfo clearLevel() { } /** - * optional uint32 level = 14; + * optional uint32 level = 8; * @return the level */ public int getLevel() { @@ -254,7 +260,7 @@ public int getLevel() { } /** - * optional uint32 level = 14; + * optional uint32 level = 8; * @param value the level to set * @return this */ @@ -265,7 +271,7 @@ public SimpleInfo setLevel(final int value) { } /** - * optional .FriendOnlineStatus online_status = 3; + * optional .FriendOnlineStatus online_status = 4; * @return whether the onlineStatus field is set */ public boolean hasOnlineStatus() { @@ -273,7 +279,7 @@ public boolean hasOnlineStatus() { } /** - * optional .FriendOnlineStatus online_status = 3; + * optional .FriendOnlineStatus online_status = 4; * @return this */ public SimpleInfo clearOnlineStatus() { @@ -283,7 +289,7 @@ public SimpleInfo clearOnlineStatus() { } /** - * optional .FriendOnlineStatus online_status = 3; + * optional .FriendOnlineStatus online_status = 4; * @return the onlineStatus */ public FriendOnlineStatusOuterClass.FriendOnlineStatus getOnlineStatus() { @@ -316,7 +322,7 @@ public SimpleInfo setOnlineStatusValue(final int value) { } /** - * optional .FriendOnlineStatus online_status = 3; + * optional .FriendOnlineStatus online_status = 4; * @param value the onlineStatus to set * @return this */ @@ -327,7 +333,7 @@ public SimpleInfo setOnlineStatus(final FriendOnlineStatusOuterClass.FriendOnlin } /** - * optional .PlatformType platform_type = 15; + * optional .PlatformType platform_type = 5; * @return whether the platformType field is set */ public boolean hasPlatformType() { @@ -335,7 +341,7 @@ public boolean hasPlatformType() { } /** - * optional .PlatformType platform_type = 15; + * optional .PlatformType platform_type = 5; * @return this */ public SimpleInfo clearPlatformType() { @@ -345,7 +351,7 @@ public SimpleInfo clearPlatformType() { } /** - * optional .PlatformType platform_type = 15; + * optional .PlatformType platform_type = 5; * @return the platformType */ public PlatformTypeOuterClass.PlatformType getPlatformType() { @@ -378,7 +384,7 @@ public SimpleInfo setPlatformTypeValue(final int value) { } /** - * optional .PlatformType platform_type = 15; + * optional .PlatformType platform_type = 5; * @param value the platformType to set * @return this */ @@ -389,82 +395,127 @@ public SimpleInfo setPlatformType(final PlatformTypeOuterClass.PlatformType valu } /** - * optional .SimpleAvatarInfo simple_avatar_info = 6; - * @return whether the simpleAvatarInfo field is set + * optional bool is_banned = 12; + * @return whether the isBanned field is set */ - public boolean hasSimpleAvatarInfo() { + public boolean hasIsBanned() { return (bitField0_ & 0x00000080) != 0; } /** - * optional .SimpleAvatarInfo simple_avatar_info = 6; + * optional bool is_banned = 12; * @return this */ - public SimpleInfo clearSimpleAvatarInfo() { + public SimpleInfo clearIsBanned() { bitField0_ &= ~0x00000080; - simpleAvatarInfo.clear(); + isBanned = false; return this; } /** - * optional .SimpleAvatarInfo simple_avatar_info = 6; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * Use {@link #getMutableSimpleAvatarInfo()} if you want to modify it. - * - * @return internal storage object for reading + * optional bool is_banned = 12; + * @return the isBanned */ - public SimpleAvatarInfoOuterClass.SimpleAvatarInfo getSimpleAvatarInfo() { - return simpleAvatarInfo; + public boolean getIsBanned() { + return isBanned; } /** - * optional .SimpleAvatarInfo simple_avatar_info = 6; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications + * optional bool is_banned = 12; + * @param value the isBanned to set + * @return this */ - public SimpleAvatarInfoOuterClass.SimpleAvatarInfo getMutableSimpleAvatarInfo() { + public SimpleInfo setIsBanned(final boolean value) { bitField0_ |= 0x00000080; - return simpleAvatarInfo; + isBanned = value; + return this; } /** - * optional .SimpleAvatarInfo simple_avatar_info = 6; - * @param value the simpleAvatarInfo to set + * optional string signature = 6; + * @return whether the signature field is set + */ + public boolean hasSignature() { + return (bitField0_ & 0x00000100) != 0; + } + + /** + * optional string signature = 6; * @return this */ - public SimpleInfo setSimpleAvatarInfo(final SimpleAvatarInfoOuterClass.SimpleAvatarInfo value) { - bitField0_ |= 0x00000080; - simpleAvatarInfo.copyFrom(value); + public SimpleInfo clearSignature() { + bitField0_ &= ~0x00000100; + signature.clear(); + return this; + } + + /** + * optional string signature = 6; + * @return the signature + */ + public String getSignature() { + return signature.getString(); + } + + /** + * optional string signature = 6; + * @return internal {@code Utf8String} representation of signature for reading + */ + public Utf8String getSignatureBytes() { + return this.signature; + } + + /** + * optional string signature = 6; + * @return internal {@code Utf8String} representation of signature for modifications + */ + public Utf8String getMutableSignatureBytes() { + bitField0_ |= 0x00000100; + return this.signature; + } + + /** + * optional string signature = 6; + * @param value the signature to set + * @return this + */ + public SimpleInfo setSignature(final CharSequence value) { + bitField0_ |= 0x00000100; + signature.copyFrom(value); return this; } /** - * optional string nickname = 2; + * optional string signature = 6; + * @param value the signature to set + * @return this + */ + public SimpleInfo setSignature(final Utf8String value) { + bitField0_ |= 0x00000100; + signature.copyFrom(value); + return this; + } + + /** + * optional string nickname = 13; * @return whether the nickname field is set */ public boolean hasNickname() { - return (bitField0_ & 0x00000100) != 0; + return (bitField0_ & 0x00000200) != 0; } /** - * optional string nickname = 2; + * optional string nickname = 13; * @return this */ public SimpleInfo clearNickname() { - bitField0_ &= ~0x00000100; + bitField0_ &= ~0x00000200; nickname.clear(); return this; } /** - * optional string nickname = 2; + * optional string nickname = 13; * @return the nickname */ public String getNickname() { @@ -472,7 +523,7 @@ public String getNickname() { } /** - * optional string nickname = 2; + * optional string nickname = 13; * @return internal {@code Utf8String} representation of nickname for reading */ public Utf8String getNicknameBytes() { @@ -480,98 +531,103 @@ public Utf8String getNicknameBytes() { } /** - * optional string nickname = 2; + * optional string nickname = 13; * @return internal {@code Utf8String} representation of nickname for modifications */ public Utf8String getMutableNicknameBytes() { - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000200; return this.nickname; } /** - * optional string nickname = 2; + * optional string nickname = 13; * @param value the nickname to set * @return this */ public SimpleInfo setNickname(final CharSequence value) { - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000200; nickname.copyFrom(value); return this; } /** - * optional string nickname = 2; + * optional string nickname = 13; * @param value the nickname to set * @return this */ public SimpleInfo setNickname(final Utf8String value) { - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000200; nickname.copyFrom(value); return this; } /** - * optional string signature = 9; - * @return whether the signature field is set + * repeated .AssistSimpleInfo assist_simple_info = 11; + * @return whether the assistSimpleInfo field is set */ - public boolean hasSignature() { - return (bitField0_ & 0x00000200) != 0; + public boolean hasAssistSimpleInfo() { + return (bitField0_ & 0x00000400) != 0; } /** - * optional string signature = 9; + * repeated .AssistSimpleInfo assist_simple_info = 11; * @return this */ - public SimpleInfo clearSignature() { - bitField0_ &= ~0x00000200; - signature.clear(); + public SimpleInfo clearAssistSimpleInfo() { + bitField0_ &= ~0x00000400; + assistSimpleInfo.clear(); return this; } /** - * optional string signature = 9; - * @return the signature - */ - public String getSignature() { - return signature.getString(); - } - - /** - * optional string signature = 9; - * @return internal {@code Utf8String} representation of signature for reading + * repeated .AssistSimpleInfo assist_simple_info = 11; + * + * This method returns the internal storage object without modifying any has state. + * The returned object should not be modified and be treated as read-only. + * + * Use {@link #getMutableAssistSimpleInfo()} if you want to modify it. + * + * @return internal storage object for reading */ - public Utf8String getSignatureBytes() { - return this.signature; + public RepeatedMessage getAssistSimpleInfo() { + return assistSimpleInfo; } /** - * optional string signature = 9; - * @return internal {@code Utf8String} representation of signature for modifications + * repeated .AssistSimpleInfo assist_simple_info = 11; + * + * This method returns the internal storage object and sets the corresponding + * has state. The returned object will become part of this message and its + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications */ - public Utf8String getMutableSignatureBytes() { - bitField0_ |= 0x00000200; - return this.signature; + public RepeatedMessage getMutableAssistSimpleInfo( + ) { + bitField0_ |= 0x00000400; + return assistSimpleInfo; } /** - * optional string signature = 9; - * @param value the signature to set + * repeated .AssistSimpleInfo assist_simple_info = 11; + * @param value the assistSimpleInfo to add * @return this */ - public SimpleInfo setSignature(final CharSequence value) { - bitField0_ |= 0x00000200; - signature.copyFrom(value); + public SimpleInfo addAssistSimpleInfo(final AssistSimpleInfoOuterClass.AssistSimpleInfo value) { + bitField0_ |= 0x00000400; + assistSimpleInfo.add(value); return this; } /** - * optional string signature = 9; - * @param value the signature to set + * repeated .AssistSimpleInfo assist_simple_info = 11; + * @param values the assistSimpleInfo to add * @return this */ - public SimpleInfo setSignature(final Utf8String value) { - bitField0_ |= 0x00000200; - signature.copyFrom(value); + public SimpleInfo addAllAssistSimpleInfo( + final AssistSimpleInfoOuterClass.AssistSimpleInfo... values) { + bitField0_ |= 0x00000400; + assistSimpleInfo.addAll(values); return this; } @@ -587,9 +643,10 @@ public SimpleInfo copyFrom(final SimpleInfo other) { level = other.level; onlineStatus = other.onlineStatus; platformType = other.platformType; - simpleAvatarInfo.copyFrom(other.simpleAvatarInfo); - nickname.copyFrom(other.nickname); + isBanned = other.isBanned; signature.copyFrom(other.signature); + nickname.copyFrom(other.nickname); + assistSimpleInfo.copyFrom(other.assistSimpleInfo); } return this; } @@ -621,14 +678,17 @@ public SimpleInfo mergeFrom(final SimpleInfo other) { if (other.hasPlatformType()) { setPlatformTypeValue(other.platformType); } - if (other.hasSimpleAvatarInfo()) { - getMutableSimpleAvatarInfo().mergeFrom(other.simpleAvatarInfo); + if (other.hasIsBanned()) { + setIsBanned(other.isBanned); + } + if (other.hasSignature()) { + getMutableSignatureBytes().copyFrom(other.signature); } if (other.hasNickname()) { getMutableNicknameBytes().copyFrom(other.nickname); } - if (other.hasSignature()) { - getMutableSignatureBytes().copyFrom(other.signature); + if (other.hasAssistSimpleInfo()) { + getMutableAssistSimpleInfo().addAll(other.assistSimpleInfo); } return this; } @@ -647,9 +707,10 @@ public SimpleInfo clear() { level = 0; onlineStatus = 0; platformType = 0; - simpleAvatarInfo.clear(); - nickname.clear(); + isBanned = false; signature.clear(); + nickname.clear(); + assistSimpleInfo.clear(); return this; } @@ -660,9 +721,9 @@ public SimpleInfo clearQuick() { } cachedSize = -1; bitField0_ = 0; - simpleAvatarInfo.clearQuick(); - nickname.clear(); signature.clear(); + nickname.clear(); + assistSimpleInfo.clearQuick(); return this; } @@ -683,15 +744,16 @@ public boolean equals(Object o) { && (!hasLevel() || level == other.level) && (!hasOnlineStatus() || onlineStatus == other.onlineStatus) && (!hasPlatformType() || platformType == other.platformType) - && (!hasSimpleAvatarInfo() || simpleAvatarInfo.equals(other.simpleAvatarInfo)) + && (!hasIsBanned() || isBanned == other.isBanned) + && (!hasSignature() || signature.equals(other.signature)) && (!hasNickname() || nickname.equals(other.nickname)) - && (!hasSignature() || signature.equals(other.signature)); + && (!hasAssistSimpleInfo() || assistSimpleInfo.equals(other.assistSimpleInfo)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 72); output.writeInt64NoTag(lastActiveTime); } if ((bitField0_ & 0x00000002) != 0) { @@ -699,36 +761,42 @@ public void writeTo(final ProtoSink output) throws IOException { output.writeUInt32NoTag(uid); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(chatBubbleId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(headIcon); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(level); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 32); output.writeEnumNoTag(onlineStatus); } if ((bitField0_ & 0x00000040) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 40); output.writeEnumNoTag(platformType); } if ((bitField0_ & 0x00000080) != 0) { - output.writeRawByte((byte) 50); - output.writeMessageNoTag(simpleAvatarInfo); + output.writeRawByte((byte) 96); + output.writeBoolNoTag(isBanned); } if ((bitField0_ & 0x00000100) != 0) { - output.writeRawByte((byte) 18); - output.writeStringNoTag(nickname); + output.writeRawByte((byte) 50); + output.writeStringNoTag(signature); } if ((bitField0_ & 0x00000200) != 0) { - output.writeRawByte((byte) 74); - output.writeStringNoTag(signature); + output.writeRawByte((byte) 106); + output.writeStringNoTag(nickname); + } + if ((bitField0_ & 0x00000400) != 0) { + for (int i = 0; i < assistSimpleInfo.length(); i++) { + output.writeRawByte((byte) 90); + output.writeMessageNoTag(assistSimpleInfo.get(i)); + } } } @@ -757,13 +825,16 @@ protected int computeSerializedSize() { size += 1 + ProtoSink.computeEnumSizeNoTag(platformType); } if ((bitField0_ & 0x00000080) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(simpleAvatarInfo); + size += 2; } if ((bitField0_ & 0x00000100) != 0) { - size += 1 + ProtoSink.computeStringSizeNoTag(nickname); + size += 1 + ProtoSink.computeStringSizeNoTag(signature); } if ((bitField0_ & 0x00000200) != 0) { - size += 1 + ProtoSink.computeStringSizeNoTag(signature); + size += 1 + ProtoSink.computeStringSizeNoTag(nickname); + } + if ((bitField0_ & 0x00000400) != 0) { + size += (1 * assistSimpleInfo.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(assistSimpleInfo); } return size; } @@ -775,7 +846,7 @@ public SimpleInfo mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 96: { + case 72: { // lastActiveTime lastActiveTime = input.readInt64(); bitField0_ |= 0x00000001; @@ -789,38 +860,38 @@ public SimpleInfo mergeFrom(final ProtoSource input) throws IOException { uid = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 88) { + if (tag != 16) { break; } } - case 88: { + case 16: { // chatBubbleId chatBubbleId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 104) { + if (tag != 24) { break; } } - case 104: { + case 24: { // headIcon headIcon = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 112) { + if (tag != 64) { break; } } - case 112: { + case 64: { // level level = input.readUInt32(); bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 24) { + if (tag != 32) { break; } } - case 24: { + case 32: { // onlineStatus final int value = input.readInt32(); if (FriendOnlineStatusOuterClass.FriendOnlineStatus.forNumber(value) != null) { @@ -828,11 +899,11 @@ public SimpleInfo mergeFrom(final ProtoSource input) throws IOException { bitField0_ |= 0x00000020; } tag = input.readTag(); - if (tag != 120) { + if (tag != 40) { break; } } - case 120: { + case 40: { // platformType final int value = input.readInt32(); if (PlatformTypeOuterClass.PlatformType.forNumber(value) != null) { @@ -840,33 +911,41 @@ public SimpleInfo mergeFrom(final ProtoSource input) throws IOException { bitField0_ |= 0x00000040; } tag = input.readTag(); - if (tag != 50) { + if (tag != 96) { break; } } - case 50: { - // simpleAvatarInfo - input.readMessage(simpleAvatarInfo); + case 96: { + // isBanned + isBanned = input.readBool(); bitField0_ |= 0x00000080; tag = input.readTag(); - if (tag != 18) { + if (tag != 50) { break; } } - case 18: { - // nickname - input.readString(nickname); + case 50: { + // signature + input.readString(signature); bitField0_ |= 0x00000100; tag = input.readTag(); - if (tag != 74) { + if (tag != 106) { break; } } - case 74: { - // signature - input.readString(signature); + case 106: { + // nickname + input.readString(nickname); bitField0_ |= 0x00000200; tag = input.readTag(); + if (tag != 90) { + break; + } + } + case 90: { + // assistSimpleInfo + tag = input.readRepeatedMessage(assistSimpleInfo, tag); + bitField0_ |= 0x00000400; if (tag != 0) { break; } @@ -910,13 +989,16 @@ public void writeTo(final JsonSink output) throws IOException { output.writeEnum(FieldNames.platformType, platformType, PlatformTypeOuterClass.PlatformType.converter()); } if ((bitField0_ & 0x00000080) != 0) { - output.writeMessage(FieldNames.simpleAvatarInfo, simpleAvatarInfo); + output.writeBool(FieldNames.isBanned, isBanned); } if ((bitField0_ & 0x00000100) != 0) { - output.writeString(FieldNames.nickname, nickname); + output.writeString(FieldNames.signature, signature); } if ((bitField0_ & 0x00000200) != 0) { - output.writeString(FieldNames.signature, signature); + output.writeString(FieldNames.nickname, nickname); + } + if ((bitField0_ & 0x00000400) != 0) { + output.writeRepeatedMessage(FieldNames.assistSimpleInfo, assistSimpleInfo); } output.endObject(); } @@ -1020,11 +1102,11 @@ public SimpleInfo mergeFrom(final JsonSource input) throws IOException { } break; } - case 272129273: - case 338092231: { - if (input.isAtField(FieldNames.simpleAvatarInfo)) { + case -722308888: + case -932303917: { + if (input.isAtField(FieldNames.isBanned)) { if (!input.trySkipNullValue()) { - input.readMessage(simpleAvatarInfo); + isBanned = input.readBool(); bitField0_ |= 0x00000080; } } else { @@ -1032,22 +1114,34 @@ public SimpleInfo mergeFrom(final JsonSource input) throws IOException { } break; } + case 1073584312: { + if (input.isAtField(FieldNames.signature)) { + if (!input.trySkipNullValue()) { + input.readString(signature); + bitField0_ |= 0x00000100; + } + } else { + input.skipUnknownField(); + } + break; + } case 70690926: { if (input.isAtField(FieldNames.nickname)) { if (!input.trySkipNullValue()) { input.readString(nickname); - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000200; } } else { input.skipUnknownField(); } break; } - case 1073584312: { - if (input.isAtField(FieldNames.signature)) { + case 773591241: + case -143608251: { + if (input.isAtField(FieldNames.assistSimpleInfo)) { if (!input.trySkipNullValue()) { - input.readString(signature); - bitField0_ |= 0x00000200; + input.readRepeatedMessage(assistSimpleInfo); + bitField0_ |= 0x00000400; } } else { input.skipUnknownField(); @@ -1120,11 +1214,13 @@ static class FieldNames { static final FieldName platformType = FieldName.forField("platformType", "platform_type"); - static final FieldName simpleAvatarInfo = FieldName.forField("simpleAvatarInfo", "simple_avatar_info"); + static final FieldName isBanned = FieldName.forField("isBanned", "is_banned"); + + static final FieldName signature = FieldName.forField("signature"); static final FieldName nickname = FieldName.forField("nickname"); - static final FieldName signature = FieldName.forField("signature"); + static final FieldName assistSimpleInfo = FieldName.forField("assistSimpleInfo", "assist_simple_info"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/StaminaInfoScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/StaminaInfoScNotifyOuterClass.java index b512ffc9a..c71a5244b 100644 --- a/src/generated/main/emu/lunarcore/proto/StaminaInfoScNotifyOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/StaminaInfoScNotifyOuterClass.java @@ -19,17 +19,17 @@ public static final class StaminaInfoScNotify extends ProtoMessageoptional int64 next_recover_time = 7; + * optional int64 next_recover_time = 11; */ private long nextRecoverTime; /** - * optional uint32 stamina = 4; + * optional uint32 stamina = 3; */ private int stamina; /** - * optional uint32 reserve_stamina = 13; + * optional uint32 reserve_stamina = 7; */ private int reserveStamina; @@ -44,7 +44,7 @@ public static StaminaInfoScNotify newInstance() { } /** - * optional int64 next_recover_time = 7; + * optional int64 next_recover_time = 11; * @return whether the nextRecoverTime field is set */ public boolean hasNextRecoverTime() { @@ -52,7 +52,7 @@ public boolean hasNextRecoverTime() { } /** - * optional int64 next_recover_time = 7; + * optional int64 next_recover_time = 11; * @return this */ public StaminaInfoScNotify clearNextRecoverTime() { @@ -62,7 +62,7 @@ public StaminaInfoScNotify clearNextRecoverTime() { } /** - * optional int64 next_recover_time = 7; + * optional int64 next_recover_time = 11; * @return the nextRecoverTime */ public long getNextRecoverTime() { @@ -70,7 +70,7 @@ public long getNextRecoverTime() { } /** - * optional int64 next_recover_time = 7; + * optional int64 next_recover_time = 11; * @param value the nextRecoverTime to set * @return this */ @@ -81,7 +81,7 @@ public StaminaInfoScNotify setNextRecoverTime(final long value) { } /** - * optional uint32 stamina = 4; + * optional uint32 stamina = 3; * @return whether the stamina field is set */ public boolean hasStamina() { @@ -89,7 +89,7 @@ public boolean hasStamina() { } /** - * optional uint32 stamina = 4; + * optional uint32 stamina = 3; * @return this */ public StaminaInfoScNotify clearStamina() { @@ -99,7 +99,7 @@ public StaminaInfoScNotify clearStamina() { } /** - * optional uint32 stamina = 4; + * optional uint32 stamina = 3; * @return the stamina */ public int getStamina() { @@ -107,7 +107,7 @@ public int getStamina() { } /** - * optional uint32 stamina = 4; + * optional uint32 stamina = 3; * @param value the stamina to set * @return this */ @@ -118,7 +118,7 @@ public StaminaInfoScNotify setStamina(final int value) { } /** - * optional uint32 reserve_stamina = 13; + * optional uint32 reserve_stamina = 7; * @return whether the reserveStamina field is set */ public boolean hasReserveStamina() { @@ -126,7 +126,7 @@ public boolean hasReserveStamina() { } /** - * optional uint32 reserve_stamina = 13; + * optional uint32 reserve_stamina = 7; * @return this */ public StaminaInfoScNotify clearReserveStamina() { @@ -136,7 +136,7 @@ public StaminaInfoScNotify clearReserveStamina() { } /** - * optional uint32 reserve_stamina = 13; + * optional uint32 reserve_stamina = 7; * @return the reserveStamina */ public int getReserveStamina() { @@ -144,7 +144,7 @@ public int getReserveStamina() { } /** - * optional uint32 reserve_stamina = 13; + * optional uint32 reserve_stamina = 7; * @param value the reserveStamina to set * @return this */ @@ -225,15 +225,15 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 88); output.writeInt64NoTag(nextRecoverTime); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(stamina); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(reserveStamina); } } @@ -260,25 +260,25 @@ public StaminaInfoScNotify mergeFrom(final ProtoSource input) throws IOException int tag = input.readTag(); while (true) { switch (tag) { - case 56: { + case 88: { // nextRecoverTime nextRecoverTime = input.readInt64(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 32) { + if (tag != 24) { break; } } - case 32: { + case 24: { // stamina stamina = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 104) { + if (tag != 56) { break; } } - case 104: { + case 56: { // reserveStamina reserveStamina = input.readUInt32(); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/StartChallengeCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/StartChallengeCsReqOuterClass.java index 9bf148dd5..6a40886a9 100644 --- a/src/generated/main/emu/lunarcore/proto/StartChallengeCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/StartChallengeCsReqOuterClass.java @@ -19,12 +19,12 @@ public static final class StartChallengeCsReq extends ProtoMessageoptional uint32 challenge_id = 6; + * optional uint32 challenge_id = 4; */ private int challengeId; /** - * optional .StartChallengeStoryInfo story_info = 9; + * optional .StartChallengeStoryInfo story_info = 10; */ private final StartChallengeStoryInfoOuterClass.StartChallengeStoryInfo storyInfo = StartChallengeStoryInfoOuterClass.StartChallengeStoryInfo.newInstance(); @@ -39,7 +39,7 @@ public static StartChallengeCsReq newInstance() { } /** - * optional uint32 challenge_id = 6; + * optional uint32 challenge_id = 4; * @return whether the challengeId field is set */ public boolean hasChallengeId() { @@ -47,7 +47,7 @@ public boolean hasChallengeId() { } /** - * optional uint32 challenge_id = 6; + * optional uint32 challenge_id = 4; * @return this */ public StartChallengeCsReq clearChallengeId() { @@ -57,7 +57,7 @@ public StartChallengeCsReq clearChallengeId() { } /** - * optional uint32 challenge_id = 6; + * optional uint32 challenge_id = 4; * @return the challengeId */ public int getChallengeId() { @@ -65,7 +65,7 @@ public int getChallengeId() { } /** - * optional uint32 challenge_id = 6; + * optional uint32 challenge_id = 4; * @param value the challengeId to set * @return this */ @@ -76,7 +76,7 @@ public StartChallengeCsReq setChallengeId(final int value) { } /** - * optional .StartChallengeStoryInfo story_info = 9; + * optional .StartChallengeStoryInfo story_info = 10; * @return whether the storyInfo field is set */ public boolean hasStoryInfo() { @@ -84,7 +84,7 @@ public boolean hasStoryInfo() { } /** - * optional .StartChallengeStoryInfo story_info = 9; + * optional .StartChallengeStoryInfo story_info = 10; * @return this */ public StartChallengeCsReq clearStoryInfo() { @@ -94,7 +94,7 @@ public StartChallengeCsReq clearStoryInfo() { } /** - * optional .StartChallengeStoryInfo story_info = 9; + * optional .StartChallengeStoryInfo story_info = 10; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -108,7 +108,7 @@ public StartChallengeStoryInfoOuterClass.StartChallengeStoryInfo getStoryInfo() } /** - * optional .StartChallengeStoryInfo story_info = 9; + * optional .StartChallengeStoryInfo story_info = 10; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -122,7 +122,7 @@ public StartChallengeStoryInfoOuterClass.StartChallengeStoryInfo getMutableStory } /** - * optional .StartChallengeStoryInfo story_info = 9; + * optional .StartChallengeStoryInfo story_info = 10; * @param value the storyInfo to set * @return this */ @@ -199,11 +199,11 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(challengeId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 74); + output.writeRawByte((byte) 82); output.writeMessageNoTag(storyInfo); } } @@ -227,16 +227,16 @@ public StartChallengeCsReq mergeFrom(final ProtoSource input) throws IOException int tag = input.readTag(); while (true) { switch (tag) { - case 48: { + case 32: { // challengeId challengeId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 74) { + if (tag != 82) { break; } } - case 74: { + case 82: { // storyInfo input.readMessage(storyInfo); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/StartChallengeScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/StartChallengeScRspOuterClass.java index 1e53ca42b..31f5c7f1a 100644 --- a/src/generated/main/emu/lunarcore/proto/StartChallengeScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/StartChallengeScRspOuterClass.java @@ -19,22 +19,22 @@ public static final class StartChallengeScRsp extends ProtoMessageoptional uint32 retcode = 1; + * optional uint32 retcode = 7; */ private int retcode; /** - * optional .ChallengeInfo challenge_info = 3; + * optional .ChallengeInfo challenge_info = 6; */ private final ChallengeInfoOuterClass.ChallengeInfo challengeInfo = ChallengeInfoOuterClass.ChallengeInfo.newInstance(); /** - * optional .LineupInfo lineup = 4; + * optional .LineupInfo lineup = 13; */ private final LineupInfoOuterClass.LineupInfo lineup = LineupInfoOuterClass.LineupInfo.newInstance(); /** - * optional .SceneInfo scene = 11; + * optional .SceneInfo scene = 15; */ private final SceneInfoOuterClass.SceneInfo scene = SceneInfoOuterClass.SceneInfo.newInstance(); @@ -49,7 +49,7 @@ public static StartChallengeScRsp newInstance() { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 7; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -57,7 +57,7 @@ public boolean hasRetcode() { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 7; * @return this */ public StartChallengeScRsp clearRetcode() { @@ -67,7 +67,7 @@ public StartChallengeScRsp clearRetcode() { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 7; * @return the retcode */ public int getRetcode() { @@ -75,7 +75,7 @@ public int getRetcode() { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 7; * @param value the retcode to set * @return this */ @@ -86,7 +86,7 @@ public StartChallengeScRsp setRetcode(final int value) { } /** - * optional .ChallengeInfo challenge_info = 3; + * optional .ChallengeInfo challenge_info = 6; * @return whether the challengeInfo field is set */ public boolean hasChallengeInfo() { @@ -94,7 +94,7 @@ public boolean hasChallengeInfo() { } /** - * optional .ChallengeInfo challenge_info = 3; + * optional .ChallengeInfo challenge_info = 6; * @return this */ public StartChallengeScRsp clearChallengeInfo() { @@ -104,7 +104,7 @@ public StartChallengeScRsp clearChallengeInfo() { } /** - * optional .ChallengeInfo challenge_info = 3; + * optional .ChallengeInfo challenge_info = 6; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -118,7 +118,7 @@ public ChallengeInfoOuterClass.ChallengeInfo getChallengeInfo() { } /** - * optional .ChallengeInfo challenge_info = 3; + * optional .ChallengeInfo challenge_info = 6; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -132,7 +132,7 @@ public ChallengeInfoOuterClass.ChallengeInfo getMutableChallengeInfo() { } /** - * optional .ChallengeInfo challenge_info = 3; + * optional .ChallengeInfo challenge_info = 6; * @param value the challengeInfo to set * @return this */ @@ -143,7 +143,7 @@ public StartChallengeScRsp setChallengeInfo(final ChallengeInfoOuterClass.Challe } /** - * optional .LineupInfo lineup = 4; + * optional .LineupInfo lineup = 13; * @return whether the lineup field is set */ public boolean hasLineup() { @@ -151,7 +151,7 @@ public boolean hasLineup() { } /** - * optional .LineupInfo lineup = 4; + * optional .LineupInfo lineup = 13; * @return this */ public StartChallengeScRsp clearLineup() { @@ -161,7 +161,7 @@ public StartChallengeScRsp clearLineup() { } /** - * optional .LineupInfo lineup = 4; + * optional .LineupInfo lineup = 13; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -175,7 +175,7 @@ public LineupInfoOuterClass.LineupInfo getLineup() { } /** - * optional .LineupInfo lineup = 4; + * optional .LineupInfo lineup = 13; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -189,7 +189,7 @@ public LineupInfoOuterClass.LineupInfo getMutableLineup() { } /** - * optional .LineupInfo lineup = 4; + * optional .LineupInfo lineup = 13; * @param value the lineup to set * @return this */ @@ -200,7 +200,7 @@ public StartChallengeScRsp setLineup(final LineupInfoOuterClass.LineupInfo value } /** - * optional .SceneInfo scene = 11; + * optional .SceneInfo scene = 15; * @return whether the scene field is set */ public boolean hasScene() { @@ -208,7 +208,7 @@ public boolean hasScene() { } /** - * optional .SceneInfo scene = 11; + * optional .SceneInfo scene = 15; * @return this */ public StartChallengeScRsp clearScene() { @@ -218,7 +218,7 @@ public StartChallengeScRsp clearScene() { } /** - * optional .SceneInfo scene = 11; + * optional .SceneInfo scene = 15; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -232,7 +232,7 @@ public SceneInfoOuterClass.SceneInfo getScene() { } /** - * optional .SceneInfo scene = 11; + * optional .SceneInfo scene = 15; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -246,7 +246,7 @@ public SceneInfoOuterClass.SceneInfo getMutableScene() { } /** - * optional .SceneInfo scene = 11; + * optional .SceneInfo scene = 15; * @param value the scene to set * @return this */ @@ -336,19 +336,19 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 26); + output.writeRawByte((byte) 50); output.writeMessageNoTag(challengeInfo); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 34); + output.writeRawByte((byte) 106); output.writeMessageNoTag(lineup); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 90); + output.writeRawByte((byte) 122); output.writeMessageNoTag(scene); } } @@ -378,34 +378,34 @@ public StartChallengeScRsp mergeFrom(final ProtoSource input) throws IOException int tag = input.readTag(); while (true) { switch (tag) { - case 8: { + case 56: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 26) { + if (tag != 50) { break; } } - case 26: { + case 50: { // challengeInfo input.readMessage(challengeInfo); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 34) { + if (tag != 106) { break; } } - case 34: { + case 106: { // lineup input.readMessage(lineup); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 90) { + if (tag != 122) { break; } } - case 90: { + case 122: { // scene input.readMessage(scene); bitField0_ |= 0x00000008; diff --git a/src/generated/main/emu/lunarcore/proto/StartChallengeStoryBuffInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/StartChallengeStoryBuffInfoOuterClass.java index fc5547b32..879308376 100644 --- a/src/generated/main/emu/lunarcore/proto/StartChallengeStoryBuffInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/StartChallengeStoryBuffInfoOuterClass.java @@ -19,12 +19,12 @@ public static final class StartChallengeStoryBuffInfo extends ProtoMessageoptional uint32 story_buff_one = 12; + * optional uint32 story_buff_one = 8; */ private int storyBuffOne; /** - * optional uint32 story_buff_two = 13; + * optional uint32 story_buff_two = 9; */ private int storyBuffTwo; @@ -39,7 +39,7 @@ public static StartChallengeStoryBuffInfo newInstance() { } /** - * optional uint32 story_buff_one = 12; + * optional uint32 story_buff_one = 8; * @return whether the storyBuffOne field is set */ public boolean hasStoryBuffOne() { @@ -47,7 +47,7 @@ public boolean hasStoryBuffOne() { } /** - * optional uint32 story_buff_one = 12; + * optional uint32 story_buff_one = 8; * @return this */ public StartChallengeStoryBuffInfo clearStoryBuffOne() { @@ -57,7 +57,7 @@ public StartChallengeStoryBuffInfo clearStoryBuffOne() { } /** - * optional uint32 story_buff_one = 12; + * optional uint32 story_buff_one = 8; * @return the storyBuffOne */ public int getStoryBuffOne() { @@ -65,7 +65,7 @@ public int getStoryBuffOne() { } /** - * optional uint32 story_buff_one = 12; + * optional uint32 story_buff_one = 8; * @param value the storyBuffOne to set * @return this */ @@ -76,7 +76,7 @@ public StartChallengeStoryBuffInfo setStoryBuffOne(final int value) { } /** - * optional uint32 story_buff_two = 13; + * optional uint32 story_buff_two = 9; * @return whether the storyBuffTwo field is set */ public boolean hasStoryBuffTwo() { @@ -84,7 +84,7 @@ public boolean hasStoryBuffTwo() { } /** - * optional uint32 story_buff_two = 13; + * optional uint32 story_buff_two = 9; * @return this */ public StartChallengeStoryBuffInfo clearStoryBuffTwo() { @@ -94,7 +94,7 @@ public StartChallengeStoryBuffInfo clearStoryBuffTwo() { } /** - * optional uint32 story_buff_two = 13; + * optional uint32 story_buff_two = 9; * @return the storyBuffTwo */ public int getStoryBuffTwo() { @@ -102,7 +102,7 @@ public int getStoryBuffTwo() { } /** - * optional uint32 story_buff_two = 13; + * optional uint32 story_buff_two = 9; * @param value the storyBuffTwo to set * @return this */ @@ -177,11 +177,11 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(storyBuffOne); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(storyBuffTwo); } } @@ -205,16 +205,16 @@ public StartChallengeStoryBuffInfo mergeFrom(final ProtoSource input) throws IOE int tag = input.readTag(); while (true) { switch (tag) { - case 96: { + case 64: { // storyBuffOne storyBuffOne = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 104) { + if (tag != 72) { break; } } - case 104: { + case 72: { // storyBuffTwo storyBuffTwo = input.readUInt32(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/StartChallengeStoryInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/StartChallengeStoryInfoOuterClass.java index db16bdc24..690876de9 100644 --- a/src/generated/main/emu/lunarcore/proto/StartChallengeStoryInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/StartChallengeStoryInfoOuterClass.java @@ -19,7 +19,7 @@ public static final class StartChallengeStoryInfo extends ProtoMessageoptional .StartChallengeStoryBuffInfo story_buff_info = 1; + * optional .StartChallengeStoryBuffInfo story_buff_info = 2; */ private final StartChallengeStoryBuffInfoOuterClass.StartChallengeStoryBuffInfo storyBuffInfo = StartChallengeStoryBuffInfoOuterClass.StartChallengeStoryBuffInfo.newInstance(); @@ -34,7 +34,7 @@ public static StartChallengeStoryInfo newInstance() { } /** - * optional .StartChallengeStoryBuffInfo story_buff_info = 1; + * optional .StartChallengeStoryBuffInfo story_buff_info = 2; * @return whether the storyBuffInfo field is set */ public boolean hasStoryBuffInfo() { @@ -42,7 +42,7 @@ public boolean hasStoryBuffInfo() { } /** - * optional .StartChallengeStoryBuffInfo story_buff_info = 1; + * optional .StartChallengeStoryBuffInfo story_buff_info = 2; * @return this */ public StartChallengeStoryInfo clearStoryBuffInfo() { @@ -52,7 +52,7 @@ public StartChallengeStoryInfo clearStoryBuffInfo() { } /** - * optional .StartChallengeStoryBuffInfo story_buff_info = 1; + * optional .StartChallengeStoryBuffInfo story_buff_info = 2; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -66,7 +66,7 @@ public StartChallengeStoryBuffInfoOuterClass.StartChallengeStoryBuffInfo getStor } /** - * optional .StartChallengeStoryBuffInfo story_buff_info = 1; + * optional .StartChallengeStoryBuffInfo story_buff_info = 2; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -81,7 +81,7 @@ public StartChallengeStoryBuffInfoOuterClass.StartChallengeStoryBuffInfo getMuta } /** - * optional .StartChallengeStoryBuffInfo story_buff_info = 1; + * optional .StartChallengeStoryBuffInfo story_buff_info = 2; * @param value the storyBuffInfo to set * @return this */ @@ -152,7 +152,7 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 10); + output.writeRawByte((byte) 18); output.writeMessageNoTag(storyBuffInfo); } } @@ -173,7 +173,7 @@ public StartChallengeStoryInfo mergeFrom(final ProtoSource input) throws IOExcep int tag = input.readTag(); while (true) { switch (tag) { - case 10: { + case 18: { // storyBuffInfo input.readMessage(storyBuffInfo); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/StartCocoonStageCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/StartCocoonStageCsReqOuterClass.java index 7c832a20d..ea29037d9 100644 --- a/src/generated/main/emu/lunarcore/proto/StartCocoonStageCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/StartCocoonStageCsReqOuterClass.java @@ -19,24 +19,24 @@ public static final class StartCocoonStageCsReq extends ProtoMessageoptional uint32 world_level = 5; + * optional uint32 cocoon_id = 5; */ - private int worldLevel; + private int cocoonId; /** - * optional uint32 wave = 11; + * optional uint32 prop_entity_id = 6; */ - private int wave; + private int propEntityId; /** - * optional uint32 cocoon_id = 12; + * optional uint32 world_level = 7; */ - private int cocoonId; + private int worldLevel; /** - * optional uint32 prop_entity_id = 14; + * optional uint32 wave = 14; */ - private int propEntityId; + private int wave; private StartCocoonStageCsReq() { } @@ -49,150 +49,150 @@ public static StartCocoonStageCsReq newInstance() { } /** - * optional uint32 world_level = 5; - * @return whether the worldLevel field is set + * optional uint32 cocoon_id = 5; + * @return whether the cocoonId field is set */ - public boolean hasWorldLevel() { + public boolean hasCocoonId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 world_level = 5; + * optional uint32 cocoon_id = 5; * @return this */ - public StartCocoonStageCsReq clearWorldLevel() { + public StartCocoonStageCsReq clearCocoonId() { bitField0_ &= ~0x00000001; - worldLevel = 0; + cocoonId = 0; return this; } /** - * optional uint32 world_level = 5; - * @return the worldLevel + * optional uint32 cocoon_id = 5; + * @return the cocoonId */ - public int getWorldLevel() { - return worldLevel; + public int getCocoonId() { + return cocoonId; } /** - * optional uint32 world_level = 5; - * @param value the worldLevel to set + * optional uint32 cocoon_id = 5; + * @param value the cocoonId to set * @return this */ - public StartCocoonStageCsReq setWorldLevel(final int value) { + public StartCocoonStageCsReq setCocoonId(final int value) { bitField0_ |= 0x00000001; - worldLevel = value; + cocoonId = value; return this; } /** - * optional uint32 wave = 11; - * @return whether the wave field is set + * optional uint32 prop_entity_id = 6; + * @return whether the propEntityId field is set */ - public boolean hasWave() { + public boolean hasPropEntityId() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 wave = 11; + * optional uint32 prop_entity_id = 6; * @return this */ - public StartCocoonStageCsReq clearWave() { + public StartCocoonStageCsReq clearPropEntityId() { bitField0_ &= ~0x00000002; - wave = 0; + propEntityId = 0; return this; } /** - * optional uint32 wave = 11; - * @return the wave + * optional uint32 prop_entity_id = 6; + * @return the propEntityId */ - public int getWave() { - return wave; + public int getPropEntityId() { + return propEntityId; } /** - * optional uint32 wave = 11; - * @param value the wave to set + * optional uint32 prop_entity_id = 6; + * @param value the propEntityId to set * @return this */ - public StartCocoonStageCsReq setWave(final int value) { + public StartCocoonStageCsReq setPropEntityId(final int value) { bitField0_ |= 0x00000002; - wave = value; + propEntityId = value; return this; } /** - * optional uint32 cocoon_id = 12; - * @return whether the cocoonId field is set + * optional uint32 world_level = 7; + * @return whether the worldLevel field is set */ - public boolean hasCocoonId() { + public boolean hasWorldLevel() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 cocoon_id = 12; + * optional uint32 world_level = 7; * @return this */ - public StartCocoonStageCsReq clearCocoonId() { + public StartCocoonStageCsReq clearWorldLevel() { bitField0_ &= ~0x00000004; - cocoonId = 0; + worldLevel = 0; return this; } /** - * optional uint32 cocoon_id = 12; - * @return the cocoonId + * optional uint32 world_level = 7; + * @return the worldLevel */ - public int getCocoonId() { - return cocoonId; + public int getWorldLevel() { + return worldLevel; } /** - * optional uint32 cocoon_id = 12; - * @param value the cocoonId to set + * optional uint32 world_level = 7; + * @param value the worldLevel to set * @return this */ - public StartCocoonStageCsReq setCocoonId(final int value) { + public StartCocoonStageCsReq setWorldLevel(final int value) { bitField0_ |= 0x00000004; - cocoonId = value; + worldLevel = value; return this; } /** - * optional uint32 prop_entity_id = 14; - * @return whether the propEntityId field is set + * optional uint32 wave = 14; + * @return whether the wave field is set */ - public boolean hasPropEntityId() { + public boolean hasWave() { return (bitField0_ & 0x00000008) != 0; } /** - * optional uint32 prop_entity_id = 14; + * optional uint32 wave = 14; * @return this */ - public StartCocoonStageCsReq clearPropEntityId() { + public StartCocoonStageCsReq clearWave() { bitField0_ &= ~0x00000008; - propEntityId = 0; + wave = 0; return this; } /** - * optional uint32 prop_entity_id = 14; - * @return the propEntityId + * optional uint32 wave = 14; + * @return the wave */ - public int getPropEntityId() { - return propEntityId; + public int getWave() { + return wave; } /** - * optional uint32 prop_entity_id = 14; - * @param value the propEntityId to set + * optional uint32 wave = 14; + * @param value the wave to set * @return this */ - public StartCocoonStageCsReq setPropEntityId(final int value) { + public StartCocoonStageCsReq setWave(final int value) { bitField0_ |= 0x00000008; - propEntityId = value; + wave = value; return this; } @@ -201,10 +201,10 @@ public StartCocoonStageCsReq copyFrom(final StartCocoonStageCsReq other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - worldLevel = other.worldLevel; - wave = other.wave; cocoonId = other.cocoonId; propEntityId = other.propEntityId; + worldLevel = other.worldLevel; + wave = other.wave; } return this; } @@ -215,18 +215,18 @@ public StartCocoonStageCsReq mergeFrom(final StartCocoonStageCsReq other) { return this; } cachedSize = -1; - if (other.hasWorldLevel()) { - setWorldLevel(other.worldLevel); - } - if (other.hasWave()) { - setWave(other.wave); - } if (other.hasCocoonId()) { setCocoonId(other.cocoonId); } if (other.hasPropEntityId()) { setPropEntityId(other.propEntityId); } + if (other.hasWorldLevel()) { + setWorldLevel(other.worldLevel); + } + if (other.hasWave()) { + setWave(other.wave); + } return this; } @@ -237,10 +237,10 @@ public StartCocoonStageCsReq clear() { } cachedSize = -1; bitField0_ = 0; - worldLevel = 0; - wave = 0; cocoonId = 0; propEntityId = 0; + worldLevel = 0; + wave = 0; return this; } @@ -264,29 +264,29 @@ public boolean equals(Object o) { } StartCocoonStageCsReq other = (StartCocoonStageCsReq) o; return bitField0_ == other.bitField0_ - && (!hasWorldLevel() || worldLevel == other.worldLevel) - && (!hasWave() || wave == other.wave) && (!hasCocoonId() || cocoonId == other.cocoonId) - && (!hasPropEntityId() || propEntityId == other.propEntityId); + && (!hasPropEntityId() || propEntityId == other.propEntityId) + && (!hasWorldLevel() || worldLevel == other.worldLevel) + && (!hasWave() || wave == other.wave); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { output.writeRawByte((byte) 40); - output.writeUInt32NoTag(worldLevel); + output.writeUInt32NoTag(cocoonId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 88); - output.writeUInt32NoTag(wave); + output.writeRawByte((byte) 48); + output.writeUInt32NoTag(propEntityId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 96); - output.writeUInt32NoTag(cocoonId); + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(worldLevel); } if ((bitField0_ & 0x00000008) != 0) { output.writeRawByte((byte) 112); - output.writeUInt32NoTag(propEntityId); + output.writeUInt32NoTag(wave); } } @@ -294,16 +294,16 @@ public void writeTo(final ProtoSink output) throws IOException { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(worldLevel); + size += 1 + ProtoSink.computeUInt32SizeNoTag(cocoonId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(wave); + size += 1 + ProtoSink.computeUInt32SizeNoTag(propEntityId); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(cocoonId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(worldLevel); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(propEntityId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(wave); } return size; } @@ -316,26 +316,26 @@ public StartCocoonStageCsReq mergeFrom(final ProtoSource input) throws IOExcepti while (true) { switch (tag) { case 40: { - // worldLevel - worldLevel = input.readUInt32(); + // cocoonId + cocoonId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 88) { + if (tag != 48) { break; } } - case 88: { - // wave - wave = input.readUInt32(); + case 48: { + // propEntityId + propEntityId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 96) { + if (tag != 56) { break; } } - case 96: { - // cocoonId - cocoonId = input.readUInt32(); + case 56: { + // worldLevel + worldLevel = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 112) { @@ -343,8 +343,8 @@ public StartCocoonStageCsReq mergeFrom(final ProtoSource input) throws IOExcepti } } case 112: { - // propEntityId - propEntityId = input.readUInt32(); + // wave + wave = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); if (tag != 0) { @@ -369,16 +369,16 @@ public StartCocoonStageCsReq mergeFrom(final ProtoSource input) throws IOExcepti public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.worldLevel, worldLevel); + output.writeUInt32(FieldNames.cocoonId, cocoonId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.wave, wave); + output.writeUInt32(FieldNames.propEntityId, propEntityId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.cocoonId, cocoonId); + output.writeUInt32(FieldNames.worldLevel, worldLevel); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.propEntityId, propEntityId); + output.writeUInt32(FieldNames.wave, wave); } output.endObject(); } @@ -390,11 +390,11 @@ public StartCocoonStageCsReq mergeFrom(final JsonSource input) throws IOExceptio } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 440007442: - case 1305257111: { - if (input.isAtField(FieldNames.worldLevel)) { + case -886563534: + case -1713644381: { + if (input.isAtField(FieldNames.cocoonId)) { if (!input.trySkipNullValue()) { - worldLevel = input.readUInt32(); + cocoonId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -402,10 +402,11 @@ public StartCocoonStageCsReq mergeFrom(final JsonSource input) throws IOExceptio } break; } - case 3642105: { - if (input.isAtField(FieldNames.wave)) { + case -68717343: + case -57484005: { + if (input.isAtField(FieldNames.propEntityId)) { if (!input.trySkipNullValue()) { - wave = input.readUInt32(); + propEntityId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -413,11 +414,11 @@ public StartCocoonStageCsReq mergeFrom(final JsonSource input) throws IOExceptio } break; } - case -886563534: - case -1713644381: { - if (input.isAtField(FieldNames.cocoonId)) { + case 440007442: + case 1305257111: { + if (input.isAtField(FieldNames.worldLevel)) { if (!input.trySkipNullValue()) { - cocoonId = input.readUInt32(); + worldLevel = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -425,11 +426,10 @@ public StartCocoonStageCsReq mergeFrom(final JsonSource input) throws IOExceptio } break; } - case -68717343: - case -57484005: { - if (input.isAtField(FieldNames.propEntityId)) { + case 3642105: { + if (input.isAtField(FieldNames.wave)) { if (!input.trySkipNullValue()) { - propEntityId = input.readUInt32(); + wave = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -490,13 +490,13 @@ public StartCocoonStageCsReq create() { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName worldLevel = FieldName.forField("worldLevel", "world_level"); - - static final FieldName wave = FieldName.forField("wave"); - static final FieldName cocoonId = FieldName.forField("cocoonId", "cocoon_id"); static final FieldName propEntityId = FieldName.forField("propEntityId", "prop_entity_id"); + + static final FieldName worldLevel = FieldName.forField("worldLevel", "world_level"); + + static final FieldName wave = FieldName.forField("wave"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/StartCocoonStageScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/StartCocoonStageScRspOuterClass.java index b2eee03ee..89add2c3b 100644 --- a/src/generated/main/emu/lunarcore/proto/StartCocoonStageScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/StartCocoonStageScRspOuterClass.java @@ -19,27 +19,27 @@ public static final class StartCocoonStageScRsp extends ProtoMessageoptional uint32 cocoon_id = 5; + * optional uint32 cocoon_id = 1; */ private int cocoonId; /** - * optional uint32 prop_entity_id = 6; + * optional uint32 wave = 4; */ - private int propEntityId; + private int wave; /** - * optional uint32 wave = 8; + * optional uint32 prop_entity_id = 8; */ - private int wave; + private int propEntityId; /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 15; */ private int retcode; /** - * optional .SceneBattleInfo battle_info = 12; + * optional .SceneBattleInfo battle_info = 6; */ private final SceneBattleInfoOuterClass.SceneBattleInfo battleInfo = SceneBattleInfoOuterClass.SceneBattleInfo.newInstance(); @@ -54,7 +54,7 @@ public static StartCocoonStageScRsp newInstance() { } /** - * optional uint32 cocoon_id = 5; + * optional uint32 cocoon_id = 1; * @return whether the cocoonId field is set */ public boolean hasCocoonId() { @@ -62,7 +62,7 @@ public boolean hasCocoonId() { } /** - * optional uint32 cocoon_id = 5; + * optional uint32 cocoon_id = 1; * @return this */ public StartCocoonStageScRsp clearCocoonId() { @@ -72,7 +72,7 @@ public StartCocoonStageScRsp clearCocoonId() { } /** - * optional uint32 cocoon_id = 5; + * optional uint32 cocoon_id = 1; * @return the cocoonId */ public int getCocoonId() { @@ -80,7 +80,7 @@ public int getCocoonId() { } /** - * optional uint32 cocoon_id = 5; + * optional uint32 cocoon_id = 1; * @param value the cocoonId to set * @return this */ @@ -91,81 +91,81 @@ public StartCocoonStageScRsp setCocoonId(final int value) { } /** - * optional uint32 prop_entity_id = 6; - * @return whether the propEntityId field is set + * optional uint32 wave = 4; + * @return whether the wave field is set */ - public boolean hasPropEntityId() { + public boolean hasWave() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 prop_entity_id = 6; + * optional uint32 wave = 4; * @return this */ - public StartCocoonStageScRsp clearPropEntityId() { + public StartCocoonStageScRsp clearWave() { bitField0_ &= ~0x00000002; - propEntityId = 0; + wave = 0; return this; } /** - * optional uint32 prop_entity_id = 6; - * @return the propEntityId + * optional uint32 wave = 4; + * @return the wave */ - public int getPropEntityId() { - return propEntityId; + public int getWave() { + return wave; } /** - * optional uint32 prop_entity_id = 6; - * @param value the propEntityId to set + * optional uint32 wave = 4; + * @param value the wave to set * @return this */ - public StartCocoonStageScRsp setPropEntityId(final int value) { + public StartCocoonStageScRsp setWave(final int value) { bitField0_ |= 0x00000002; - propEntityId = value; + wave = value; return this; } /** - * optional uint32 wave = 8; - * @return whether the wave field is set + * optional uint32 prop_entity_id = 8; + * @return whether the propEntityId field is set */ - public boolean hasWave() { + public boolean hasPropEntityId() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 wave = 8; + * optional uint32 prop_entity_id = 8; * @return this */ - public StartCocoonStageScRsp clearWave() { + public StartCocoonStageScRsp clearPropEntityId() { bitField0_ &= ~0x00000004; - wave = 0; + propEntityId = 0; return this; } /** - * optional uint32 wave = 8; - * @return the wave + * optional uint32 prop_entity_id = 8; + * @return the propEntityId */ - public int getWave() { - return wave; + public int getPropEntityId() { + return propEntityId; } /** - * optional uint32 wave = 8; - * @param value the wave to set + * optional uint32 prop_entity_id = 8; + * @param value the propEntityId to set * @return this */ - public StartCocoonStageScRsp setWave(final int value) { + public StartCocoonStageScRsp setPropEntityId(final int value) { bitField0_ |= 0x00000004; - wave = value; + propEntityId = value; return this; } /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 15; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -173,7 +173,7 @@ public boolean hasRetcode() { } /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 15; * @return this */ public StartCocoonStageScRsp clearRetcode() { @@ -183,7 +183,7 @@ public StartCocoonStageScRsp clearRetcode() { } /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 15; * @return the retcode */ public int getRetcode() { @@ -191,7 +191,7 @@ public int getRetcode() { } /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 15; * @param value the retcode to set * @return this */ @@ -202,7 +202,7 @@ public StartCocoonStageScRsp setRetcode(final int value) { } /** - * optional .SceneBattleInfo battle_info = 12; + * optional .SceneBattleInfo battle_info = 6; * @return whether the battleInfo field is set */ public boolean hasBattleInfo() { @@ -210,7 +210,7 @@ public boolean hasBattleInfo() { } /** - * optional .SceneBattleInfo battle_info = 12; + * optional .SceneBattleInfo battle_info = 6; * @return this */ public StartCocoonStageScRsp clearBattleInfo() { @@ -220,7 +220,7 @@ public StartCocoonStageScRsp clearBattleInfo() { } /** - * optional .SceneBattleInfo battle_info = 12; + * optional .SceneBattleInfo battle_info = 6; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -234,7 +234,7 @@ public SceneBattleInfoOuterClass.SceneBattleInfo getBattleInfo() { } /** - * optional .SceneBattleInfo battle_info = 12; + * optional .SceneBattleInfo battle_info = 6; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -248,7 +248,7 @@ public SceneBattleInfoOuterClass.SceneBattleInfo getMutableBattleInfo() { } /** - * optional .SceneBattleInfo battle_info = 12; + * optional .SceneBattleInfo battle_info = 6; * @param value the battleInfo to set * @return this */ @@ -265,8 +265,8 @@ public StartCocoonStageScRsp copyFrom(final StartCocoonStageScRsp other) { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; cocoonId = other.cocoonId; - propEntityId = other.propEntityId; wave = other.wave; + propEntityId = other.propEntityId; retcode = other.retcode; battleInfo.copyFrom(other.battleInfo); } @@ -282,12 +282,12 @@ public StartCocoonStageScRsp mergeFrom(final StartCocoonStageScRsp other) { if (other.hasCocoonId()) { setCocoonId(other.cocoonId); } - if (other.hasPropEntityId()) { - setPropEntityId(other.propEntityId); - } if (other.hasWave()) { setWave(other.wave); } + if (other.hasPropEntityId()) { + setPropEntityId(other.propEntityId); + } if (other.hasRetcode()) { setRetcode(other.retcode); } @@ -305,8 +305,8 @@ public StartCocoonStageScRsp clear() { cachedSize = -1; bitField0_ = 0; cocoonId = 0; - propEntityId = 0; wave = 0; + propEntityId = 0; retcode = 0; battleInfo.clear(); return this; @@ -334,8 +334,8 @@ public boolean equals(Object o) { StartCocoonStageScRsp other = (StartCocoonStageScRsp) o; return bitField0_ == other.bitField0_ && (!hasCocoonId() || cocoonId == other.cocoonId) - && (!hasPropEntityId() || propEntityId == other.propEntityId) && (!hasWave() || wave == other.wave) + && (!hasPropEntityId() || propEntityId == other.propEntityId) && (!hasRetcode() || retcode == other.retcode) && (!hasBattleInfo() || battleInfo.equals(other.battleInfo)); } @@ -343,23 +343,23 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(cocoonId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 48); - output.writeUInt32NoTag(propEntityId); + output.writeRawByte((byte) 32); + output.writeUInt32NoTag(wave); } if ((bitField0_ & 0x00000004) != 0) { output.writeRawByte((byte) 64); - output.writeUInt32NoTag(wave); + output.writeUInt32NoTag(propEntityId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 98); + output.writeRawByte((byte) 50); output.writeMessageNoTag(battleInfo); } } @@ -371,10 +371,10 @@ protected int computeSerializedSize() { size += 1 + ProtoSink.computeUInt32SizeNoTag(cocoonId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(propEntityId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(wave); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(wave); + size += 1 + ProtoSink.computeUInt32SizeNoTag(propEntityId); } if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); @@ -392,18 +392,18 @@ public StartCocoonStageScRsp mergeFrom(final ProtoSource input) throws IOExcepti int tag = input.readTag(); while (true) { switch (tag) { - case 40: { + case 8: { // cocoonId cocoonId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 48) { + if (tag != 32) { break; } } - case 48: { - // propEntityId - propEntityId = input.readUInt32(); + case 32: { + // wave + wave = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 64) { @@ -411,24 +411,24 @@ public StartCocoonStageScRsp mergeFrom(final ProtoSource input) throws IOExcepti } } case 64: { - // wave - wave = input.readUInt32(); + // propEntityId + propEntityId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 88) { + if (tag != 120) { break; } } - case 88: { + case 120: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 98) { + if (tag != 50) { break; } } - case 98: { + case 50: { // battleInfo input.readMessage(battleInfo); bitField0_ |= 0x00000010; @@ -458,10 +458,10 @@ public void writeTo(final JsonSink output) throws IOException { output.writeUInt32(FieldNames.cocoonId, cocoonId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.propEntityId, propEntityId); + output.writeUInt32(FieldNames.wave, wave); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.wave, wave); + output.writeUInt32(FieldNames.propEntityId, propEntityId); } if ((bitField0_ & 0x00000008) != 0) { output.writeUInt32(FieldNames.retcode, retcode); @@ -491,11 +491,10 @@ public StartCocoonStageScRsp mergeFrom(final JsonSource input) throws IOExceptio } break; } - case -68717343: - case -57484005: { - if (input.isAtField(FieldNames.propEntityId)) { + case 3642105: { + if (input.isAtField(FieldNames.wave)) { if (!input.trySkipNullValue()) { - propEntityId = input.readUInt32(); + wave = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -503,10 +502,11 @@ public StartCocoonStageScRsp mergeFrom(final JsonSource input) throws IOExceptio } break; } - case 3642105: { - if (input.isAtField(FieldNames.wave)) { + case -68717343: + case -57484005: { + if (input.isAtField(FieldNames.propEntityId)) { if (!input.trySkipNullValue()) { - wave = input.readUInt32(); + propEntityId = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -592,10 +592,10 @@ public StartCocoonStageScRsp create() { static class FieldNames { static final FieldName cocoonId = FieldName.forField("cocoonId", "cocoon_id"); - static final FieldName propEntityId = FieldName.forField("propEntityId", "prop_entity_id"); - static final FieldName wave = FieldName.forField("wave"); + static final FieldName propEntityId = FieldName.forField("propEntityId", "prop_entity_id"); + static final FieldName retcode = FieldName.forField("retcode"); static final FieldName battleInfo = FieldName.forField("battleInfo", "battle_info"); diff --git a/src/generated/main/emu/lunarcore/proto/SwapLineupCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SwapLineupCsReqOuterClass.java index ce3e5a2a4..5615efc44 100644 --- a/src/generated/main/emu/lunarcore/proto/SwapLineupCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SwapLineupCsReqOuterClass.java @@ -19,32 +19,32 @@ public static final class SwapLineupCsReq extends ProtoMessage private static final long serialVersionUID = 0L; /** - * optional uint32 plane_id = 7; - */ - private int planeId; - - /** - * optional uint32 src_slot = 11; + * optional uint32 src_slot = 1; */ private int srcSlot; /** - * optional uint32 dst_slot = 12; + * optional uint32 dst_slot = 3; */ private int dstSlot; /** - * optional uint32 index = 15; + * optional uint32 index = 7; */ private int index; /** - * optional .ExtraLineupType extra_lineup_type = 14; + * optional uint32 plane_id = 8; + */ + private int planeId; + + /** + * optional .ExtraLineupType extra_lineup_type = 11; */ private int extraLineupType; /** - * optional bool is_virtual = 2; + * optional bool is_virtual = 6; */ private boolean isVirtual; @@ -59,155 +59,155 @@ public static SwapLineupCsReq newInstance() { } /** - * optional uint32 plane_id = 7; - * @return whether the planeId field is set + * optional uint32 src_slot = 1; + * @return whether the srcSlot field is set */ - public boolean hasPlaneId() { + public boolean hasSrcSlot() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 plane_id = 7; + * optional uint32 src_slot = 1; * @return this */ - public SwapLineupCsReq clearPlaneId() { + public SwapLineupCsReq clearSrcSlot() { bitField0_ &= ~0x00000001; - planeId = 0; + srcSlot = 0; return this; } /** - * optional uint32 plane_id = 7; - * @return the planeId + * optional uint32 src_slot = 1; + * @return the srcSlot */ - public int getPlaneId() { - return planeId; + public int getSrcSlot() { + return srcSlot; } /** - * optional uint32 plane_id = 7; - * @param value the planeId to set + * optional uint32 src_slot = 1; + * @param value the srcSlot to set * @return this */ - public SwapLineupCsReq setPlaneId(final int value) { + public SwapLineupCsReq setSrcSlot(final int value) { bitField0_ |= 0x00000001; - planeId = value; + srcSlot = value; return this; } /** - * optional uint32 src_slot = 11; - * @return whether the srcSlot field is set + * optional uint32 dst_slot = 3; + * @return whether the dstSlot field is set */ - public boolean hasSrcSlot() { + public boolean hasDstSlot() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 src_slot = 11; + * optional uint32 dst_slot = 3; * @return this */ - public SwapLineupCsReq clearSrcSlot() { + public SwapLineupCsReq clearDstSlot() { bitField0_ &= ~0x00000002; - srcSlot = 0; + dstSlot = 0; return this; } /** - * optional uint32 src_slot = 11; - * @return the srcSlot + * optional uint32 dst_slot = 3; + * @return the dstSlot */ - public int getSrcSlot() { - return srcSlot; + public int getDstSlot() { + return dstSlot; } /** - * optional uint32 src_slot = 11; - * @param value the srcSlot to set + * optional uint32 dst_slot = 3; + * @param value the dstSlot to set * @return this */ - public SwapLineupCsReq setSrcSlot(final int value) { + public SwapLineupCsReq setDstSlot(final int value) { bitField0_ |= 0x00000002; - srcSlot = value; + dstSlot = value; return this; } /** - * optional uint32 dst_slot = 12; - * @return whether the dstSlot field is set + * optional uint32 index = 7; + * @return whether the index field is set */ - public boolean hasDstSlot() { + public boolean hasIndex() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 dst_slot = 12; + * optional uint32 index = 7; * @return this */ - public SwapLineupCsReq clearDstSlot() { + public SwapLineupCsReq clearIndex() { bitField0_ &= ~0x00000004; - dstSlot = 0; + index = 0; return this; } /** - * optional uint32 dst_slot = 12; - * @return the dstSlot + * optional uint32 index = 7; + * @return the index */ - public int getDstSlot() { - return dstSlot; + public int getIndex() { + return index; } /** - * optional uint32 dst_slot = 12; - * @param value the dstSlot to set + * optional uint32 index = 7; + * @param value the index to set * @return this */ - public SwapLineupCsReq setDstSlot(final int value) { + public SwapLineupCsReq setIndex(final int value) { bitField0_ |= 0x00000004; - dstSlot = value; + index = value; return this; } /** - * optional uint32 index = 15; - * @return whether the index field is set + * optional uint32 plane_id = 8; + * @return whether the planeId field is set */ - public boolean hasIndex() { + public boolean hasPlaneId() { return (bitField0_ & 0x00000008) != 0; } /** - * optional uint32 index = 15; + * optional uint32 plane_id = 8; * @return this */ - public SwapLineupCsReq clearIndex() { + public SwapLineupCsReq clearPlaneId() { bitField0_ &= ~0x00000008; - index = 0; + planeId = 0; return this; } /** - * optional uint32 index = 15; - * @return the index + * optional uint32 plane_id = 8; + * @return the planeId */ - public int getIndex() { - return index; + public int getPlaneId() { + return planeId; } /** - * optional uint32 index = 15; - * @param value the index to set + * optional uint32 plane_id = 8; + * @param value the planeId to set * @return this */ - public SwapLineupCsReq setIndex(final int value) { + public SwapLineupCsReq setPlaneId(final int value) { bitField0_ |= 0x00000008; - index = value; + planeId = value; return this; } /** - * optional .ExtraLineupType extra_lineup_type = 14; + * optional .ExtraLineupType extra_lineup_type = 11; * @return whether the extraLineupType field is set */ public boolean hasExtraLineupType() { @@ -215,7 +215,7 @@ public boolean hasExtraLineupType() { } /** - * optional .ExtraLineupType extra_lineup_type = 14; + * optional .ExtraLineupType extra_lineup_type = 11; * @return this */ public SwapLineupCsReq clearExtraLineupType() { @@ -225,7 +225,7 @@ public SwapLineupCsReq clearExtraLineupType() { } /** - * optional .ExtraLineupType extra_lineup_type = 14; + * optional .ExtraLineupType extra_lineup_type = 11; * @return the extraLineupType */ public ExtraLineupTypeOuterClass.ExtraLineupType getExtraLineupType() { @@ -258,7 +258,7 @@ public SwapLineupCsReq setExtraLineupTypeValue(final int value) { } /** - * optional .ExtraLineupType extra_lineup_type = 14; + * optional .ExtraLineupType extra_lineup_type = 11; * @param value the extraLineupType to set * @return this */ @@ -270,7 +270,7 @@ public SwapLineupCsReq setExtraLineupType( } /** - * optional bool is_virtual = 2; + * optional bool is_virtual = 6; * @return whether the isVirtual field is set */ public boolean hasIsVirtual() { @@ -278,7 +278,7 @@ public boolean hasIsVirtual() { } /** - * optional bool is_virtual = 2; + * optional bool is_virtual = 6; * @return this */ public SwapLineupCsReq clearIsVirtual() { @@ -288,7 +288,7 @@ public SwapLineupCsReq clearIsVirtual() { } /** - * optional bool is_virtual = 2; + * optional bool is_virtual = 6; * @return the isVirtual */ public boolean getIsVirtual() { @@ -296,7 +296,7 @@ public boolean getIsVirtual() { } /** - * optional bool is_virtual = 2; + * optional bool is_virtual = 6; * @param value the isVirtual to set * @return this */ @@ -311,10 +311,10 @@ public SwapLineupCsReq copyFrom(final SwapLineupCsReq other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - planeId = other.planeId; srcSlot = other.srcSlot; dstSlot = other.dstSlot; index = other.index; + planeId = other.planeId; extraLineupType = other.extraLineupType; isVirtual = other.isVirtual; } @@ -327,9 +327,6 @@ public SwapLineupCsReq mergeFrom(final SwapLineupCsReq other) { return this; } cachedSize = -1; - if (other.hasPlaneId()) { - setPlaneId(other.planeId); - } if (other.hasSrcSlot()) { setSrcSlot(other.srcSlot); } @@ -339,6 +336,9 @@ public SwapLineupCsReq mergeFrom(final SwapLineupCsReq other) { if (other.hasIndex()) { setIndex(other.index); } + if (other.hasPlaneId()) { + setPlaneId(other.planeId); + } if (other.hasExtraLineupType()) { setExtraLineupTypeValue(other.extraLineupType); } @@ -355,10 +355,10 @@ public SwapLineupCsReq clear() { } cachedSize = -1; bitField0_ = 0; - planeId = 0; srcSlot = 0; dstSlot = 0; index = 0; + planeId = 0; extraLineupType = 0; isVirtual = false; return this; @@ -384,10 +384,10 @@ public boolean equals(Object o) { } SwapLineupCsReq other = (SwapLineupCsReq) o; return bitField0_ == other.bitField0_ - && (!hasPlaneId() || planeId == other.planeId) && (!hasSrcSlot() || srcSlot == other.srcSlot) && (!hasDstSlot() || dstSlot == other.dstSlot) && (!hasIndex() || index == other.index) + && (!hasPlaneId() || planeId == other.planeId) && (!hasExtraLineupType() || extraLineupType == other.extraLineupType) && (!hasIsVirtual() || isVirtual == other.isVirtual); } @@ -395,27 +395,27 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 56); - output.writeUInt32NoTag(planeId); + output.writeRawByte((byte) 8); + output.writeUInt32NoTag(srcSlot); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 88); - output.writeUInt32NoTag(srcSlot); + output.writeRawByte((byte) 24); + output.writeUInt32NoTag(dstSlot); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 96); - output.writeUInt32NoTag(dstSlot); + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(index); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 120); - output.writeUInt32NoTag(index); + output.writeRawByte((byte) 64); + output.writeUInt32NoTag(planeId); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 88); output.writeEnumNoTag(extraLineupType); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 48); output.writeBoolNoTag(isVirtual); } } @@ -424,16 +424,16 @@ public void writeTo(final ProtoSink output) throws IOException { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(planeId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(srcSlot); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(srcSlot); + size += 1 + ProtoSink.computeUInt32SizeNoTag(dstSlot); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(dstSlot); + size += 1 + ProtoSink.computeUInt32SizeNoTag(index); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(index); + size += 1 + ProtoSink.computeUInt32SizeNoTag(planeId); } if ((bitField0_ & 0x00000010) != 0) { size += 1 + ProtoSink.computeEnumSizeNoTag(extraLineupType); @@ -451,43 +451,43 @@ public SwapLineupCsReq mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { - // planeId - planeId = input.readUInt32(); + case 8: { + // srcSlot + srcSlot = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 88) { + if (tag != 24) { break; } } - case 88: { - // srcSlot - srcSlot = input.readUInt32(); + case 24: { + // dstSlot + dstSlot = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 96) { + if (tag != 56) { break; } } - case 96: { - // dstSlot - dstSlot = input.readUInt32(); + case 56: { + // index + index = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 120) { + if (tag != 64) { break; } } - case 120: { - // index - index = input.readUInt32(); + case 64: { + // planeId + planeId = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 112) { + if (tag != 88) { break; } } - case 112: { + case 88: { // extraLineupType final int value = input.readInt32(); if (ExtraLineupTypeOuterClass.ExtraLineupType.forNumber(value) != null) { @@ -495,11 +495,11 @@ public SwapLineupCsReq mergeFrom(final ProtoSource input) throws IOException { bitField0_ |= 0x00000010; } tag = input.readTag(); - if (tag != 16) { + if (tag != 48) { break; } } - case 16: { + case 48: { // isVirtual isVirtual = input.readBool(); bitField0_ |= 0x00000020; @@ -526,16 +526,16 @@ public SwapLineupCsReq mergeFrom(final ProtoSource input) throws IOException { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.planeId, planeId); + output.writeUInt32(FieldNames.srcSlot, srcSlot); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.srcSlot, srcSlot); + output.writeUInt32(FieldNames.dstSlot, dstSlot); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.dstSlot, dstSlot); + output.writeUInt32(FieldNames.index, index); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.index, index); + output.writeUInt32(FieldNames.planeId, planeId); } if ((bitField0_ & 0x00000010) != 0) { output.writeEnum(FieldNames.extraLineupType, extraLineupType, ExtraLineupTypeOuterClass.ExtraLineupType.converter()); @@ -553,24 +553,12 @@ public SwapLineupCsReq mergeFrom(final JsonSource input) throws IOException { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -493896553: - case 1869097438: { - if (input.isAtField(FieldNames.planeId)) { - if (!input.trySkipNullValue()) { - planeId = input.readUInt32(); - bitField0_ |= 0x00000001; - } - } else { - input.skipUnknownField(); - } - break; - } case -1953527294: case -418516103: { if (input.isAtField(FieldNames.srcSlot)) { if (!input.trySkipNullValue()) { srcSlot = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; } } else { input.skipUnknownField(); @@ -582,7 +570,7 @@ public SwapLineupCsReq mergeFrom(final JsonSource input) throws IOException { if (input.isAtField(FieldNames.dstSlot)) { if (!input.trySkipNullValue()) { dstSlot = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; } } else { input.skipUnknownField(); @@ -593,6 +581,18 @@ public SwapLineupCsReq mergeFrom(final JsonSource input) throws IOException { if (input.isAtField(FieldNames.index)) { if (!input.trySkipNullValue()) { index = input.readUInt32(); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } + case -493896553: + case 1869097438: { + if (input.isAtField(FieldNames.planeId)) { + if (!input.trySkipNullValue()) { + planeId = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -682,14 +682,14 @@ public SwapLineupCsReq create() { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName planeId = FieldName.forField("planeId", "plane_id"); - static final FieldName srcSlot = FieldName.forField("srcSlot", "src_slot"); static final FieldName dstSlot = FieldName.forField("dstSlot", "dst_slot"); static final FieldName index = FieldName.forField("index"); + static final FieldName planeId = FieldName.forField("planeId", "plane_id"); + static final FieldName extraLineupType = FieldName.forField("extraLineupType", "extra_lineup_type"); static final FieldName isVirtual = FieldName.forField("isVirtual", "is_virtual"); diff --git a/src/generated/main/emu/lunarcore/proto/SwitchLineupIndexCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SwitchLineupIndexCsReqOuterClass.java index e81588cf6..06c0f05f8 100644 --- a/src/generated/main/emu/lunarcore/proto/SwitchLineupIndexCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SwitchLineupIndexCsReqOuterClass.java @@ -19,7 +19,7 @@ public static final class SwitchLineupIndexCsReq extends ProtoMessageoptional uint32 index = 9; + * optional uint32 index = 13; */ private int index; @@ -34,7 +34,7 @@ public static SwitchLineupIndexCsReq newInstance() { } /** - * optional uint32 index = 9; + * optional uint32 index = 13; * @return whether the index field is set */ public boolean hasIndex() { @@ -42,7 +42,7 @@ public boolean hasIndex() { } /** - * optional uint32 index = 9; + * optional uint32 index = 13; * @return this */ public SwitchLineupIndexCsReq clearIndex() { @@ -52,7 +52,7 @@ public SwitchLineupIndexCsReq clearIndex() { } /** - * optional uint32 index = 9; + * optional uint32 index = 13; * @return the index */ public int getIndex() { @@ -60,7 +60,7 @@ public int getIndex() { } /** - * optional uint32 index = 9; + * optional uint32 index = 13; * @param value the index to set * @return this */ @@ -129,7 +129,7 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(index); } } @@ -150,7 +150,7 @@ public SwitchLineupIndexCsReq mergeFrom(final ProtoSource input) throws IOExcept int tag = input.readTag(); while (true) { switch (tag) { - case 72: { + case 104: { // index index = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/SwitchLineupIndexScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/SwitchLineupIndexScRspOuterClass.java index 19434d481..92dabaadf 100644 --- a/src/generated/main/emu/lunarcore/proto/SwitchLineupIndexScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SwitchLineupIndexScRspOuterClass.java @@ -19,12 +19,12 @@ public static final class SwitchLineupIndexScRsp extends ProtoMessageoptional uint32 retcode = 8; + * optional uint32 retcode = 4; */ private int retcode; /** - * optional uint32 index = 13; + * optional uint32 index = 6; */ private int index; @@ -39,7 +39,7 @@ public static SwitchLineupIndexScRsp newInstance() { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 4; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public boolean hasRetcode() { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 4; * @return this */ public SwitchLineupIndexScRsp clearRetcode() { @@ -57,7 +57,7 @@ public SwitchLineupIndexScRsp clearRetcode() { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 4; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public int getRetcode() { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 4; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public SwitchLineupIndexScRsp setRetcode(final int value) { } /** - * optional uint32 index = 13; + * optional uint32 index = 6; * @return whether the index field is set */ public boolean hasIndex() { @@ -84,7 +84,7 @@ public boolean hasIndex() { } /** - * optional uint32 index = 13; + * optional uint32 index = 6; * @return this */ public SwitchLineupIndexScRsp clearIndex() { @@ -94,7 +94,7 @@ public SwitchLineupIndexScRsp clearIndex() { } /** - * optional uint32 index = 13; + * optional uint32 index = 6; * @return the index */ public int getIndex() { @@ -102,7 +102,7 @@ public int getIndex() { } /** - * optional uint32 index = 13; + * optional uint32 index = 6; * @param value the index to set * @return this */ @@ -177,11 +177,11 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(index); } } @@ -205,16 +205,16 @@ public SwitchLineupIndexScRsp mergeFrom(final ProtoSource input) throws IOExcept int tag = input.readTag(); while (true) { switch (tag) { - case 64: { + case 32: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 104) { + if (tag != 48) { break; } } - case 104: { + case 48: { // index index = input.readUInt32(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/SyncApplyFriendScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/SyncApplyFriendScNotifyOuterClass.java index aa4cd79f3..37f774f53 100644 --- a/src/generated/main/emu/lunarcore/proto/SyncApplyFriendScNotifyOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SyncApplyFriendScNotifyOuterClass.java @@ -19,7 +19,7 @@ public static final class SyncApplyFriendScNotify extends ProtoMessageoptional .FriendApplyInfo friend_apply_info = 9; + * optional .FriendApplyInfo friend_apply_info = 12; */ private final FriendApplyInfoOuterClass.FriendApplyInfo friendApplyInfo = FriendApplyInfoOuterClass.FriendApplyInfo.newInstance(); @@ -34,7 +34,7 @@ public static SyncApplyFriendScNotify newInstance() { } /** - * optional .FriendApplyInfo friend_apply_info = 9; + * optional .FriendApplyInfo friend_apply_info = 12; * @return whether the friendApplyInfo field is set */ public boolean hasFriendApplyInfo() { @@ -42,7 +42,7 @@ public boolean hasFriendApplyInfo() { } /** - * optional .FriendApplyInfo friend_apply_info = 9; + * optional .FriendApplyInfo friend_apply_info = 12; * @return this */ public SyncApplyFriendScNotify clearFriendApplyInfo() { @@ -52,7 +52,7 @@ public SyncApplyFriendScNotify clearFriendApplyInfo() { } /** - * optional .FriendApplyInfo friend_apply_info = 9; + * optional .FriendApplyInfo friend_apply_info = 12; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -66,7 +66,7 @@ public FriendApplyInfoOuterClass.FriendApplyInfo getFriendApplyInfo() { } /** - * optional .FriendApplyInfo friend_apply_info = 9; + * optional .FriendApplyInfo friend_apply_info = 12; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -80,7 +80,7 @@ public FriendApplyInfoOuterClass.FriendApplyInfo getMutableFriendApplyInfo() { } /** - * optional .FriendApplyInfo friend_apply_info = 9; + * optional .FriendApplyInfo friend_apply_info = 12; * @param value the friendApplyInfo to set * @return this */ @@ -151,7 +151,7 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 74); + output.writeRawByte((byte) 98); output.writeMessageNoTag(friendApplyInfo); } } @@ -172,7 +172,7 @@ public SyncApplyFriendScNotify mergeFrom(final ProtoSource input) throws IOExcep int tag = input.readTag(); while (true) { switch (tag) { - case 74: { + case 98: { // friendApplyInfo input.readMessage(friendApplyInfo); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/SyncClientResVersionScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/SyncClientResVersionScRspOuterClass.java index 79e96fd5b..b21223e9d 100644 --- a/src/generated/main/emu/lunarcore/proto/SyncClientResVersionScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SyncClientResVersionScRspOuterClass.java @@ -19,14 +19,14 @@ public static final class SyncClientResVersionScRsp extends ProtoMessageoptional uint32 retcode = 6; + * optional uint32 client_res_version = 5; */ - private int retcode; + private int clientResVersion; /** - * optional uint32 client_res_version = 15; + * optional uint32 retcode = 12; */ - private int clientResVersion; + private int retcode; private SyncClientResVersionScRsp() { } @@ -39,76 +39,76 @@ public static SyncClientResVersionScRsp newInstance() { } /** - * optional uint32 retcode = 6; - * @return whether the retcode field is set + * optional uint32 client_res_version = 5; + * @return whether the clientResVersion field is set */ - public boolean hasRetcode() { + public boolean hasClientResVersion() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 retcode = 6; + * optional uint32 client_res_version = 5; * @return this */ - public SyncClientResVersionScRsp clearRetcode() { + public SyncClientResVersionScRsp clearClientResVersion() { bitField0_ &= ~0x00000001; - retcode = 0; + clientResVersion = 0; return this; } /** - * optional uint32 retcode = 6; - * @return the retcode + * optional uint32 client_res_version = 5; + * @return the clientResVersion */ - public int getRetcode() { - return retcode; + public int getClientResVersion() { + return clientResVersion; } /** - * optional uint32 retcode = 6; - * @param value the retcode to set + * optional uint32 client_res_version = 5; + * @param value the clientResVersion to set * @return this */ - public SyncClientResVersionScRsp setRetcode(final int value) { + public SyncClientResVersionScRsp setClientResVersion(final int value) { bitField0_ |= 0x00000001; - retcode = value; + clientResVersion = value; return this; } /** - * optional uint32 client_res_version = 15; - * @return whether the clientResVersion field is set + * optional uint32 retcode = 12; + * @return whether the retcode field is set */ - public boolean hasClientResVersion() { + public boolean hasRetcode() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 client_res_version = 15; + * optional uint32 retcode = 12; * @return this */ - public SyncClientResVersionScRsp clearClientResVersion() { + public SyncClientResVersionScRsp clearRetcode() { bitField0_ &= ~0x00000002; - clientResVersion = 0; + retcode = 0; return this; } /** - * optional uint32 client_res_version = 15; - * @return the clientResVersion + * optional uint32 retcode = 12; + * @return the retcode */ - public int getClientResVersion() { - return clientResVersion; + public int getRetcode() { + return retcode; } /** - * optional uint32 client_res_version = 15; - * @param value the clientResVersion to set + * optional uint32 retcode = 12; + * @param value the retcode to set * @return this */ - public SyncClientResVersionScRsp setClientResVersion(final int value) { + public SyncClientResVersionScRsp setRetcode(final int value) { bitField0_ |= 0x00000002; - clientResVersion = value; + retcode = value; return this; } @@ -117,8 +117,8 @@ public SyncClientResVersionScRsp copyFrom(final SyncClientResVersionScRsp other) cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - retcode = other.retcode; clientResVersion = other.clientResVersion; + retcode = other.retcode; } return this; } @@ -129,12 +129,12 @@ public SyncClientResVersionScRsp mergeFrom(final SyncClientResVersionScRsp other return this; } cachedSize = -1; - if (other.hasRetcode()) { - setRetcode(other.retcode); - } if (other.hasClientResVersion()) { setClientResVersion(other.clientResVersion); } + if (other.hasRetcode()) { + setRetcode(other.retcode); + } return this; } @@ -145,8 +145,8 @@ public SyncClientResVersionScRsp clear() { } cachedSize = -1; bitField0_ = 0; - retcode = 0; clientResVersion = 0; + retcode = 0; return this; } @@ -170,19 +170,19 @@ public boolean equals(Object o) { } SyncClientResVersionScRsp other = (SyncClientResVersionScRsp) o; return bitField0_ == other.bitField0_ - && (!hasRetcode() || retcode == other.retcode) - && (!hasClientResVersion() || clientResVersion == other.clientResVersion); + && (!hasClientResVersion() || clientResVersion == other.clientResVersion) + && (!hasRetcode() || retcode == other.retcode); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 48); - output.writeUInt32NoTag(retcode); + output.writeRawByte((byte) 40); + output.writeUInt32NoTag(clientResVersion); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 120); - output.writeUInt32NoTag(clientResVersion); + output.writeRawByte((byte) 96); + output.writeUInt32NoTag(retcode); } } @@ -190,10 +190,10 @@ public void writeTo(final ProtoSink output) throws IOException { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(clientResVersion); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(clientResVersion); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } return size; } @@ -205,18 +205,18 @@ public SyncClientResVersionScRsp mergeFrom(final ProtoSource input) throws IOExc int tag = input.readTag(); while (true) { switch (tag) { - case 48: { - // retcode - retcode = input.readUInt32(); + case 40: { + // clientResVersion + clientResVersion = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 120) { + if (tag != 96) { break; } } - case 120: { - // clientResVersion - clientResVersion = input.readUInt32(); + case 96: { + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -241,10 +241,10 @@ public SyncClientResVersionScRsp mergeFrom(final ProtoSource input) throws IOExc public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.clientResVersion, clientResVersion); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.clientResVersion, clientResVersion); + output.writeUInt32(FieldNames.retcode, retcode); } output.endObject(); } @@ -256,10 +256,11 @@ public SyncClientResVersionScRsp mergeFrom(final JsonSource input) throws IOExce } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case -2005674429: + case -349907515: { + if (input.isAtField(FieldNames.clientResVersion)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + clientResVersion = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -267,11 +268,10 @@ public SyncClientResVersionScRsp mergeFrom(final JsonSource input) throws IOExce } break; } - case -2005674429: - case -349907515: { - if (input.isAtField(FieldNames.clientResVersion)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - clientResVersion = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -332,9 +332,9 @@ public SyncClientResVersionScRsp create() { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName clientResVersion = FieldName.forField("clientResVersion", "client_res_version"); + + static final FieldName retcode = FieldName.forField("retcode"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/SyncDeleteFriendScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/SyncDeleteFriendScNotifyOuterClass.java index 21741ab81..b5eb32af6 100644 --- a/src/generated/main/emu/lunarcore/proto/SyncDeleteFriendScNotifyOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SyncDeleteFriendScNotifyOuterClass.java @@ -19,7 +19,7 @@ public static final class SyncDeleteFriendScNotify extends ProtoMessageoptional uint32 uid = 14; + * optional uint32 uid = 15; */ private int uid; @@ -34,7 +34,7 @@ public static SyncDeleteFriendScNotify newInstance() { } /** - * optional uint32 uid = 14; + * optional uint32 uid = 15; * @return whether the uid field is set */ public boolean hasUid() { @@ -42,7 +42,7 @@ public boolean hasUid() { } /** - * optional uint32 uid = 14; + * optional uint32 uid = 15; * @return this */ public SyncDeleteFriendScNotify clearUid() { @@ -52,7 +52,7 @@ public SyncDeleteFriendScNotify clearUid() { } /** - * optional uint32 uid = 14; + * optional uint32 uid = 15; * @return the uid */ public int getUid() { @@ -60,7 +60,7 @@ public int getUid() { } /** - * optional uint32 uid = 14; + * optional uint32 uid = 15; * @param value the uid to set * @return this */ @@ -129,7 +129,7 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(uid); } } @@ -150,7 +150,7 @@ public SyncDeleteFriendScNotify mergeFrom(final ProtoSource input) throws IOExce int tag = input.readTag(); while (true) { switch (tag) { - case 112: { + case 120: { // uid uid = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/SyncEntityBuffChangeListScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/SyncEntityBuffChangeListScNotifyOuterClass.java index 182583b51..f1782d928 100644 --- a/src/generated/main/emu/lunarcore/proto/SyncEntityBuffChangeListScNotifyOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SyncEntityBuffChangeListScNotifyOuterClass.java @@ -20,7 +20,7 @@ public static final class SyncEntityBuffChangeListScNotify extends ProtoMessage< private static final long serialVersionUID = 0L; /** - * repeated .EntityBuffChangeInfo entity_buff_info_list = 15; + * repeated .EntityBuffChangeInfo entity_buff_info_list = 13; */ private final RepeatedMessage entityBuffInfoList = RepeatedMessage.newEmptyInstance(EntityBuffChangeInfoOuterClass.EntityBuffChangeInfo.getFactory()); @@ -35,7 +35,7 @@ public static SyncEntityBuffChangeListScNotify newInstance() { } /** - * repeated .EntityBuffChangeInfo entity_buff_info_list = 15; + * repeated .EntityBuffChangeInfo entity_buff_info_list = 13; * @return whether the entityBuffInfoList field is set */ public boolean hasEntityBuffInfoList() { @@ -43,7 +43,7 @@ public boolean hasEntityBuffInfoList() { } /** - * repeated .EntityBuffChangeInfo entity_buff_info_list = 15; + * repeated .EntityBuffChangeInfo entity_buff_info_list = 13; * @return this */ public SyncEntityBuffChangeListScNotify clearEntityBuffInfoList() { @@ -53,7 +53,7 @@ public SyncEntityBuffChangeListScNotify clearEntityBuffInfoList() { } /** - * repeated .EntityBuffChangeInfo entity_buff_info_list = 15; + * repeated .EntityBuffChangeInfo entity_buff_info_list = 13; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -68,7 +68,7 @@ public RepeatedMessage getE } /** - * repeated .EntityBuffChangeInfo entity_buff_info_list = 15; + * repeated .EntityBuffChangeInfo entity_buff_info_list = 13; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -83,7 +83,7 @@ public RepeatedMessage getM } /** - * repeated .EntityBuffChangeInfo entity_buff_info_list = 15; + * repeated .EntityBuffChangeInfo entity_buff_info_list = 13; * @param value the entityBuffInfoList to add * @return this */ @@ -95,7 +95,7 @@ public SyncEntityBuffChangeListScNotify addEntityBuffInfoList( } /** - * repeated .EntityBuffChangeInfo entity_buff_info_list = 15; + * repeated .EntityBuffChangeInfo entity_buff_info_list = 13; * @param values the entityBuffInfoList to add * @return this */ @@ -168,7 +168,7 @@ public boolean equals(Object o) { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { for (int i = 0; i < entityBuffInfoList.length(); i++) { - output.writeRawByte((byte) 122); + output.writeRawByte((byte) 106); output.writeMessageNoTag(entityBuffInfoList.get(i)); } } @@ -190,7 +190,7 @@ public SyncEntityBuffChangeListScNotify mergeFrom(final ProtoSource input) throw int tag = input.readTag(); while (true) { switch (tag) { - case 122: { + case 106: { // entityBuffInfoList tag = input.readRepeatedMessage(entityBuffInfoList, tag); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/SyncHandleFriendScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/SyncHandleFriendScNotifyOuterClass.java index 10d4e8a9b..c5b3fca38 100644 --- a/src/generated/main/emu/lunarcore/proto/SyncHandleFriendScNotifyOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SyncHandleFriendScNotifyOuterClass.java @@ -19,17 +19,17 @@ public static final class SyncHandleFriendScNotify extends ProtoMessageoptional uint32 uid = 2; + * optional uint32 uid = 15; */ private int uid; /** - * optional bool handle_result = 12; + * optional bool handle_result = 7; */ private boolean handleResult; /** - * optional .FriendListInfo handle_friend_info = 1; + * optional .FriendListInfo handle_friend_info = 2; */ private final FriendListInfoOuterClass.FriendListInfo handleFriendInfo = FriendListInfoOuterClass.FriendListInfo.newInstance(); @@ -44,7 +44,7 @@ public static SyncHandleFriendScNotify newInstance() { } /** - * optional uint32 uid = 2; + * optional uint32 uid = 15; * @return whether the uid field is set */ public boolean hasUid() { @@ -52,7 +52,7 @@ public boolean hasUid() { } /** - * optional uint32 uid = 2; + * optional uint32 uid = 15; * @return this */ public SyncHandleFriendScNotify clearUid() { @@ -62,7 +62,7 @@ public SyncHandleFriendScNotify clearUid() { } /** - * optional uint32 uid = 2; + * optional uint32 uid = 15; * @return the uid */ public int getUid() { @@ -70,7 +70,7 @@ public int getUid() { } /** - * optional uint32 uid = 2; + * optional uint32 uid = 15; * @param value the uid to set * @return this */ @@ -81,7 +81,7 @@ public SyncHandleFriendScNotify setUid(final int value) { } /** - * optional bool handle_result = 12; + * optional bool handle_result = 7; * @return whether the handleResult field is set */ public boolean hasHandleResult() { @@ -89,7 +89,7 @@ public boolean hasHandleResult() { } /** - * optional bool handle_result = 12; + * optional bool handle_result = 7; * @return this */ public SyncHandleFriendScNotify clearHandleResult() { @@ -99,7 +99,7 @@ public SyncHandleFriendScNotify clearHandleResult() { } /** - * optional bool handle_result = 12; + * optional bool handle_result = 7; * @return the handleResult */ public boolean getHandleResult() { @@ -107,7 +107,7 @@ public boolean getHandleResult() { } /** - * optional bool handle_result = 12; + * optional bool handle_result = 7; * @param value the handleResult to set * @return this */ @@ -118,7 +118,7 @@ public SyncHandleFriendScNotify setHandleResult(final boolean value) { } /** - * optional .FriendListInfo handle_friend_info = 1; + * optional .FriendListInfo handle_friend_info = 2; * @return whether the handleFriendInfo field is set */ public boolean hasHandleFriendInfo() { @@ -126,7 +126,7 @@ public boolean hasHandleFriendInfo() { } /** - * optional .FriendListInfo handle_friend_info = 1; + * optional .FriendListInfo handle_friend_info = 2; * @return this */ public SyncHandleFriendScNotify clearHandleFriendInfo() { @@ -136,7 +136,7 @@ public SyncHandleFriendScNotify clearHandleFriendInfo() { } /** - * optional .FriendListInfo handle_friend_info = 1; + * optional .FriendListInfo handle_friend_info = 2; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -150,7 +150,7 @@ public FriendListInfoOuterClass.FriendListInfo getHandleFriendInfo() { } /** - * optional .FriendListInfo handle_friend_info = 1; + * optional .FriendListInfo handle_friend_info = 2; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -164,7 +164,7 @@ public FriendListInfoOuterClass.FriendListInfo getMutableHandleFriendInfo() { } /** - * optional .FriendListInfo handle_friend_info = 1; + * optional .FriendListInfo handle_friend_info = 2; * @param value the handleFriendInfo to set * @return this */ @@ -247,15 +247,15 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(uid); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 56); output.writeBoolNoTag(handleResult); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 10); + output.writeRawByte((byte) 18); output.writeMessageNoTag(handleFriendInfo); } } @@ -282,25 +282,25 @@ public SyncHandleFriendScNotify mergeFrom(final ProtoSource input) throws IOExce int tag = input.readTag(); while (true) { switch (tag) { - case 16: { + case 120: { // uid uid = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 96) { + if (tag != 56) { break; } } - case 96: { + case 56: { // handleResult handleResult = input.readBool(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 10) { + if (tag != 18) { break; } } - case 10: { + case 18: { // handleFriendInfo input.readMessage(handleFriendInfo); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/SyncLineupNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/SyncLineupNotifyOuterClass.java index 1da1b4552..993131fee 100644 --- a/src/generated/main/emu/lunarcore/proto/SyncLineupNotifyOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SyncLineupNotifyOuterClass.java @@ -20,12 +20,12 @@ public static final class SyncLineupNotify extends ProtoMessageoptional .LineupInfo lineup = 12; + * optional .LineupInfo lineup = 1; */ private final LineupInfoOuterClass.LineupInfo lineup = LineupInfoOuterClass.LineupInfo.newInstance(); /** - * repeated .SyncReason reason_list = 14; + * repeated .SyncReason reason_list = 11; */ private final RepeatedEnum reasonList = RepeatedEnum.newEmptyInstance(SyncReasonOuterClass.SyncReason.converter()); @@ -40,7 +40,7 @@ public static SyncLineupNotify newInstance() { } /** - * optional .LineupInfo lineup = 12; + * optional .LineupInfo lineup = 1; * @return whether the lineup field is set */ public boolean hasLineup() { @@ -48,7 +48,7 @@ public boolean hasLineup() { } /** - * optional .LineupInfo lineup = 12; + * optional .LineupInfo lineup = 1; * @return this */ public SyncLineupNotify clearLineup() { @@ -58,7 +58,7 @@ public SyncLineupNotify clearLineup() { } /** - * optional .LineupInfo lineup = 12; + * optional .LineupInfo lineup = 1; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -72,7 +72,7 @@ public LineupInfoOuterClass.LineupInfo getLineup() { } /** - * optional .LineupInfo lineup = 12; + * optional .LineupInfo lineup = 1; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -86,7 +86,7 @@ public LineupInfoOuterClass.LineupInfo getMutableLineup() { } /** - * optional .LineupInfo lineup = 12; + * optional .LineupInfo lineup = 1; * @param value the lineup to set * @return this */ @@ -97,7 +97,7 @@ public SyncLineupNotify setLineup(final LineupInfoOuterClass.LineupInfo value) { } /** - * repeated .SyncReason reason_list = 14; + * repeated .SyncReason reason_list = 11; * @return whether the reasonList field is set */ public boolean hasReasonList() { @@ -105,7 +105,7 @@ public boolean hasReasonList() { } /** - * repeated .SyncReason reason_list = 14; + * repeated .SyncReason reason_list = 11; * @return this */ public SyncLineupNotify clearReasonList() { @@ -115,7 +115,7 @@ public SyncLineupNotify clearReasonList() { } /** - * repeated .SyncReason reason_list = 14; + * repeated .SyncReason reason_list = 11; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -129,7 +129,7 @@ public RepeatedEnum getReasonList() { } /** - * repeated .SyncReason reason_list = 14; + * repeated .SyncReason reason_list = 11; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -143,7 +143,7 @@ public RepeatedEnum getMutableReasonList() { } /** - * repeated .SyncReason reason_list = 14; + * repeated .SyncReason reason_list = 11; * @param value the reasonList to add * @return this */ @@ -154,7 +154,7 @@ public SyncLineupNotify addReasonList(final SyncReasonOuterClass.SyncReason valu } /** - * repeated .SyncReason reason_list = 14; + * repeated .SyncReason reason_list = 11; * @param values the reasonList to add * @return this */ @@ -231,12 +231,12 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 98); + output.writeRawByte((byte) 10); output.writeMessageNoTag(lineup); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < reasonList.length(); i++) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 88); output.writeEnumNoTag(reasonList.array()[i]); } } @@ -261,16 +261,16 @@ public SyncLineupNotify mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 98: { + case 10: { // lineup input.readMessage(lineup); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 114) { + if (tag != 90) { break; } } - case 114: { + case 90: { // reasonList [packed=true] input.readPackedEnum(reasonList, tag); bitField0_ |= 0x00000002; @@ -289,7 +289,7 @@ public SyncLineupNotify mergeFrom(final ProtoSource input) throws IOException { tag = input.readTag(); break; } - case 112: { + case 88: { // reasonList [packed=false] tag = input.readRepeatedEnum(reasonList, tag); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/SyncRogueCommonActionResultScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/SyncRogueCommonActionResultScNotifyOuterClass.java index 45d66eb59..88fd98b90 100644 --- a/src/generated/main/emu/lunarcore/proto/SyncRogueCommonActionResultScNotifyOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SyncRogueCommonActionResultScNotifyOuterClass.java @@ -20,12 +20,12 @@ public static final class SyncRogueCommonActionResultScNotify extends ProtoMessa /** * 
-     *  101 for common rogue
+     * PBCHNCIJKNA MDBPDPDDHBC = 12;
      *
* - * optional uint32 rogue_version_id = 5; + * optional uint32 OCPBNBPAMEN = 5; */ - private int rogueVersionId; + private int oCPBNBPAMEN; /** * optional .RogueActionResult action = 11; @@ -44,54 +44,54 @@ public static SyncRogueCommonActionResultScNotify newInstance() { /** * 
-     *  101 for common rogue
+     * PBCHNCIJKNA MDBPDPDDHBC = 12;
      *
* - * optional uint32 rogue_version_id = 5; - * @return whether the rogueVersionId field is set + * optional uint32 OCPBNBPAMEN = 5; + * @return whether the oCPBNBPAMEN field is set */ - public boolean hasRogueVersionId() { + public boolean hasOCPBNBPAMEN() { return (bitField0_ & 0x00000001) != 0; } /** * 
-     *  101 for common rogue
+     * PBCHNCIJKNA MDBPDPDDHBC = 12;
      *
* - * optional uint32 rogue_version_id = 5; + * optional uint32 OCPBNBPAMEN = 5; * @return this */ - public SyncRogueCommonActionResultScNotify clearRogueVersionId() { + public SyncRogueCommonActionResultScNotify clearOCPBNBPAMEN() { bitField0_ &= ~0x00000001; - rogueVersionId = 0; + oCPBNBPAMEN = 0; return this; } /** * 
-     *  101 for common rogue
+     * PBCHNCIJKNA MDBPDPDDHBC = 12;
      *
* - * optional uint32 rogue_version_id = 5; - * @return the rogueVersionId + * optional uint32 OCPBNBPAMEN = 5; + * @return the oCPBNBPAMEN */ - public int getRogueVersionId() { - return rogueVersionId; + public int getOCPBNBPAMEN() { + return oCPBNBPAMEN; } /** * 
-     *  101 for common rogue
+     * PBCHNCIJKNA MDBPDPDDHBC = 12;
      *
* - * optional uint32 rogue_version_id = 5; - * @param value the rogueVersionId to set + * optional uint32 OCPBNBPAMEN = 5; + * @param value the oCPBNBPAMEN to set * @return this */ - public SyncRogueCommonActionResultScNotify setRogueVersionId(final int value) { + public SyncRogueCommonActionResultScNotify setOCPBNBPAMEN(final int value) { bitField0_ |= 0x00000001; - rogueVersionId = value; + oCPBNBPAMEN = value; return this; } @@ -159,7 +159,7 @@ public SyncRogueCommonActionResultScNotify copyFrom( cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - rogueVersionId = other.rogueVersionId; + oCPBNBPAMEN = other.oCPBNBPAMEN; action.copyFrom(other.action); } return this; @@ -172,8 +172,8 @@ public SyncRogueCommonActionResultScNotify mergeFrom( return this; } cachedSize = -1; - if (other.hasRogueVersionId()) { - setRogueVersionId(other.rogueVersionId); + if (other.hasOCPBNBPAMEN()) { + setOCPBNBPAMEN(other.oCPBNBPAMEN); } if (other.hasAction()) { getMutableAction().mergeFrom(other.action); @@ -188,7 +188,7 @@ public SyncRogueCommonActionResultScNotify clear() { } cachedSize = -1; bitField0_ = 0; - rogueVersionId = 0; + oCPBNBPAMEN = 0; action.clear(); return this; } @@ -214,7 +214,7 @@ public boolean equals(Object o) { } SyncRogueCommonActionResultScNotify other = (SyncRogueCommonActionResultScNotify) o; return bitField0_ == other.bitField0_ - && (!hasRogueVersionId() || rogueVersionId == other.rogueVersionId) + && (!hasOCPBNBPAMEN() || oCPBNBPAMEN == other.oCPBNBPAMEN) && (!hasAction() || action.equals(other.action)); } @@ -222,7 +222,7 @@ public boolean equals(Object o) { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { output.writeRawByte((byte) 40); - output.writeUInt32NoTag(rogueVersionId); + output.writeUInt32NoTag(oCPBNBPAMEN); } if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 90); @@ -234,7 +234,7 @@ public void writeTo(final ProtoSink output) throws IOException { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(rogueVersionId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(oCPBNBPAMEN); } if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(action); @@ -251,8 +251,8 @@ public SyncRogueCommonActionResultScNotify mergeFrom(final ProtoSource input) th while (true) { switch (tag) { case 40: { - // rogueVersionId - rogueVersionId = input.readUInt32(); + // oCPBNBPAMEN + oCPBNBPAMEN = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 90) { @@ -286,7 +286,7 @@ public SyncRogueCommonActionResultScNotify mergeFrom(final ProtoSource input) th public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.rogueVersionId, rogueVersionId); + output.writeUInt32(FieldNames.oCPBNBPAMEN, oCPBNBPAMEN); } if ((bitField0_ & 0x00000002) != 0) { output.writeMessage(FieldNames.action, action); @@ -302,11 +302,10 @@ public SyncRogueCommonActionResultScNotify mergeFrom(final JsonSource input) thr } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1457526951: - case 1832096103: { - if (input.isAtField(FieldNames.rogueVersionId)) { + case -1836582037: { + if (input.isAtField(FieldNames.oCPBNBPAMEN)) { if (!input.trySkipNullValue()) { - rogueVersionId = input.readUInt32(); + oCPBNBPAMEN = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -380,7 +379,7 @@ public SyncRogueCommonActionResultScNotify create() { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName rogueVersionId = FieldName.forField("rogueVersionId", "rogue_version_id"); + static final FieldName oCPBNBPAMEN = FieldName.forField("OCPBNBPAMEN"); static final FieldName action = FieldName.forField("action"); } diff --git a/src/generated/main/emu/lunarcore/proto/SyncRogueCommonPendingActionScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/SyncRogueCommonPendingActionScNotifyOuterClass.java index 55da03aaa..1f8f50db0 100644 --- a/src/generated/main/emu/lunarcore/proto/SyncRogueCommonPendingActionScNotifyOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SyncRogueCommonPendingActionScNotifyOuterClass.java @@ -19,13 +19,9 @@ public static final class SyncRogueCommonPendingActionScNotify extends ProtoMess private static final long serialVersionUID = 0L; /** - * 
-     *  101 for common rogue
-     *
- * - * optional uint32 rogue_version_id = 9; + * optional uint32 OCPBNBPAMEN = 9; */ - private int rogueVersionId; + private int oCPBNBPAMEN; /** * optional .RogueCommonPendingAction rogue_common_pending_action = 4; @@ -43,55 +39,39 @@ public static SyncRogueCommonPendingActionScNotify newInstance() { } /** - * 
-     *  101 for common rogue
-     *
- * - * optional uint32 rogue_version_id = 9; - * @return whether the rogueVersionId field is set + * optional uint32 OCPBNBPAMEN = 9; + * @return whether the oCPBNBPAMEN field is set */ - public boolean hasRogueVersionId() { + public boolean hasOCPBNBPAMEN() { return (bitField0_ & 0x00000001) != 0; } /** - * 
-     *  101 for common rogue
-     *
- * - * optional uint32 rogue_version_id = 9; + * optional uint32 OCPBNBPAMEN = 9; * @return this */ - public SyncRogueCommonPendingActionScNotify clearRogueVersionId() { + public SyncRogueCommonPendingActionScNotify clearOCPBNBPAMEN() { bitField0_ &= ~0x00000001; - rogueVersionId = 0; + oCPBNBPAMEN = 0; return this; } /** - * 
-     *  101 for common rogue
-     *
- * - * optional uint32 rogue_version_id = 9; - * @return the rogueVersionId + * optional uint32 OCPBNBPAMEN = 9; + * @return the oCPBNBPAMEN */ - public int getRogueVersionId() { - return rogueVersionId; + public int getOCPBNBPAMEN() { + return oCPBNBPAMEN; } /** - * 
-     *  101 for common rogue
-     *
- * - * optional uint32 rogue_version_id = 9; - * @param value the rogueVersionId to set + * optional uint32 OCPBNBPAMEN = 9; + * @param value the oCPBNBPAMEN to set * @return this */ - public SyncRogueCommonPendingActionScNotify setRogueVersionId(final int value) { + public SyncRogueCommonPendingActionScNotify setOCPBNBPAMEN(final int value) { bitField0_ |= 0x00000001; - rogueVersionId = value; + oCPBNBPAMEN = value; return this; } @@ -161,7 +141,7 @@ public SyncRogueCommonPendingActionScNotify copyFrom( cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - rogueVersionId = other.rogueVersionId; + oCPBNBPAMEN = other.oCPBNBPAMEN; rogueCommonPendingAction.copyFrom(other.rogueCommonPendingAction); } return this; @@ -174,8 +154,8 @@ public SyncRogueCommonPendingActionScNotify mergeFrom( return this; } cachedSize = -1; - if (other.hasRogueVersionId()) { - setRogueVersionId(other.rogueVersionId); + if (other.hasOCPBNBPAMEN()) { + setOCPBNBPAMEN(other.oCPBNBPAMEN); } if (other.hasRogueCommonPendingAction()) { getMutableRogueCommonPendingAction().mergeFrom(other.rogueCommonPendingAction); @@ -190,7 +170,7 @@ public SyncRogueCommonPendingActionScNotify clear() { } cachedSize = -1; bitField0_ = 0; - rogueVersionId = 0; + oCPBNBPAMEN = 0; rogueCommonPendingAction.clear(); return this; } @@ -216,7 +196,7 @@ public boolean equals(Object o) { } SyncRogueCommonPendingActionScNotify other = (SyncRogueCommonPendingActionScNotify) o; return bitField0_ == other.bitField0_ - && (!hasRogueVersionId() || rogueVersionId == other.rogueVersionId) + && (!hasOCPBNBPAMEN() || oCPBNBPAMEN == other.oCPBNBPAMEN) && (!hasRogueCommonPendingAction() || rogueCommonPendingAction.equals(other.rogueCommonPendingAction)); } @@ -224,7 +204,7 @@ public boolean equals(Object o) { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { output.writeRawByte((byte) 72); - output.writeUInt32NoTag(rogueVersionId); + output.writeUInt32NoTag(oCPBNBPAMEN); } if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 34); @@ -236,7 +216,7 @@ public void writeTo(final ProtoSink output) throws IOException { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(rogueVersionId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(oCPBNBPAMEN); } if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(rogueCommonPendingAction); @@ -253,8 +233,8 @@ public SyncRogueCommonPendingActionScNotify mergeFrom(final ProtoSource input) t while (true) { switch (tag) { case 72: { - // rogueVersionId - rogueVersionId = input.readUInt32(); + // oCPBNBPAMEN + oCPBNBPAMEN = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 34) { @@ -288,7 +268,7 @@ public SyncRogueCommonPendingActionScNotify mergeFrom(final ProtoSource input) t public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.rogueVersionId, rogueVersionId); + output.writeUInt32(FieldNames.oCPBNBPAMEN, oCPBNBPAMEN); } if ((bitField0_ & 0x00000002) != 0) { output.writeMessage(FieldNames.rogueCommonPendingAction, rogueCommonPendingAction); @@ -304,11 +284,10 @@ public SyncRogueCommonPendingActionScNotify mergeFrom(final JsonSource input) th } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1457526951: - case 1832096103: { - if (input.isAtField(FieldNames.rogueVersionId)) { + case -1836582037: { + if (input.isAtField(FieldNames.oCPBNBPAMEN)) { if (!input.trySkipNullValue()) { - rogueVersionId = input.readUInt32(); + oCPBNBPAMEN = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -383,7 +362,7 @@ public SyncRogueCommonPendingActionScNotify create() { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName rogueVersionId = FieldName.forField("rogueVersionId", "rogue_version_id"); + static final FieldName oCPBNBPAMEN = FieldName.forField("OCPBNBPAMEN"); static final FieldName rogueCommonPendingAction = FieldName.forField("rogueCommonPendingAction", "rogue_common_pending_action"); } diff --git a/src/generated/main/emu/lunarcore/proto/TakeChallengeRewardCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/TakeChallengeRewardCsReqOuterClass.java index c493bfd11..26ba84869 100644 --- a/src/generated/main/emu/lunarcore/proto/TakeChallengeRewardCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/TakeChallengeRewardCsReqOuterClass.java @@ -19,14 +19,14 @@ public static final class TakeChallengeRewardCsReq extends ProtoMessageoptional uint32 star_count = 5; + * optional uint32 group_id = 1; */ - private int starCount; + private int groupId; /** - * optional uint32 group_id = 14; + * optional uint32 star_count = 10; */ - private int groupId; + private int starCount; private TakeChallengeRewardCsReq() { } @@ -39,76 +39,76 @@ public static TakeChallengeRewardCsReq newInstance() { } /** - * optional uint32 star_count = 5; - * @return whether the starCount field is set + * optional uint32 group_id = 1; + * @return whether the groupId field is set */ - public boolean hasStarCount() { + public boolean hasGroupId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 star_count = 5; + * optional uint32 group_id = 1; * @return this */ - public TakeChallengeRewardCsReq clearStarCount() { + public TakeChallengeRewardCsReq clearGroupId() { bitField0_ &= ~0x00000001; - starCount = 0; + groupId = 0; return this; } /** - * optional uint32 star_count = 5; - * @return the starCount + * optional uint32 group_id = 1; + * @return the groupId */ - public int getStarCount() { - return starCount; + public int getGroupId() { + return groupId; } /** - * optional uint32 star_count = 5; - * @param value the starCount to set + * optional uint32 group_id = 1; + * @param value the groupId to set * @return this */ - public TakeChallengeRewardCsReq setStarCount(final int value) { + public TakeChallengeRewardCsReq setGroupId(final int value) { bitField0_ |= 0x00000001; - starCount = value; + groupId = value; return this; } /** - * optional uint32 group_id = 14; - * @return whether the groupId field is set + * optional uint32 star_count = 10; + * @return whether the starCount field is set */ - public boolean hasGroupId() { + public boolean hasStarCount() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 group_id = 14; + * optional uint32 star_count = 10; * @return this */ - public TakeChallengeRewardCsReq clearGroupId() { + public TakeChallengeRewardCsReq clearStarCount() { bitField0_ &= ~0x00000002; - groupId = 0; + starCount = 0; return this; } /** - * optional uint32 group_id = 14; - * @return the groupId + * optional uint32 star_count = 10; + * @return the starCount */ - public int getGroupId() { - return groupId; + public int getStarCount() { + return starCount; } /** - * optional uint32 group_id = 14; - * @param value the groupId to set + * optional uint32 star_count = 10; + * @param value the starCount to set * @return this */ - public TakeChallengeRewardCsReq setGroupId(final int value) { + public TakeChallengeRewardCsReq setStarCount(final int value) { bitField0_ |= 0x00000002; - groupId = value; + starCount = value; return this; } @@ -117,8 +117,8 @@ public TakeChallengeRewardCsReq copyFrom(final TakeChallengeRewardCsReq other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - starCount = other.starCount; groupId = other.groupId; + starCount = other.starCount; } return this; } @@ -129,12 +129,12 @@ public TakeChallengeRewardCsReq mergeFrom(final TakeChallengeRewardCsReq other) return this; } cachedSize = -1; - if (other.hasStarCount()) { - setStarCount(other.starCount); - } if (other.hasGroupId()) { setGroupId(other.groupId); } + if (other.hasStarCount()) { + setStarCount(other.starCount); + } return this; } @@ -145,8 +145,8 @@ public TakeChallengeRewardCsReq clear() { } cachedSize = -1; bitField0_ = 0; - starCount = 0; groupId = 0; + starCount = 0; return this; } @@ -170,19 +170,19 @@ public boolean equals(Object o) { } TakeChallengeRewardCsReq other = (TakeChallengeRewardCsReq) o; return bitField0_ == other.bitField0_ - && (!hasStarCount() || starCount == other.starCount) - && (!hasGroupId() || groupId == other.groupId); + && (!hasGroupId() || groupId == other.groupId) + && (!hasStarCount() || starCount == other.starCount); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 40); - output.writeUInt32NoTag(starCount); + output.writeRawByte((byte) 8); + output.writeUInt32NoTag(groupId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 112); - output.writeUInt32NoTag(groupId); + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(starCount); } } @@ -190,10 +190,10 @@ public void writeTo(final ProtoSink output) throws IOException { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(starCount); + size += 1 + ProtoSink.computeUInt32SizeNoTag(groupId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(groupId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(starCount); } return size; } @@ -205,18 +205,18 @@ public TakeChallengeRewardCsReq mergeFrom(final ProtoSource input) throws IOExce int tag = input.readTag(); while (true) { switch (tag) { - case 40: { - // starCount - starCount = input.readUInt32(); + case 8: { + // groupId + groupId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 112) { + if (tag != 80) { break; } } - case 112: { - // groupId - groupId = input.readUInt32(); + case 80: { + // starCount + starCount = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -241,10 +241,10 @@ public TakeChallengeRewardCsReq mergeFrom(final ProtoSource input) throws IOExce public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.starCount, starCount); + output.writeUInt32(FieldNames.groupId, groupId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.groupId, groupId); + output.writeUInt32(FieldNames.starCount, starCount); } output.endObject(); } @@ -256,11 +256,11 @@ public TakeChallengeRewardCsReq mergeFrom(final JsonSource input) throws IOExcep } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 2121235933: - case 2124166370: { - if (input.isAtField(FieldNames.starCount)) { + case 293428218: + case 506361563: { + if (input.isAtField(FieldNames.groupId)) { if (!input.trySkipNullValue()) { - starCount = input.readUInt32(); + groupId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -268,11 +268,11 @@ public TakeChallengeRewardCsReq mergeFrom(final JsonSource input) throws IOExcep } break; } - case 293428218: - case 506361563: { - if (input.isAtField(FieldNames.groupId)) { + case 2121235933: + case 2124166370: { + if (input.isAtField(FieldNames.starCount)) { if (!input.trySkipNullValue()) { - groupId = input.readUInt32(); + starCount = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -333,9 +333,9 @@ public TakeChallengeRewardCsReq create() { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName starCount = FieldName.forField("starCount", "star_count"); - static final FieldName groupId = FieldName.forField("groupId", "group_id"); + + static final FieldName starCount = FieldName.forField("starCount", "star_count"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/TakeChallengeRewardScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/TakeChallengeRewardScRspOuterClass.java index 9d94fd21d..412b80c54 100644 --- a/src/generated/main/emu/lunarcore/proto/TakeChallengeRewardScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/TakeChallengeRewardScRspOuterClass.java @@ -19,22 +19,22 @@ public static final class TakeChallengeRewardScRsp extends ProtoMessageoptional uint32 group_id = 3; + * optional uint32 star_count = 1; */ - private int groupId; + private int starCount; /** - * optional uint32 retcode = 12; + * optional uint32 group_id = 6; */ - private int retcode; + private int groupId; /** - * optional uint32 star_count = 14; + * optional uint32 retcode = 14; */ - private int starCount; + private int retcode; /** - * optional .ItemList reward = 1; + * optional .ItemList reward = 15; */ private final ItemListOuterClass.ItemList reward = ItemListOuterClass.ItemList.newInstance(); @@ -49,118 +49,118 @@ public static TakeChallengeRewardScRsp newInstance() { } /** - * optional uint32 group_id = 3; - * @return whether the groupId field is set + * optional uint32 star_count = 1; + * @return whether the starCount field is set */ - public boolean hasGroupId() { + public boolean hasStarCount() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 group_id = 3; + * optional uint32 star_count = 1; * @return this */ - public TakeChallengeRewardScRsp clearGroupId() { + public TakeChallengeRewardScRsp clearStarCount() { bitField0_ &= ~0x00000001; - groupId = 0; + starCount = 0; return this; } /** - * optional uint32 group_id = 3; - * @return the groupId + * optional uint32 star_count = 1; + * @return the starCount */ - public int getGroupId() { - return groupId; + public int getStarCount() { + return starCount; } /** - * optional uint32 group_id = 3; - * @param value the groupId to set + * optional uint32 star_count = 1; + * @param value the starCount to set * @return this */ - public TakeChallengeRewardScRsp setGroupId(final int value) { + public TakeChallengeRewardScRsp setStarCount(final int value) { bitField0_ |= 0x00000001; - groupId = value; + starCount = value; return this; } /** - * optional uint32 retcode = 12; - * @return whether the retcode field is set + * optional uint32 group_id = 6; + * @return whether the groupId field is set */ - public boolean hasRetcode() { + public boolean hasGroupId() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 retcode = 12; + * optional uint32 group_id = 6; * @return this */ - public TakeChallengeRewardScRsp clearRetcode() { + public TakeChallengeRewardScRsp clearGroupId() { bitField0_ &= ~0x00000002; - retcode = 0; + groupId = 0; return this; } /** - * optional uint32 retcode = 12; - * @return the retcode + * optional uint32 group_id = 6; + * @return the groupId */ - public int getRetcode() { - return retcode; + public int getGroupId() { + return groupId; } /** - * optional uint32 retcode = 12; - * @param value the retcode to set + * optional uint32 group_id = 6; + * @param value the groupId to set * @return this */ - public TakeChallengeRewardScRsp setRetcode(final int value) { + public TakeChallengeRewardScRsp setGroupId(final int value) { bitField0_ |= 0x00000002; - retcode = value; + groupId = value; return this; } /** - * optional uint32 star_count = 14; - * @return whether the starCount field is set + * optional uint32 retcode = 14; + * @return whether the retcode field is set */ - public boolean hasStarCount() { + public boolean hasRetcode() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 star_count = 14; + * optional uint32 retcode = 14; * @return this */ - public TakeChallengeRewardScRsp clearStarCount() { + public TakeChallengeRewardScRsp clearRetcode() { bitField0_ &= ~0x00000004; - starCount = 0; + retcode = 0; return this; } /** - * optional uint32 star_count = 14; - * @return the starCount + * optional uint32 retcode = 14; + * @return the retcode */ - public int getStarCount() { - return starCount; + public int getRetcode() { + return retcode; } /** - * optional uint32 star_count = 14; - * @param value the starCount to set + * optional uint32 retcode = 14; + * @param value the retcode to set * @return this */ - public TakeChallengeRewardScRsp setStarCount(final int value) { + public TakeChallengeRewardScRsp setRetcode(final int value) { bitField0_ |= 0x00000004; - starCount = value; + retcode = value; return this; } /** - * optional .ItemList reward = 1; + * optional .ItemList reward = 15; * @return whether the reward field is set */ public boolean hasReward() { @@ -168,7 +168,7 @@ public boolean hasReward() { } /** - * optional .ItemList reward = 1; + * optional .ItemList reward = 15; * @return this */ public TakeChallengeRewardScRsp clearReward() { @@ -178,7 +178,7 @@ public TakeChallengeRewardScRsp clearReward() { } /** - * optional .ItemList reward = 1; + * optional .ItemList reward = 15; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -192,7 +192,7 @@ public ItemListOuterClass.ItemList getReward() { } /** - * optional .ItemList reward = 1; + * optional .ItemList reward = 15; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -206,7 +206,7 @@ public ItemListOuterClass.ItemList getMutableReward() { } /** - * optional .ItemList reward = 1; + * optional .ItemList reward = 15; * @param value the reward to set * @return this */ @@ -221,9 +221,9 @@ public TakeChallengeRewardScRsp copyFrom(final TakeChallengeRewardScRsp other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; + starCount = other.starCount; groupId = other.groupId; retcode = other.retcode; - starCount = other.starCount; reward.copyFrom(other.reward); } return this; @@ -235,15 +235,15 @@ public TakeChallengeRewardScRsp mergeFrom(final TakeChallengeRewardScRsp other) return this; } cachedSize = -1; + if (other.hasStarCount()) { + setStarCount(other.starCount); + } if (other.hasGroupId()) { setGroupId(other.groupId); } if (other.hasRetcode()) { setRetcode(other.retcode); } - if (other.hasStarCount()) { - setStarCount(other.starCount); - } if (other.hasReward()) { getMutableReward().mergeFrom(other.reward); } @@ -257,9 +257,9 @@ public TakeChallengeRewardScRsp clear() { } cachedSize = -1; bitField0_ = 0; + starCount = 0; groupId = 0; retcode = 0; - starCount = 0; reward.clear(); return this; } @@ -285,28 +285,28 @@ public boolean equals(Object o) { } TakeChallengeRewardScRsp other = (TakeChallengeRewardScRsp) o; return bitField0_ == other.bitField0_ + && (!hasStarCount() || starCount == other.starCount) && (!hasGroupId() || groupId == other.groupId) && (!hasRetcode() || retcode == other.retcode) - && (!hasStarCount() || starCount == other.starCount) && (!hasReward() || reward.equals(other.reward)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); - output.writeUInt32NoTag(groupId); + output.writeRawByte((byte) 8); + output.writeUInt32NoTag(starCount); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 96); - output.writeUInt32NoTag(retcode); + output.writeRawByte((byte) 48); + output.writeUInt32NoTag(groupId); } if ((bitField0_ & 0x00000004) != 0) { output.writeRawByte((byte) 112); - output.writeUInt32NoTag(starCount); + output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 10); + output.writeRawByte((byte) 122); output.writeMessageNoTag(reward); } } @@ -315,13 +315,13 @@ public void writeTo(final ProtoSink output) throws IOException { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(groupId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(starCount); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(groupId); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(starCount); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(reward); @@ -336,18 +336,18 @@ public TakeChallengeRewardScRsp mergeFrom(final ProtoSource input) throws IOExce int tag = input.readTag(); while (true) { switch (tag) { - case 24: { - // groupId - groupId = input.readUInt32(); + case 8: { + // starCount + starCount = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 96) { + if (tag != 48) { break; } } - case 96: { - // retcode - retcode = input.readUInt32(); + case 48: { + // groupId + groupId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 112) { @@ -355,15 +355,15 @@ public TakeChallengeRewardScRsp mergeFrom(final ProtoSource input) throws IOExce } } case 112: { - // starCount - starCount = input.readUInt32(); + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 10) { + if (tag != 122) { break; } } - case 10: { + case 122: { // reward input.readMessage(reward); bitField0_ |= 0x00000008; @@ -390,13 +390,13 @@ public TakeChallengeRewardScRsp mergeFrom(final ProtoSource input) throws IOExce public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.groupId, groupId); + output.writeUInt32(FieldNames.starCount, starCount); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.groupId, groupId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.starCount, starCount); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000008) != 0) { output.writeMessage(FieldNames.reward, reward); @@ -411,11 +411,11 @@ public TakeChallengeRewardScRsp mergeFrom(final JsonSource input) throws IOExcep } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 293428218: - case 506361563: { - if (input.isAtField(FieldNames.groupId)) { + case 2121235933: + case 2124166370: { + if (input.isAtField(FieldNames.starCount)) { if (!input.trySkipNullValue()) { - groupId = input.readUInt32(); + starCount = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -423,10 +423,11 @@ public TakeChallengeRewardScRsp mergeFrom(final JsonSource input) throws IOExcep } break; } - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case 293428218: + case 506361563: { + if (input.isAtField(FieldNames.groupId)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + groupId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -434,11 +435,10 @@ public TakeChallengeRewardScRsp mergeFrom(final JsonSource input) throws IOExcep } break; } - case 2121235933: - case 2124166370: { - if (input.isAtField(FieldNames.starCount)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - starCount = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -510,12 +510,12 @@ public TakeChallengeRewardScRsp create() { * Contains name constants used for serializing JSON */ static class FieldNames { + static final FieldName starCount = FieldName.forField("starCount", "star_count"); + static final FieldName groupId = FieldName.forField("groupId", "group_id"); static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName starCount = FieldName.forField("starCount", "star_count"); - static final FieldName reward = FieldName.forField("reward"); } } diff --git a/src/generated/main/emu/lunarcore/proto/TakeMailAttachmentScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/TakeMailAttachmentScRspOuterClass.java index 0b832e6e4..65a7660a1 100644 --- a/src/generated/main/emu/lunarcore/proto/TakeMailAttachmentScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/TakeMailAttachmentScRspOuterClass.java @@ -20,17 +20,17 @@ public static final class TakeMailAttachmentScRsp extends ProtoMessageoptional uint32 retcode = 7; + * optional uint32 retcode = 9; */ private int retcode; /** - * optional .ItemList attachment = 12; + * optional .ItemList attachment = 5; */ private final ItemListOuterClass.ItemList attachment = ItemListOuterClass.ItemList.newInstance(); /** - * repeated uint32 succ_mail_id_list = 4; + * repeated uint32 succ_mail_id_list = 13; */ private final RepeatedInt succMailIdList = RepeatedInt.newEmptyInstance(); @@ -45,7 +45,7 @@ public static TakeMailAttachmentScRsp newInstance() { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 9; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -53,7 +53,7 @@ public boolean hasRetcode() { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 9; * @return this */ public TakeMailAttachmentScRsp clearRetcode() { @@ -63,7 +63,7 @@ public TakeMailAttachmentScRsp clearRetcode() { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 9; * @return the retcode */ public int getRetcode() { @@ -71,7 +71,7 @@ public int getRetcode() { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 9; * @param value the retcode to set * @return this */ @@ -82,7 +82,7 @@ public TakeMailAttachmentScRsp setRetcode(final int value) { } /** - * optional .ItemList attachment = 12; + * optional .ItemList attachment = 5; * @return whether the attachment field is set */ public boolean hasAttachment() { @@ -90,7 +90,7 @@ public boolean hasAttachment() { } /** - * optional .ItemList attachment = 12; + * optional .ItemList attachment = 5; * @return this */ public TakeMailAttachmentScRsp clearAttachment() { @@ -100,7 +100,7 @@ public TakeMailAttachmentScRsp clearAttachment() { } /** - * optional .ItemList attachment = 12; + * optional .ItemList attachment = 5; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -114,7 +114,7 @@ public ItemListOuterClass.ItemList getAttachment() { } /** - * optional .ItemList attachment = 12; + * optional .ItemList attachment = 5; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -128,7 +128,7 @@ public ItemListOuterClass.ItemList getMutableAttachment() { } /** - * optional .ItemList attachment = 12; + * optional .ItemList attachment = 5; * @param value the attachment to set * @return this */ @@ -139,7 +139,7 @@ public TakeMailAttachmentScRsp setAttachment(final ItemListOuterClass.ItemList v } /** - * repeated uint32 succ_mail_id_list = 4; + * repeated uint32 succ_mail_id_list = 13; * @return whether the succMailIdList field is set */ public boolean hasSuccMailIdList() { @@ -147,7 +147,7 @@ public boolean hasSuccMailIdList() { } /** - * repeated uint32 succ_mail_id_list = 4; + * repeated uint32 succ_mail_id_list = 13; * @return this */ public TakeMailAttachmentScRsp clearSuccMailIdList() { @@ -157,7 +157,7 @@ public TakeMailAttachmentScRsp clearSuccMailIdList() { } /** - * repeated uint32 succ_mail_id_list = 4; + * repeated uint32 succ_mail_id_list = 13; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -171,7 +171,7 @@ public RepeatedInt getSuccMailIdList() { } /** - * repeated uint32 succ_mail_id_list = 4; + * repeated uint32 succ_mail_id_list = 13; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -185,7 +185,7 @@ public RepeatedInt getMutableSuccMailIdList() { } /** - * repeated uint32 succ_mail_id_list = 4; + * repeated uint32 succ_mail_id_list = 13; * @param value the succMailIdList to add * @return this */ @@ -196,7 +196,7 @@ public TakeMailAttachmentScRsp addSuccMailIdList(final int value) { } /** - * repeated uint32 succ_mail_id_list = 4; + * repeated uint32 succ_mail_id_list = 13; * @param values the succMailIdList to add * @return this */ @@ -279,16 +279,16 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 98); + output.writeRawByte((byte) 42); output.writeMessageNoTag(attachment); } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < succMailIdList.length(); i++) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(succMailIdList.array()[i]); } } @@ -316,25 +316,25 @@ public TakeMailAttachmentScRsp mergeFrom(final ProtoSource input) throws IOExcep int tag = input.readTag(); while (true) { switch (tag) { - case 56: { + case 72: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 98) { + if (tag != 42) { break; } } - case 98: { + case 42: { // attachment input.readMessage(attachment); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 34) { + if (tag != 106) { break; } } - case 34: { + case 106: { // succMailIdList [packed=true] input.readPackedUInt32(succMailIdList, tag); bitField0_ |= 0x00000004; @@ -353,7 +353,7 @@ public TakeMailAttachmentScRsp mergeFrom(final ProtoSource input) throws IOExcep tag = input.readTag(); break; } - case 32: { + case 104: { // succMailIdList [packed=false] tag = input.readRepeatedUInt32(succMailIdList, tag); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/TakeOffEquipmentCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/TakeOffEquipmentCsReqOuterClass.java index 3bec90d4c..3a7aba8f9 100644 --- a/src/generated/main/emu/lunarcore/proto/TakeOffEquipmentCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/TakeOffEquipmentCsReqOuterClass.java @@ -19,7 +19,7 @@ public static final class TakeOffEquipmentCsReq extends ProtoMessageoptional uint32 base_avatar_id = 12; + * optional uint32 base_avatar_id = 7; */ private int baseAvatarId; @@ -34,7 +34,7 @@ public static TakeOffEquipmentCsReq newInstance() { } /** - * optional uint32 base_avatar_id = 12; + * optional uint32 base_avatar_id = 7; * @return whether the baseAvatarId field is set */ public boolean hasBaseAvatarId() { @@ -42,7 +42,7 @@ public boolean hasBaseAvatarId() { } /** - * optional uint32 base_avatar_id = 12; + * optional uint32 base_avatar_id = 7; * @return this */ public TakeOffEquipmentCsReq clearBaseAvatarId() { @@ -52,7 +52,7 @@ public TakeOffEquipmentCsReq clearBaseAvatarId() { } /** - * optional uint32 base_avatar_id = 12; + * optional uint32 base_avatar_id = 7; * @return the baseAvatarId */ public int getBaseAvatarId() { @@ -60,7 +60,7 @@ public int getBaseAvatarId() { } /** - * optional uint32 base_avatar_id = 12; + * optional uint32 base_avatar_id = 7; * @param value the baseAvatarId to set * @return this */ @@ -129,7 +129,7 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(baseAvatarId); } } @@ -150,7 +150,7 @@ public TakeOffEquipmentCsReq mergeFrom(final ProtoSource input) throws IOExcepti int tag = input.readTag(); while (true) { switch (tag) { - case 96: { + case 56: { // baseAvatarId baseAvatarId = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/TakeOffRelicCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/TakeOffRelicCsReqOuterClass.java index 3825e47ca..5f50e09de 100644 --- a/src/generated/main/emu/lunarcore/proto/TakeOffRelicCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/TakeOffRelicCsReqOuterClass.java @@ -20,12 +20,12 @@ public static final class TakeOffRelicCsReq extends ProtoMessageoptional uint32 base_avatar_id = 14; + * optional uint32 base_avatar_id = 8; */ private int baseAvatarId; /** - * repeated uint32 slot_list = 4; + * repeated uint32 slot_list = 5; */ private final RepeatedInt slotList = RepeatedInt.newEmptyInstance(); @@ -40,7 +40,7 @@ public static TakeOffRelicCsReq newInstance() { } /** - * optional uint32 base_avatar_id = 14; + * optional uint32 base_avatar_id = 8; * @return whether the baseAvatarId field is set */ public boolean hasBaseAvatarId() { @@ -48,7 +48,7 @@ public boolean hasBaseAvatarId() { } /** - * optional uint32 base_avatar_id = 14; + * optional uint32 base_avatar_id = 8; * @return this */ public TakeOffRelicCsReq clearBaseAvatarId() { @@ -58,7 +58,7 @@ public TakeOffRelicCsReq clearBaseAvatarId() { } /** - * optional uint32 base_avatar_id = 14; + * optional uint32 base_avatar_id = 8; * @return the baseAvatarId */ public int getBaseAvatarId() { @@ -66,7 +66,7 @@ public int getBaseAvatarId() { } /** - * optional uint32 base_avatar_id = 14; + * optional uint32 base_avatar_id = 8; * @param value the baseAvatarId to set * @return this */ @@ -77,7 +77,7 @@ public TakeOffRelicCsReq setBaseAvatarId(final int value) { } /** - * repeated uint32 slot_list = 4; + * repeated uint32 slot_list = 5; * @return whether the slotList field is set */ public boolean hasSlotList() { @@ -85,7 +85,7 @@ public boolean hasSlotList() { } /** - * repeated uint32 slot_list = 4; + * repeated uint32 slot_list = 5; * @return this */ public TakeOffRelicCsReq clearSlotList() { @@ -95,7 +95,7 @@ public TakeOffRelicCsReq clearSlotList() { } /** - * repeated uint32 slot_list = 4; + * repeated uint32 slot_list = 5; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -109,7 +109,7 @@ public RepeatedInt getSlotList() { } /** - * repeated uint32 slot_list = 4; + * repeated uint32 slot_list = 5; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -123,7 +123,7 @@ public RepeatedInt getMutableSlotList() { } /** - * repeated uint32 slot_list = 4; + * repeated uint32 slot_list = 5; * @param value the slotList to add * @return this */ @@ -134,7 +134,7 @@ public TakeOffRelicCsReq addSlotList(final int value) { } /** - * repeated uint32 slot_list = 4; + * repeated uint32 slot_list = 5; * @param values the slotList to add * @return this */ @@ -210,12 +210,12 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(baseAvatarId); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < slotList.length(); i++) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(slotList.array()[i]); } } @@ -240,16 +240,16 @@ public TakeOffRelicCsReq mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 112: { + case 64: { // baseAvatarId baseAvatarId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 34) { + if (tag != 42) { break; } } - case 34: { + case 42: { // slotList [packed=true] input.readPackedUInt32(slotList, tag); bitField0_ |= 0x00000002; @@ -268,7 +268,7 @@ public TakeOffRelicCsReq mergeFrom(final ProtoSource input) throws IOException { tag = input.readTag(); break; } - case 32: { + case 40: { // slotList [packed=false] tag = input.readRepeatedUInt32(slotList, tag); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/TakePromotionRewardCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/TakePromotionRewardCsReqOuterClass.java index 5517eef67..b3a10c458 100644 --- a/src/generated/main/emu/lunarcore/proto/TakePromotionRewardCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/TakePromotionRewardCsReqOuterClass.java @@ -19,12 +19,12 @@ public static final class TakePromotionRewardCsReq extends ProtoMessageoptional uint32 base_avatar_id = 8; + * optional uint32 base_avatar_id = 5; */ private int baseAvatarId; /** - * optional uint32 promotion = 12; + * optional uint32 promotion = 10; */ private int promotion; @@ -39,7 +39,7 @@ public static TakePromotionRewardCsReq newInstance() { } /** - * optional uint32 base_avatar_id = 8; + * optional uint32 base_avatar_id = 5; * @return whether the baseAvatarId field is set */ public boolean hasBaseAvatarId() { @@ -47,7 +47,7 @@ public boolean hasBaseAvatarId() { } /** - * optional uint32 base_avatar_id = 8; + * optional uint32 base_avatar_id = 5; * @return this */ public TakePromotionRewardCsReq clearBaseAvatarId() { @@ -57,7 +57,7 @@ public TakePromotionRewardCsReq clearBaseAvatarId() { } /** - * optional uint32 base_avatar_id = 8; + * optional uint32 base_avatar_id = 5; * @return the baseAvatarId */ public int getBaseAvatarId() { @@ -65,7 +65,7 @@ public int getBaseAvatarId() { } /** - * optional uint32 base_avatar_id = 8; + * optional uint32 base_avatar_id = 5; * @param value the baseAvatarId to set * @return this */ @@ -76,7 +76,7 @@ public TakePromotionRewardCsReq setBaseAvatarId(final int value) { } /** - * optional uint32 promotion = 12; + * optional uint32 promotion = 10; * @return whether the promotion field is set */ public boolean hasPromotion() { @@ -84,7 +84,7 @@ public boolean hasPromotion() { } /** - * optional uint32 promotion = 12; + * optional uint32 promotion = 10; * @return this */ public TakePromotionRewardCsReq clearPromotion() { @@ -94,7 +94,7 @@ public TakePromotionRewardCsReq clearPromotion() { } /** - * optional uint32 promotion = 12; + * optional uint32 promotion = 10; * @return the promotion */ public int getPromotion() { @@ -102,7 +102,7 @@ public int getPromotion() { } /** - * optional uint32 promotion = 12; + * optional uint32 promotion = 10; * @param value the promotion to set * @return this */ @@ -177,11 +177,11 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(baseAvatarId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(promotion); } } @@ -205,16 +205,16 @@ public TakePromotionRewardCsReq mergeFrom(final ProtoSource input) throws IOExce int tag = input.readTag(); while (true) { switch (tag) { - case 64: { + case 40: { // baseAvatarId baseAvatarId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 96) { + if (tag != 80) { break; } } - case 96: { + case 80: { // promotion promotion = input.readUInt32(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/TakePromotionRewardScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/TakePromotionRewardScRspOuterClass.java index d3b646706..9997c59ed 100644 --- a/src/generated/main/emu/lunarcore/proto/TakePromotionRewardScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/TakePromotionRewardScRspOuterClass.java @@ -19,12 +19,12 @@ public static final class TakePromotionRewardScRsp extends ProtoMessageoptional uint32 retcode = 6; + * optional uint32 retcode = 12; */ private int retcode; /** - * optional .ItemList reward_list = 8; + * optional .ItemList reward_list = 10; */ private final ItemListOuterClass.ItemList rewardList = ItemListOuterClass.ItemList.newInstance(); @@ -39,7 +39,7 @@ public static TakePromotionRewardScRsp newInstance() { } /** - * optional uint32 retcode = 6; + * optional uint32 retcode = 12; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public boolean hasRetcode() { } /** - * optional uint32 retcode = 6; + * optional uint32 retcode = 12; * @return this */ public TakePromotionRewardScRsp clearRetcode() { @@ -57,7 +57,7 @@ public TakePromotionRewardScRsp clearRetcode() { } /** - * optional uint32 retcode = 6; + * optional uint32 retcode = 12; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public int getRetcode() { } /** - * optional uint32 retcode = 6; + * optional uint32 retcode = 12; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public TakePromotionRewardScRsp setRetcode(final int value) { } /** - * optional .ItemList reward_list = 8; + * optional .ItemList reward_list = 10; * @return whether the rewardList field is set */ public boolean hasRewardList() { @@ -84,7 +84,7 @@ public boolean hasRewardList() { } /** - * optional .ItemList reward_list = 8; + * optional .ItemList reward_list = 10; * @return this */ public TakePromotionRewardScRsp clearRewardList() { @@ -94,7 +94,7 @@ public TakePromotionRewardScRsp clearRewardList() { } /** - * optional .ItemList reward_list = 8; + * optional .ItemList reward_list = 10; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -108,7 +108,7 @@ public ItemListOuterClass.ItemList getRewardList() { } /** - * optional .ItemList reward_list = 8; + * optional .ItemList reward_list = 10; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -122,7 +122,7 @@ public ItemListOuterClass.ItemList getMutableRewardList() { } /** - * optional .ItemList reward_list = 8; + * optional .ItemList reward_list = 10; * @param value the rewardList to set * @return this */ @@ -198,11 +198,11 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 66); + output.writeRawByte((byte) 82); output.writeMessageNoTag(rewardList); } } @@ -226,16 +226,16 @@ public TakePromotionRewardScRsp mergeFrom(final ProtoSource input) throws IOExce int tag = input.readTag(); while (true) { switch (tag) { - case 48: { + case 96: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 66) { + if (tag != 82) { break; } } - case 66: { + case 82: { // rewardList input.readMessage(rewardList); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/TextJoinQueryCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/TextJoinQueryCsReqOuterClass.java index c72af2da1..d15e9bfa6 100644 --- a/src/generated/main/emu/lunarcore/proto/TextJoinQueryCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/TextJoinQueryCsReqOuterClass.java @@ -20,7 +20,7 @@ public static final class TextJoinQueryCsReq extends ProtoMessagerepeated uint32 text_join_id_list = 6; + * repeated uint32 text_join_id_list = 15; */ private final RepeatedInt textJoinIdList = RepeatedInt.newEmptyInstance(); @@ -35,7 +35,7 @@ public static TextJoinQueryCsReq newInstance() { } /** - * repeated uint32 text_join_id_list = 6; + * repeated uint32 text_join_id_list = 15; * @return whether the textJoinIdList field is set */ public boolean hasTextJoinIdList() { @@ -43,7 +43,7 @@ public boolean hasTextJoinIdList() { } /** - * repeated uint32 text_join_id_list = 6; + * repeated uint32 text_join_id_list = 15; * @return this */ public TextJoinQueryCsReq clearTextJoinIdList() { @@ -53,7 +53,7 @@ public TextJoinQueryCsReq clearTextJoinIdList() { } /** - * repeated uint32 text_join_id_list = 6; + * repeated uint32 text_join_id_list = 15; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -67,7 +67,7 @@ public RepeatedInt getTextJoinIdList() { } /** - * repeated uint32 text_join_id_list = 6; + * repeated uint32 text_join_id_list = 15; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -81,7 +81,7 @@ public RepeatedInt getMutableTextJoinIdList() { } /** - * repeated uint32 text_join_id_list = 6; + * repeated uint32 text_join_id_list = 15; * @param value the textJoinIdList to add * @return this */ @@ -92,7 +92,7 @@ public TextJoinQueryCsReq addTextJoinIdList(final int value) { } /** - * repeated uint32 text_join_id_list = 6; + * repeated uint32 text_join_id_list = 15; * @param values the textJoinIdList to add * @return this */ @@ -163,7 +163,7 @@ public boolean equals(Object o) { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { for (int i = 0; i < textJoinIdList.length(); i++) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(textJoinIdList.array()[i]); } } @@ -185,7 +185,7 @@ public TextJoinQueryCsReq mergeFrom(final ProtoSource input) throws IOException int tag = input.readTag(); while (true) { switch (tag) { - case 50: { + case 122: { // textJoinIdList [packed=true] input.readPackedUInt32(textJoinIdList, tag); bitField0_ |= 0x00000001; @@ -204,7 +204,7 @@ public TextJoinQueryCsReq mergeFrom(final ProtoSource input) throws IOException tag = input.readTag(); break; } - case 48: { + case 120: { // textJoinIdList [packed=false] tag = input.readRepeatedUInt32(textJoinIdList, tag); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/TextJoinQueryScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/TextJoinQueryScRspOuterClass.java index 99b474b0b..850a96a12 100644 --- a/src/generated/main/emu/lunarcore/proto/TextJoinQueryScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/TextJoinQueryScRspOuterClass.java @@ -20,12 +20,12 @@ public static final class TextJoinQueryScRsp extends ProtoMessageoptional uint32 retcode = 12; + * optional uint32 retcode = 3; */ private int retcode; /** - * repeated .TextJoinInfo text_join_list = 1; + * repeated .TextJoinInfo text_join_list = 15; */ private final RepeatedMessage textJoinList = RepeatedMessage.newEmptyInstance(TextJoinInfoOuterClass.TextJoinInfo.getFactory()); @@ -40,7 +40,7 @@ public static TextJoinQueryScRsp newInstance() { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 3; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -48,7 +48,7 @@ public boolean hasRetcode() { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 3; * @return this */ public TextJoinQueryScRsp clearRetcode() { @@ -58,7 +58,7 @@ public TextJoinQueryScRsp clearRetcode() { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 3; * @return the retcode */ public int getRetcode() { @@ -66,7 +66,7 @@ public int getRetcode() { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 3; * @param value the retcode to set * @return this */ @@ -77,7 +77,7 @@ public TextJoinQueryScRsp setRetcode(final int value) { } /** - * repeated .TextJoinInfo text_join_list = 1; + * repeated .TextJoinInfo text_join_list = 15; * @return whether the textJoinList field is set */ public boolean hasTextJoinList() { @@ -85,7 +85,7 @@ public boolean hasTextJoinList() { } /** - * repeated .TextJoinInfo text_join_list = 1; + * repeated .TextJoinInfo text_join_list = 15; * @return this */ public TextJoinQueryScRsp clearTextJoinList() { @@ -95,7 +95,7 @@ public TextJoinQueryScRsp clearTextJoinList() { } /** - * repeated .TextJoinInfo text_join_list = 1; + * repeated .TextJoinInfo text_join_list = 15; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -109,7 +109,7 @@ public RepeatedMessage getTextJoinList() { } /** - * repeated .TextJoinInfo text_join_list = 1; + * repeated .TextJoinInfo text_join_list = 15; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -123,7 +123,7 @@ public RepeatedMessage getMutableTextJoinLi } /** - * repeated .TextJoinInfo text_join_list = 1; + * repeated .TextJoinInfo text_join_list = 15; * @param value the textJoinList to add * @return this */ @@ -134,7 +134,7 @@ public TextJoinQueryScRsp addTextJoinList(final TextJoinInfoOuterClass.TextJoinI } /** - * repeated .TextJoinInfo text_join_list = 1; + * repeated .TextJoinInfo text_join_list = 15; * @param values the textJoinList to add * @return this */ @@ -211,12 +211,12 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < textJoinList.length(); i++) { - output.writeRawByte((byte) 10); + output.writeRawByte((byte) 122); output.writeMessageNoTag(textJoinList.get(i)); } } @@ -241,16 +241,16 @@ public TextJoinQueryScRsp mergeFrom(final ProtoSource input) throws IOException int tag = input.readTag(); while (true) { switch (tag) { - case 96: { + case 24: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 10) { + if (tag != 122) { break; } } - case 10: { + case 122: { // textJoinList tag = input.readRepeatedMessage(textJoinList, tag); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/UnlockBackGroundMusicCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/UnlockBackGroundMusicCsReqOuterClass.java index 8bc796a37..baf8a6b2e 100644 --- a/src/generated/main/emu/lunarcore/proto/UnlockBackGroundMusicCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/UnlockBackGroundMusicCsReqOuterClass.java @@ -20,7 +20,7 @@ public static final class UnlockBackGroundMusicCsReq extends ProtoMessagerepeated uint32 unlock_ids = 11; + * repeated uint32 unlock_ids = 5; */ private final RepeatedInt unlockIds = RepeatedInt.newEmptyInstance(); @@ -35,7 +35,7 @@ public static UnlockBackGroundMusicCsReq newInstance() { } /** - * repeated uint32 unlock_ids = 11; + * repeated uint32 unlock_ids = 5; * @return whether the unlockIds field is set */ public boolean hasUnlockIds() { @@ -43,7 +43,7 @@ public boolean hasUnlockIds() { } /** - * repeated uint32 unlock_ids = 11; + * repeated uint32 unlock_ids = 5; * @return this */ public UnlockBackGroundMusicCsReq clearUnlockIds() { @@ -53,7 +53,7 @@ public UnlockBackGroundMusicCsReq clearUnlockIds() { } /** - * repeated uint32 unlock_ids = 11; + * repeated uint32 unlock_ids = 5; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -67,7 +67,7 @@ public RepeatedInt getUnlockIds() { } /** - * repeated uint32 unlock_ids = 11; + * repeated uint32 unlock_ids = 5; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -81,7 +81,7 @@ public RepeatedInt getMutableUnlockIds() { } /** - * repeated uint32 unlock_ids = 11; + * repeated uint32 unlock_ids = 5; * @param value the unlockIds to add * @return this */ @@ -92,7 +92,7 @@ public UnlockBackGroundMusicCsReq addUnlockIds(final int value) { } /** - * repeated uint32 unlock_ids = 11; + * repeated uint32 unlock_ids = 5; * @param values the unlockIds to add * @return this */ @@ -163,7 +163,7 @@ public boolean equals(Object o) { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { for (int i = 0; i < unlockIds.length(); i++) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(unlockIds.array()[i]); } } @@ -185,7 +185,7 @@ public UnlockBackGroundMusicCsReq mergeFrom(final ProtoSource input) throws IOEx int tag = input.readTag(); while (true) { switch (tag) { - case 90: { + case 42: { // unlockIds [packed=true] input.readPackedUInt32(unlockIds, tag); bitField0_ |= 0x00000001; @@ -204,7 +204,7 @@ public UnlockBackGroundMusicCsReq mergeFrom(final ProtoSource input) throws IOEx tag = input.readTag(); break; } - case 88: { + case 40: { // unlockIds [packed=false] tag = input.readRepeatedUInt32(unlockIds, tag); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/UnlockBackGroundMusicScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/UnlockBackGroundMusicScRspOuterClass.java index 15891c1dd..dc4aa87cb 100644 --- a/src/generated/main/emu/lunarcore/proto/UnlockBackGroundMusicScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/UnlockBackGroundMusicScRspOuterClass.java @@ -26,12 +26,12 @@ public static final class UnlockBackGroundMusicScRsp extends ProtoMessagerepeated uint32 unlocked_ids = 3; + * repeated uint32 unlocked_ids = 4; */ private final RepeatedInt unlockedIds = RepeatedInt.newEmptyInstance(); /** - * repeated .UnlockedMusic music_list = 6; + * repeated .UnlockedMusic music_list = 2; */ private final RepeatedMessage musicList = RepeatedMessage.newEmptyInstance(UnlockedMusicOuterClass.UnlockedMusic.getFactory()); @@ -83,7 +83,7 @@ public UnlockBackGroundMusicScRsp setRetcode(final int value) { } /** - * repeated uint32 unlocked_ids = 3; + * repeated uint32 unlocked_ids = 4; * @return whether the unlockedIds field is set */ public boolean hasUnlockedIds() { @@ -91,7 +91,7 @@ public boolean hasUnlockedIds() { } /** - * repeated uint32 unlocked_ids = 3; + * repeated uint32 unlocked_ids = 4; * @return this */ public UnlockBackGroundMusicScRsp clearUnlockedIds() { @@ -101,7 +101,7 @@ public UnlockBackGroundMusicScRsp clearUnlockedIds() { } /** - * repeated uint32 unlocked_ids = 3; + * repeated uint32 unlocked_ids = 4; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -115,7 +115,7 @@ public RepeatedInt getUnlockedIds() { } /** - * repeated uint32 unlocked_ids = 3; + * repeated uint32 unlocked_ids = 4; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -129,7 +129,7 @@ public RepeatedInt getMutableUnlockedIds() { } /** - * repeated uint32 unlocked_ids = 3; + * repeated uint32 unlocked_ids = 4; * @param value the unlockedIds to add * @return this */ @@ -140,7 +140,7 @@ public UnlockBackGroundMusicScRsp addUnlockedIds(final int value) { } /** - * repeated uint32 unlocked_ids = 3; + * repeated uint32 unlocked_ids = 4; * @param values the unlockedIds to add * @return this */ @@ -151,7 +151,7 @@ public UnlockBackGroundMusicScRsp addAllUnlockedIds(final int... values) { } /** - * repeated .UnlockedMusic music_list = 6; + * repeated .UnlockedMusic music_list = 2; * @return whether the musicList field is set */ public boolean hasMusicList() { @@ -159,7 +159,7 @@ public boolean hasMusicList() { } /** - * repeated .UnlockedMusic music_list = 6; + * repeated .UnlockedMusic music_list = 2; * @return this */ public UnlockBackGroundMusicScRsp clearMusicList() { @@ -169,7 +169,7 @@ public UnlockBackGroundMusicScRsp clearMusicList() { } /** - * repeated .UnlockedMusic music_list = 6; + * repeated .UnlockedMusic music_list = 2; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -183,7 +183,7 @@ public RepeatedMessage getMusicList() { } /** - * repeated .UnlockedMusic music_list = 6; + * repeated .UnlockedMusic music_list = 2; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -197,7 +197,7 @@ public RepeatedMessage getMutableMusicLis } /** - * repeated .UnlockedMusic music_list = 6; + * repeated .UnlockedMusic music_list = 2; * @param value the musicList to add * @return this */ @@ -209,7 +209,7 @@ public UnlockBackGroundMusicScRsp addMusicList( } /** - * repeated .UnlockedMusic music_list = 6; + * repeated .UnlockedMusic music_list = 2; * @param values the musicList to add * @return this */ @@ -298,13 +298,13 @@ public void writeTo(final ProtoSink output) throws IOException { } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < unlockedIds.length(); i++) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(unlockedIds.array()[i]); } } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < musicList.length(); i++) { - output.writeRawByte((byte) 50); + output.writeRawByte((byte) 18); output.writeMessageNoTag(musicList.get(i)); } } @@ -337,20 +337,20 @@ public UnlockBackGroundMusicScRsp mergeFrom(final ProtoSource input) throws IOEx retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 26) { + if (tag != 34) { break; } } - case 26: { + case 34: { // unlockedIds [packed=true] input.readPackedUInt32(unlockedIds, tag); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 50) { + if (tag != 18) { break; } } - case 50: { + case 18: { // musicList tag = input.readRepeatedMessage(musicList, tag); bitField0_ |= 0x00000004; @@ -368,7 +368,7 @@ public UnlockBackGroundMusicScRsp mergeFrom(final ProtoSource input) throws IOEx tag = input.readTag(); break; } - case 24: { + case 32: { // unlockedIds [packed=false] tag = input.readRepeatedUInt32(unlockedIds, tag); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/UnlockPhoneThemeScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/UnlockPhoneThemeScNotifyOuterClass.java index beeef998b..bbf4847d9 100644 --- a/src/generated/main/emu/lunarcore/proto/UnlockPhoneThemeScNotifyOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/UnlockPhoneThemeScNotifyOuterClass.java @@ -19,7 +19,7 @@ public static final class UnlockPhoneThemeScNotify extends ProtoMessageoptional uint32 theme_id = 15; + * optional uint32 theme_id = 4; */ private int themeId; @@ -34,7 +34,7 @@ public static UnlockPhoneThemeScNotify newInstance() { } /** - * optional uint32 theme_id = 15; + * optional uint32 theme_id = 4; * @return whether the themeId field is set */ public boolean hasThemeId() { @@ -42,7 +42,7 @@ public boolean hasThemeId() { } /** - * optional uint32 theme_id = 15; + * optional uint32 theme_id = 4; * @return this */ public UnlockPhoneThemeScNotify clearThemeId() { @@ -52,7 +52,7 @@ public UnlockPhoneThemeScNotify clearThemeId() { } /** - * optional uint32 theme_id = 15; + * optional uint32 theme_id = 4; * @return the themeId */ public int getThemeId() { @@ -60,7 +60,7 @@ public int getThemeId() { } /** - * optional uint32 theme_id = 15; + * optional uint32 theme_id = 4; * @param value the themeId to set * @return this */ @@ -129,7 +129,7 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(themeId); } } @@ -150,7 +150,7 @@ public UnlockPhoneThemeScNotify mergeFrom(final ProtoSource input) throws IOExce int tag = input.readTag(); while (true) { switch (tag) { - case 120: { + case 32: { // themeId themeId = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/UnlockSkilltreeCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/UnlockSkilltreeCsReqOuterClass.java index 6327dfc83..74d8c2e83 100644 --- a/src/generated/main/emu/lunarcore/proto/UnlockSkilltreeCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/UnlockSkilltreeCsReqOuterClass.java @@ -20,17 +20,17 @@ public static final class UnlockSkilltreeCsReq extends ProtoMessageoptional uint32 level = 6; + * optional uint32 level = 5; */ private int level; /** - * optional uint32 point_id = 9; + * optional uint32 point_id = 13; */ private int pointId; /** - * repeated .ItemCost item_list = 5; + * repeated .ItemCost item_list = 14; */ private final RepeatedMessage itemList = RepeatedMessage.newEmptyInstance(ItemCostOuterClass.ItemCost.getFactory()); @@ -45,7 +45,7 @@ public static UnlockSkilltreeCsReq newInstance() { } /** - * optional uint32 level = 6; + * optional uint32 level = 5; * @return whether the level field is set */ public boolean hasLevel() { @@ -53,7 +53,7 @@ public boolean hasLevel() { } /** - * optional uint32 level = 6; + * optional uint32 level = 5; * @return this */ public UnlockSkilltreeCsReq clearLevel() { @@ -63,7 +63,7 @@ public UnlockSkilltreeCsReq clearLevel() { } /** - * optional uint32 level = 6; + * optional uint32 level = 5; * @return the level */ public int getLevel() { @@ -71,7 +71,7 @@ public int getLevel() { } /** - * optional uint32 level = 6; + * optional uint32 level = 5; * @param value the level to set * @return this */ @@ -82,7 +82,7 @@ public UnlockSkilltreeCsReq setLevel(final int value) { } /** - * optional uint32 point_id = 9; + * optional uint32 point_id = 13; * @return whether the pointId field is set */ public boolean hasPointId() { @@ -90,7 +90,7 @@ public boolean hasPointId() { } /** - * optional uint32 point_id = 9; + * optional uint32 point_id = 13; * @return this */ public UnlockSkilltreeCsReq clearPointId() { @@ -100,7 +100,7 @@ public UnlockSkilltreeCsReq clearPointId() { } /** - * optional uint32 point_id = 9; + * optional uint32 point_id = 13; * @return the pointId */ public int getPointId() { @@ -108,7 +108,7 @@ public int getPointId() { } /** - * optional uint32 point_id = 9; + * optional uint32 point_id = 13; * @param value the pointId to set * @return this */ @@ -119,7 +119,7 @@ public UnlockSkilltreeCsReq setPointId(final int value) { } /** - * repeated .ItemCost item_list = 5; + * repeated .ItemCost item_list = 14; * @return whether the itemList field is set */ public boolean hasItemList() { @@ -127,7 +127,7 @@ public boolean hasItemList() { } /** - * repeated .ItemCost item_list = 5; + * repeated .ItemCost item_list = 14; * @return this */ public UnlockSkilltreeCsReq clearItemList() { @@ -137,7 +137,7 @@ public UnlockSkilltreeCsReq clearItemList() { } /** - * repeated .ItemCost item_list = 5; + * repeated .ItemCost item_list = 14; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -151,7 +151,7 @@ public RepeatedMessage getItemList() { } /** - * repeated .ItemCost item_list = 5; + * repeated .ItemCost item_list = 14; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -165,7 +165,7 @@ public RepeatedMessage getMutableItemList() { } /** - * repeated .ItemCost item_list = 5; + * repeated .ItemCost item_list = 14; * @param value the itemList to add * @return this */ @@ -176,7 +176,7 @@ public UnlockSkilltreeCsReq addItemList(final ItemCostOuterClass.ItemCost value) } /** - * repeated .ItemCost item_list = 5; + * repeated .ItemCost item_list = 14; * @param values the itemList to add * @return this */ @@ -258,16 +258,16 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(level); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(pointId); } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < itemList.length(); i++) { - output.writeRawByte((byte) 42); + output.writeRawByte((byte) 114); output.writeMessageNoTag(itemList.get(i)); } } @@ -295,25 +295,25 @@ public UnlockSkilltreeCsReq mergeFrom(final ProtoSource input) throws IOExceptio int tag = input.readTag(); while (true) { switch (tag) { - case 48: { + case 40: { // level level = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 72) { + if (tag != 104) { break; } } - case 72: { + case 104: { // pointId pointId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 42) { + if (tag != 114) { break; } } - case 42: { + case 114: { // itemList tag = input.readRepeatedMessage(itemList, tag); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/UnlockSkilltreeScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/UnlockSkilltreeScRspOuterClass.java index ce5e8b8c6..210240afb 100644 --- a/src/generated/main/emu/lunarcore/proto/UnlockSkilltreeScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/UnlockSkilltreeScRspOuterClass.java @@ -19,25 +19,25 @@ public static final class UnlockSkilltreeScRsp extends ProtoMessageoptional uint32 retcode = 4; - */ - private int retcode; - - /** - * optional uint32 point_id = 5; + * optional uint32 point_id = 9; */ private int pointId; /** - * optional uint32 level = 14; + * optional uint32 level = 10; */ private int level; /** - * optional uint32 base_avatar_id = 15; + * optional uint32 base_avatar_id = 11; */ private int baseAvatarId; + /** + * optional uint32 retcode = 14; + */ + private int retcode; + private UnlockSkilltreeScRsp() { } @@ -49,150 +49,150 @@ public static UnlockSkilltreeScRsp newInstance() { } /** - * optional uint32 retcode = 4; - * @return whether the retcode field is set + * optional uint32 point_id = 9; + * @return whether the pointId field is set */ - public boolean hasRetcode() { + public boolean hasPointId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 retcode = 4; + * optional uint32 point_id = 9; * @return this */ - public UnlockSkilltreeScRsp clearRetcode() { + public UnlockSkilltreeScRsp clearPointId() { bitField0_ &= ~0x00000001; - retcode = 0; + pointId = 0; return this; } /** - * optional uint32 retcode = 4; - * @return the retcode + * optional uint32 point_id = 9; + * @return the pointId */ - public int getRetcode() { - return retcode; + public int getPointId() { + return pointId; } /** - * optional uint32 retcode = 4; - * @param value the retcode to set + * optional uint32 point_id = 9; + * @param value the pointId to set * @return this */ - public UnlockSkilltreeScRsp setRetcode(final int value) { + public UnlockSkilltreeScRsp setPointId(final int value) { bitField0_ |= 0x00000001; - retcode = value; + pointId = value; return this; } /** - * optional uint32 point_id = 5; - * @return whether the pointId field is set + * optional uint32 level = 10; + * @return whether the level field is set */ - public boolean hasPointId() { + public boolean hasLevel() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 point_id = 5; + * optional uint32 level = 10; * @return this */ - public UnlockSkilltreeScRsp clearPointId() { + public UnlockSkilltreeScRsp clearLevel() { bitField0_ &= ~0x00000002; - pointId = 0; + level = 0; return this; } /** - * optional uint32 point_id = 5; - * @return the pointId + * optional uint32 level = 10; + * @return the level */ - public int getPointId() { - return pointId; + public int getLevel() { + return level; } /** - * optional uint32 point_id = 5; - * @param value the pointId to set + * optional uint32 level = 10; + * @param value the level to set * @return this */ - public UnlockSkilltreeScRsp setPointId(final int value) { + public UnlockSkilltreeScRsp setLevel(final int value) { bitField0_ |= 0x00000002; - pointId = value; + level = value; return this; } /** - * optional uint32 level = 14; - * @return whether the level field is set + * optional uint32 base_avatar_id = 11; + * @return whether the baseAvatarId field is set */ - public boolean hasLevel() { + public boolean hasBaseAvatarId() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 level = 14; + * optional uint32 base_avatar_id = 11; * @return this */ - public UnlockSkilltreeScRsp clearLevel() { + public UnlockSkilltreeScRsp clearBaseAvatarId() { bitField0_ &= ~0x00000004; - level = 0; + baseAvatarId = 0; return this; } /** - * optional uint32 level = 14; - * @return the level + * optional uint32 base_avatar_id = 11; + * @return the baseAvatarId */ - public int getLevel() { - return level; + public int getBaseAvatarId() { + return baseAvatarId; } /** - * optional uint32 level = 14; - * @param value the level to set + * optional uint32 base_avatar_id = 11; + * @param value the baseAvatarId to set * @return this */ - public UnlockSkilltreeScRsp setLevel(final int value) { + public UnlockSkilltreeScRsp setBaseAvatarId(final int value) { bitField0_ |= 0x00000004; - level = value; + baseAvatarId = value; return this; } /** - * optional uint32 base_avatar_id = 15; - * @return whether the baseAvatarId field is set + * optional uint32 retcode = 14; + * @return whether the retcode field is set */ - public boolean hasBaseAvatarId() { + public boolean hasRetcode() { return (bitField0_ & 0x00000008) != 0; } /** - * optional uint32 base_avatar_id = 15; + * optional uint32 retcode = 14; * @return this */ - public UnlockSkilltreeScRsp clearBaseAvatarId() { + public UnlockSkilltreeScRsp clearRetcode() { bitField0_ &= ~0x00000008; - baseAvatarId = 0; + retcode = 0; return this; } /** - * optional uint32 base_avatar_id = 15; - * @return the baseAvatarId + * optional uint32 retcode = 14; + * @return the retcode */ - public int getBaseAvatarId() { - return baseAvatarId; + public int getRetcode() { + return retcode; } /** - * optional uint32 base_avatar_id = 15; - * @param value the baseAvatarId to set + * optional uint32 retcode = 14; + * @param value the retcode to set * @return this */ - public UnlockSkilltreeScRsp setBaseAvatarId(final int value) { + public UnlockSkilltreeScRsp setRetcode(final int value) { bitField0_ |= 0x00000008; - baseAvatarId = value; + retcode = value; return this; } @@ -201,10 +201,10 @@ public UnlockSkilltreeScRsp copyFrom(final UnlockSkilltreeScRsp other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - retcode = other.retcode; pointId = other.pointId; level = other.level; baseAvatarId = other.baseAvatarId; + retcode = other.retcode; } return this; } @@ -215,9 +215,6 @@ public UnlockSkilltreeScRsp mergeFrom(final UnlockSkilltreeScRsp other) { return this; } cachedSize = -1; - if (other.hasRetcode()) { - setRetcode(other.retcode); - } if (other.hasPointId()) { setPointId(other.pointId); } @@ -227,6 +224,9 @@ public UnlockSkilltreeScRsp mergeFrom(final UnlockSkilltreeScRsp other) { if (other.hasBaseAvatarId()) { setBaseAvatarId(other.baseAvatarId); } + if (other.hasRetcode()) { + setRetcode(other.retcode); + } return this; } @@ -237,10 +237,10 @@ public UnlockSkilltreeScRsp clear() { } cachedSize = -1; bitField0_ = 0; - retcode = 0; pointId = 0; level = 0; baseAvatarId = 0; + retcode = 0; return this; } @@ -264,29 +264,29 @@ public boolean equals(Object o) { } UnlockSkilltreeScRsp other = (UnlockSkilltreeScRsp) o; return bitField0_ == other.bitField0_ - && (!hasRetcode() || retcode == other.retcode) && (!hasPointId() || pointId == other.pointId) && (!hasLevel() || level == other.level) - && (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId); + && (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId) + && (!hasRetcode() || retcode == other.retcode); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); - output.writeUInt32NoTag(retcode); + output.writeRawByte((byte) 72); + output.writeUInt32NoTag(pointId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 40); - output.writeUInt32NoTag(pointId); + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(level); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 112); - output.writeUInt32NoTag(level); + output.writeRawByte((byte) 88); + output.writeUInt32NoTag(baseAvatarId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 120); - output.writeUInt32NoTag(baseAvatarId); + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(retcode); } } @@ -294,16 +294,16 @@ public void writeTo(final ProtoSink output) throws IOException { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(pointId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(pointId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(level); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(level); + size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } return size; } @@ -315,36 +315,36 @@ public UnlockSkilltreeScRsp mergeFrom(final ProtoSource input) throws IOExceptio int tag = input.readTag(); while (true) { switch (tag) { - case 32: { - // retcode - retcode = input.readUInt32(); + case 72: { + // pointId + pointId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 40) { + if (tag != 80) { break; } } - case 40: { - // pointId - pointId = input.readUInt32(); + case 80: { + // level + level = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 112) { + if (tag != 88) { break; } } - case 112: { - // level - level = input.readUInt32(); + case 88: { + // baseAvatarId + baseAvatarId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 120) { + if (tag != 112) { break; } } - case 120: { - // baseAvatarId - baseAvatarId = input.readUInt32(); + case 112: { + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); if (tag != 0) { @@ -369,16 +369,16 @@ public UnlockSkilltreeScRsp mergeFrom(final ProtoSource input) throws IOExceptio public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.pointId, pointId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.pointId, pointId); + output.writeUInt32(FieldNames.level, level); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.level, level); + output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId); + output.writeUInt32(FieldNames.retcode, retcode); } output.endObject(); } @@ -390,23 +390,12 @@ public UnlockSkilltreeScRsp mergeFrom(final JsonSource input) throws IOException } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { - if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); - bitField0_ |= 0x00000001; - } - } else { - input.skipUnknownField(); - } - break; - } case -400606517: case 466121258: { if (input.isAtField(FieldNames.pointId)) { if (!input.trySkipNullValue()) { pointId = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; } } else { input.skipUnknownField(); @@ -417,7 +406,7 @@ public UnlockSkilltreeScRsp mergeFrom(final JsonSource input) throws IOException if (input.isAtField(FieldNames.level)) { if (!input.trySkipNullValue()) { level = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; } } else { input.skipUnknownField(); @@ -429,6 +418,17 @@ public UnlockSkilltreeScRsp mergeFrom(final JsonSource input) throws IOException if (input.isAtField(FieldNames.baseAvatarId)) { if (!input.trySkipNullValue()) { baseAvatarId = input.readUInt32(); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { + if (!input.trySkipNullValue()) { + retcode = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -489,13 +489,13 @@ public UnlockSkilltreeScRsp create() { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName pointId = FieldName.forField("pointId", "point_id"); static final FieldName level = FieldName.forField("level"); static final FieldName baseAvatarId = FieldName.forField("baseAvatarId", "base_avatar_id"); + + static final FieldName retcode = FieldName.forField("retcode"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/UnlockedMusicOuterClass.java b/src/generated/main/emu/lunarcore/proto/UnlockedMusicOuterClass.java index 0b70bba38..0c6cbb8fa 100644 --- a/src/generated/main/emu/lunarcore/proto/UnlockedMusicOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/UnlockedMusicOuterClass.java @@ -19,17 +19,21 @@ public static final class UnlockedMusic extends ProtoMessage impl private static final long serialVersionUID = 0L; /** - * optional uint32 group_id = 9; + * optional uint32 id = 4; */ - private int groupId; + private int id; /** - * optional uint32 id = 13; + * optional uint32 group_id = 12; */ - private int id; + private int groupId; /** - * optional bool unkbool = 3; + * 
+     *  is_played
+     *
+ * + * optional bool unkbool = 15; */ private boolean unkbool; @@ -44,81 +48,85 @@ public static UnlockedMusic newInstance() { } /** - * optional uint32 group_id = 9; - * @return whether the groupId field is set + * optional uint32 id = 4; + * @return whether the id field is set */ - public boolean hasGroupId() { + public boolean hasId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 group_id = 9; + * optional uint32 id = 4; * @return this */ - public UnlockedMusic clearGroupId() { + public UnlockedMusic clearId() { bitField0_ &= ~0x00000001; - groupId = 0; + id = 0; return this; } /** - * optional uint32 group_id = 9; - * @return the groupId + * optional uint32 id = 4; + * @return the id */ - public int getGroupId() { - return groupId; + public int getId() { + return id; } /** - * optional uint32 group_id = 9; - * @param value the groupId to set + * optional uint32 id = 4; + * @param value the id to set * @return this */ - public UnlockedMusic setGroupId(final int value) { + public UnlockedMusic setId(final int value) { bitField0_ |= 0x00000001; - groupId = value; + id = value; return this; } /** - * optional uint32 id = 13; - * @return whether the id field is set + * optional uint32 group_id = 12; + * @return whether the groupId field is set */ - public boolean hasId() { + public boolean hasGroupId() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 id = 13; + * optional uint32 group_id = 12; * @return this */ - public UnlockedMusic clearId() { + public UnlockedMusic clearGroupId() { bitField0_ &= ~0x00000002; - id = 0; + groupId = 0; return this; } /** - * optional uint32 id = 13; - * @return the id + * optional uint32 group_id = 12; + * @return the groupId */ - public int getId() { - return id; + public int getGroupId() { + return groupId; } /** - * optional uint32 id = 13; - * @param value the id to set + * optional uint32 group_id = 12; + * @param value the groupId to set * @return this */ - public UnlockedMusic setId(final int value) { + public UnlockedMusic setGroupId(final int value) { bitField0_ |= 0x00000002; - id = value; + groupId = value; return this; } /** - * optional bool unkbool = 3; + * 
+     *  is_played
+     *
+ * + * optional bool unkbool = 15; * @return whether the unkbool field is set */ public boolean hasUnkbool() { @@ -126,7 +134,11 @@ public boolean hasUnkbool() { } /** - * optional bool unkbool = 3; + * 
+     *  is_played
+     *
+ * + * optional bool unkbool = 15; * @return this */ public UnlockedMusic clearUnkbool() { @@ -136,7 +148,11 @@ public UnlockedMusic clearUnkbool() { } /** - * optional bool unkbool = 3; + * 
+     *  is_played
+     *
+ * + * optional bool unkbool = 15; * @return the unkbool */ public boolean getUnkbool() { @@ -144,7 +160,11 @@ public boolean getUnkbool() { } /** - * optional bool unkbool = 3; + * 
+     *  is_played
+     *
+ * + * optional bool unkbool = 15; * @param value the unkbool to set * @return this */ @@ -159,8 +179,8 @@ public UnlockedMusic copyFrom(final UnlockedMusic other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - groupId = other.groupId; id = other.id; + groupId = other.groupId; unkbool = other.unkbool; } return this; @@ -172,12 +192,12 @@ public UnlockedMusic mergeFrom(final UnlockedMusic other) { return this; } cachedSize = -1; - if (other.hasGroupId()) { - setGroupId(other.groupId); - } if (other.hasId()) { setId(other.id); } + if (other.hasGroupId()) { + setGroupId(other.groupId); + } if (other.hasUnkbool()) { setUnkbool(other.unkbool); } @@ -191,8 +211,8 @@ public UnlockedMusic clear() { } cachedSize = -1; bitField0_ = 0; - groupId = 0; id = 0; + groupId = 0; unkbool = false; return this; } @@ -217,23 +237,23 @@ public boolean equals(Object o) { } UnlockedMusic other = (UnlockedMusic) o; return bitField0_ == other.bitField0_ - && (!hasGroupId() || groupId == other.groupId) && (!hasId() || id == other.id) + && (!hasGroupId() || groupId == other.groupId) && (!hasUnkbool() || unkbool == other.unkbool); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 72); - output.writeUInt32NoTag(groupId); + output.writeRawByte((byte) 32); + output.writeUInt32NoTag(id); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 104); - output.writeUInt32NoTag(id); + output.writeRawByte((byte) 96); + output.writeUInt32NoTag(groupId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 120); output.writeBoolNoTag(unkbool); } } @@ -242,10 +262,10 @@ public void writeTo(final ProtoSink output) throws IOException { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(groupId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(id); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(id); + size += 1 + ProtoSink.computeUInt32SizeNoTag(groupId); } if ((bitField0_ & 0x00000004) != 0) { size += 2; @@ -260,25 +280,25 @@ public UnlockedMusic mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 72: { - // groupId - groupId = input.readUInt32(); + case 32: { + // id + id = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 104) { + if (tag != 96) { break; } } - case 104: { - // id - id = input.readUInt32(); + case 96: { + // groupId + groupId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 24) { + if (tag != 120) { break; } } - case 24: { + case 120: { // unkbool unkbool = input.readBool(); bitField0_ |= 0x00000004; @@ -305,10 +325,10 @@ public UnlockedMusic mergeFrom(final ProtoSource input) throws IOException { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.groupId, groupId); + output.writeUInt32(FieldNames.id, id); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.id, id); + output.writeUInt32(FieldNames.groupId, groupId); } if ((bitField0_ & 0x00000004) != 0) { output.writeBool(FieldNames.unkbool, unkbool); @@ -323,11 +343,10 @@ public UnlockedMusic mergeFrom(final JsonSource input) throws IOException { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 293428218: - case 506361563: { - if (input.isAtField(FieldNames.groupId)) { + case 3355: { + if (input.isAtField(FieldNames.id)) { if (!input.trySkipNullValue()) { - groupId = input.readUInt32(); + id = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -335,10 +354,11 @@ public UnlockedMusic mergeFrom(final JsonSource input) throws IOException { } break; } - case 3355: { - if (input.isAtField(FieldNames.id)) { + case 293428218: + case 506361563: { + if (input.isAtField(FieldNames.groupId)) { if (!input.trySkipNullValue()) { - id = input.readUInt32(); + groupId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -409,10 +429,10 @@ public UnlockedMusic create() { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName groupId = FieldName.forField("groupId", "group_id"); - static final FieldName id = FieldName.forField("id"); + static final FieldName groupId = FieldName.forField("groupId", "group_id"); + static final FieldName unkbool = FieldName.forField("unkbool"); } } diff --git a/src/generated/main/emu/lunarcore/proto/UpdateEnergyScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/UpdateEnergyScNotifyOuterClass.java new file mode 100644 index 000000000..5cc4fd09c --- /dev/null +++ b/src/generated/main/emu/lunarcore/proto/UpdateEnergyScNotifyOuterClass.java @@ -0,0 +1,607 @@ +// Code generated by protocol buffer compiler. Do not edit! +package emu.lunarcore.proto; + +import java.io.IOException; +import us.hebi.quickbuf.FieldName; +import us.hebi.quickbuf.InvalidProtocolBufferException; +import us.hebi.quickbuf.JsonSink; +import us.hebi.quickbuf.JsonSource; +import us.hebi.quickbuf.MessageFactory; +import us.hebi.quickbuf.ProtoMessage; +import us.hebi.quickbuf.ProtoSink; +import us.hebi.quickbuf.ProtoSource; + +public final class UpdateEnergyScNotifyOuterClass { + /** + * Protobuf type {@code UpdateEnergyScNotify} + */ + public static final class UpdateEnergyScNotify extends ProtoMessage implements Cloneable { + private static final long serialVersionUID = 0L; + + /** + * optional .UpdateEnergyScNotify.EnergyInfo energy_info = 1; + */ + private final EnergyInfo energyInfo = EnergyInfo.newInstance(); + + private UpdateEnergyScNotify() { + } + + /** + * @return a new empty instance of {@code UpdateEnergyScNotify} + */ + public static UpdateEnergyScNotify newInstance() { + return new UpdateEnergyScNotify(); + } + + /** + * optional .UpdateEnergyScNotify.EnergyInfo energy_info = 1; + * @return whether the energyInfo field is set + */ + public boolean hasEnergyInfo() { + return (bitField0_ & 0x00000001) != 0; + } + + /** + * optional .UpdateEnergyScNotify.EnergyInfo energy_info = 1; + * @return this + */ + public UpdateEnergyScNotify clearEnergyInfo() { + bitField0_ &= ~0x00000001; + energyInfo.clear(); + return this; + } + + /** + * optional .UpdateEnergyScNotify.EnergyInfo energy_info = 1; + * + * This method returns the internal storage object without modifying any has state. + * The returned object should not be modified and be treated as read-only. + * + * Use {@link #getMutableEnergyInfo()} if you want to modify it. + * + * @return internal storage object for reading + */ + public EnergyInfo getEnergyInfo() { + return energyInfo; + } + + /** + * optional .UpdateEnergyScNotify.EnergyInfo energy_info = 1; + * + * This method returns the internal storage object and sets the corresponding + * has state. The returned object will become part of this message and its + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public EnergyInfo getMutableEnergyInfo() { + bitField0_ |= 0x00000001; + return energyInfo; + } + + /** + * optional .UpdateEnergyScNotify.EnergyInfo energy_info = 1; + * @param value the energyInfo to set + * @return this + */ + public UpdateEnergyScNotify setEnergyInfo(final EnergyInfo value) { + bitField0_ |= 0x00000001; + energyInfo.copyFrom(value); + return this; + } + + @Override + public UpdateEnergyScNotify copyFrom(final UpdateEnergyScNotify other) { + cachedSize = other.cachedSize; + if ((bitField0_ | other.bitField0_) != 0) { + bitField0_ = other.bitField0_; + energyInfo.copyFrom(other.energyInfo); + } + return this; + } + + @Override + public UpdateEnergyScNotify mergeFrom(final UpdateEnergyScNotify other) { + if (other.isEmpty()) { + return this; + } + cachedSize = -1; + if (other.hasEnergyInfo()) { + getMutableEnergyInfo().mergeFrom(other.energyInfo); + } + return this; + } + + @Override + public UpdateEnergyScNotify clear() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + energyInfo.clear(); + return this; + } + + @Override + public UpdateEnergyScNotify clearQuick() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + energyInfo.clearQuick(); + return this; + } + + @Override + public boolean equals(Object o) { + if (o == this) { + return true; + } + if (!(o instanceof UpdateEnergyScNotify)) { + return false; + } + UpdateEnergyScNotify other = (UpdateEnergyScNotify) o; + return bitField0_ == other.bitField0_ + && (!hasEnergyInfo() || energyInfo.equals(other.energyInfo)); + } + + @Override + public void writeTo(final ProtoSink output) throws IOException { + if ((bitField0_ & 0x00000001) != 0) { + output.writeRawByte((byte) 10); + output.writeMessageNoTag(energyInfo); + } + } + + @Override + protected int computeSerializedSize() { + int size = 0; + if ((bitField0_ & 0x00000001) != 0) { + size += 1 + ProtoSink.computeMessageSizeNoTag(energyInfo); + } + return size; + } + + @Override + @SuppressWarnings("fallthrough") + public UpdateEnergyScNotify mergeFrom(final ProtoSource input) throws IOException { + // Enabled Fall-Through Optimization (QuickBuffers) + int tag = input.readTag(); + while (true) { + switch (tag) { + case 10: { + // energyInfo + input.readMessage(energyInfo); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 0) { + break; + } + } + case 0: { + return this; + } + default: { + if (!input.skipField(tag)) { + return this; + } + tag = input.readTag(); + break; + } + } + } + } + + @Override + public void writeTo(final JsonSink output) throws IOException { + output.beginObject(); + if ((bitField0_ & 0x00000001) != 0) { + output.writeMessage(FieldNames.energyInfo, energyInfo); + } + output.endObject(); + } + + @Override + public UpdateEnergyScNotify mergeFrom(final JsonSource input) throws IOException { + if (!input.beginObject()) { + return this; + } + while (!input.isAtEnd()) { + switch (input.readFieldHash()) { + case 1464698710: + case -1818804219: { + if (input.isAtField(FieldNames.energyInfo)) { + if (!input.trySkipNullValue()) { + input.readMessage(energyInfo); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } + default: { + input.skipUnknownField(); + break; + } + } + } + input.endObject(); + return this; + } + + @Override + public UpdateEnergyScNotify clone() { + return new UpdateEnergyScNotify().copyFrom(this); + } + + @Override + public boolean isEmpty() { + return ((bitField0_) == 0); + } + + public static UpdateEnergyScNotify parseFrom(final byte[] data) throws + InvalidProtocolBufferException { + return ProtoMessage.mergeFrom(new UpdateEnergyScNotify(), data).checkInitialized(); + } + + public static UpdateEnergyScNotify parseFrom(final ProtoSource input) throws IOException { + return ProtoMessage.mergeFrom(new UpdateEnergyScNotify(), input).checkInitialized(); + } + + public static UpdateEnergyScNotify parseFrom(final JsonSource input) throws IOException { + return ProtoMessage.mergeFrom(new UpdateEnergyScNotify(), input).checkInitialized(); + } + + /** + * @return factory for creating UpdateEnergyScNotify messages + */ + public static MessageFactory getFactory() { + return UpdateEnergyScNotifyFactory.INSTANCE; + } + + /** + * Protobuf type {@code EnergyInfo} + */ + public static final class EnergyInfo extends ProtoMessage implements Cloneable { + private static final long serialVersionUID = 0L; + + /** + * optional uint32 cur_num = 3; + */ + private int curNum; + + /** + * optional uint32 max_num = 14; + */ + private int maxNum; + + private EnergyInfo() { + } + + /** + * @return a new empty instance of {@code EnergyInfo} + */ + public static EnergyInfo newInstance() { + return new EnergyInfo(); + } + + /** + * optional uint32 cur_num = 3; + * @return whether the curNum field is set + */ + public boolean hasCurNum() { + return (bitField0_ & 0x00000001) != 0; + } + + /** + * optional uint32 cur_num = 3; + * @return this + */ + public EnergyInfo clearCurNum() { + bitField0_ &= ~0x00000001; + curNum = 0; + return this; + } + + /** + * optional uint32 cur_num = 3; + * @return the curNum + */ + public int getCurNum() { + return curNum; + } + + /** + * optional uint32 cur_num = 3; + * @param value the curNum to set + * @return this + */ + public EnergyInfo setCurNum(final int value) { + bitField0_ |= 0x00000001; + curNum = value; + return this; + } + + /** + * optional uint32 max_num = 14; + * @return whether the maxNum field is set + */ + public boolean hasMaxNum() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 max_num = 14; + * @return this + */ + public EnergyInfo clearMaxNum() { + bitField0_ &= ~0x00000002; + maxNum = 0; + return this; + } + + /** + * optional uint32 max_num = 14; + * @return the maxNum + */ + public int getMaxNum() { + return maxNum; + } + + /** + * optional uint32 max_num = 14; + * @param value the maxNum to set + * @return this + */ + public EnergyInfo setMaxNum(final int value) { + bitField0_ |= 0x00000002; + maxNum = value; + return this; + } + + @Override + public EnergyInfo copyFrom(final EnergyInfo other) { + cachedSize = other.cachedSize; + if ((bitField0_ | other.bitField0_) != 0) { + bitField0_ = other.bitField0_; + curNum = other.curNum; + maxNum = other.maxNum; + } + return this; + } + + @Override + public EnergyInfo mergeFrom(final EnergyInfo other) { + if (other.isEmpty()) { + return this; + } + cachedSize = -1; + if (other.hasCurNum()) { + setCurNum(other.curNum); + } + if (other.hasMaxNum()) { + setMaxNum(other.maxNum); + } + return this; + } + + @Override + public EnergyInfo clear() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + curNum = 0; + maxNum = 0; + return this; + } + + @Override + public EnergyInfo clearQuick() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + return this; + } + + @Override + public boolean equals(Object o) { + if (o == this) { + return true; + } + if (!(o instanceof EnergyInfo)) { + return false; + } + EnergyInfo other = (EnergyInfo) o; + return bitField0_ == other.bitField0_ + && (!hasCurNum() || curNum == other.curNum) + && (!hasMaxNum() || maxNum == other.maxNum); + } + + @Override + public void writeTo(final ProtoSink output) throws IOException { + if ((bitField0_ & 0x00000001) != 0) { + output.writeRawByte((byte) 24); + output.writeUInt32NoTag(curNum); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(maxNum); + } + } + + @Override + protected int computeSerializedSize() { + int size = 0; + if ((bitField0_ & 0x00000001) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(curNum); + } + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(maxNum); + } + return size; + } + + @Override + @SuppressWarnings("fallthrough") + public EnergyInfo mergeFrom(final ProtoSource input) throws IOException { + // Enabled Fall-Through Optimization (QuickBuffers) + int tag = input.readTag(); + while (true) { + switch (tag) { + case 24: { + // curNum + curNum = input.readUInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 112) { + break; + } + } + case 112: { + // maxNum + maxNum = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 0) { + break; + } + } + case 0: { + return this; + } + default: { + if (!input.skipField(tag)) { + return this; + } + tag = input.readTag(); + break; + } + } + } + } + + @Override + public void writeTo(final JsonSink output) throws IOException { + output.beginObject(); + if ((bitField0_ & 0x00000001) != 0) { + output.writeUInt32(FieldNames.curNum, curNum); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeUInt32(FieldNames.maxNum, maxNum); + } + output.endObject(); + } + + @Override + public EnergyInfo mergeFrom(final JsonSource input) throws IOException { + if (!input.beginObject()) { + return this; + } + while (!input.isAtEnd()) { + switch (input.readFieldHash()) { + case -1349154522: + case 1126382855: { + if (input.isAtField(FieldNames.curNum)) { + if (!input.trySkipNullValue()) { + curNum = input.readUInt32(); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } + case -1081154686: + case 844443179: { + if (input.isAtField(FieldNames.maxNum)) { + if (!input.trySkipNullValue()) { + maxNum = input.readUInt32(); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + default: { + input.skipUnknownField(); + break; + } + } + } + input.endObject(); + return this; + } + + @Override + public EnergyInfo clone() { + return new EnergyInfo().copyFrom(this); + } + + @Override + public boolean isEmpty() { + return ((bitField0_) == 0); + } + + public static EnergyInfo parseFrom(final byte[] data) throws InvalidProtocolBufferException { + return ProtoMessage.mergeFrom(new EnergyInfo(), data).checkInitialized(); + } + + public static EnergyInfo parseFrom(final ProtoSource input) throws IOException { + return ProtoMessage.mergeFrom(new EnergyInfo(), input).checkInitialized(); + } + + public static EnergyInfo parseFrom(final JsonSource input) throws IOException { + return ProtoMessage.mergeFrom(new EnergyInfo(), input).checkInitialized(); + } + + /** + * @return factory for creating EnergyInfo messages + */ + public static MessageFactory getFactory() { + return EnergyInfoFactory.INSTANCE; + } + + private enum EnergyInfoFactory implements MessageFactory { + INSTANCE; + + @Override + public EnergyInfo create() { + return EnergyInfo.newInstance(); + } + } + + /** + * Contains name constants used for serializing JSON + */ + static class FieldNames { + static final FieldName curNum = FieldName.forField("curNum", "cur_num"); + + static final FieldName maxNum = FieldName.forField("maxNum", "max_num"); + } + } + + private enum UpdateEnergyScNotifyFactory implements MessageFactory { + INSTANCE; + + @Override + public UpdateEnergyScNotify create() { + return UpdateEnergyScNotify.newInstance(); + } + } + + /** + * Contains name constants used for serializing JSON + */ + static class FieldNames { + static final FieldName energyInfo = FieldName.forField("energyInfo", "energy_info"); + } + } +} diff --git a/src/generated/main/emu/lunarcore/proto/UseItemCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/UseItemCsReqOuterClass.java index b4ffb4136..61ba99d67 100644 --- a/src/generated/main/emu/lunarcore/proto/UseItemCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/UseItemCsReqOuterClass.java @@ -19,27 +19,27 @@ public static final class UseItemCsReq extends ProtoMessage implem private static final long serialVersionUID = 0L; /** - * optional uint32 use_item_count = 4; + * optional uint32 use_item_id = 2; */ - private int useItemCount; + private int useItemId; /** - * optional uint32 optional_reward_id = 5; + * optional uint32 use_item_count = 7; */ - private int optionalRewardId; + private int useItemCount; /** - * optional uint32 use_item_id = 11; + * optional uint32 base_avatar_id = 12; */ - private int useItemId; + private int baseAvatarId; /** - * optional uint32 base_avatar_id = 14; + * optional uint32 optional_reward_id = 15; */ - private int baseAvatarId; + private int optionalRewardId; /** - * optional .AvatarType use_avatar_type = 12; + * optional .AvatarType use_avatar_type = 14; */ private int useAvatarType; @@ -54,155 +54,155 @@ public static UseItemCsReq newInstance() { } /** - * optional uint32 use_item_count = 4; - * @return whether the useItemCount field is set + * optional uint32 use_item_id = 2; + * @return whether the useItemId field is set */ - public boolean hasUseItemCount() { + public boolean hasUseItemId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 use_item_count = 4; + * optional uint32 use_item_id = 2; * @return this */ - public UseItemCsReq clearUseItemCount() { + public UseItemCsReq clearUseItemId() { bitField0_ &= ~0x00000001; - useItemCount = 0; + useItemId = 0; return this; } /** - * optional uint32 use_item_count = 4; - * @return the useItemCount + * optional uint32 use_item_id = 2; + * @return the useItemId */ - public int getUseItemCount() { - return useItemCount; + public int getUseItemId() { + return useItemId; } /** - * optional uint32 use_item_count = 4; - * @param value the useItemCount to set + * optional uint32 use_item_id = 2; + * @param value the useItemId to set * @return this */ - public UseItemCsReq setUseItemCount(final int value) { + public UseItemCsReq setUseItemId(final int value) { bitField0_ |= 0x00000001; - useItemCount = value; + useItemId = value; return this; } /** - * optional uint32 optional_reward_id = 5; - * @return whether the optionalRewardId field is set + * optional uint32 use_item_count = 7; + * @return whether the useItemCount field is set */ - public boolean hasOptionalRewardId() { + public boolean hasUseItemCount() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 optional_reward_id = 5; + * optional uint32 use_item_count = 7; * @return this */ - public UseItemCsReq clearOptionalRewardId() { + public UseItemCsReq clearUseItemCount() { bitField0_ &= ~0x00000002; - optionalRewardId = 0; + useItemCount = 0; return this; } /** - * optional uint32 optional_reward_id = 5; - * @return the optionalRewardId + * optional uint32 use_item_count = 7; + * @return the useItemCount */ - public int getOptionalRewardId() { - return optionalRewardId; + public int getUseItemCount() { + return useItemCount; } /** - * optional uint32 optional_reward_id = 5; - * @param value the optionalRewardId to set + * optional uint32 use_item_count = 7; + * @param value the useItemCount to set * @return this */ - public UseItemCsReq setOptionalRewardId(final int value) { + public UseItemCsReq setUseItemCount(final int value) { bitField0_ |= 0x00000002; - optionalRewardId = value; + useItemCount = value; return this; } /** - * optional uint32 use_item_id = 11; - * @return whether the useItemId field is set + * optional uint32 base_avatar_id = 12; + * @return whether the baseAvatarId field is set */ - public boolean hasUseItemId() { + public boolean hasBaseAvatarId() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 use_item_id = 11; + * optional uint32 base_avatar_id = 12; * @return this */ - public UseItemCsReq clearUseItemId() { + public UseItemCsReq clearBaseAvatarId() { bitField0_ &= ~0x00000004; - useItemId = 0; + baseAvatarId = 0; return this; } /** - * optional uint32 use_item_id = 11; - * @return the useItemId + * optional uint32 base_avatar_id = 12; + * @return the baseAvatarId */ - public int getUseItemId() { - return useItemId; + public int getBaseAvatarId() { + return baseAvatarId; } /** - * optional uint32 use_item_id = 11; - * @param value the useItemId to set + * optional uint32 base_avatar_id = 12; + * @param value the baseAvatarId to set * @return this */ - public UseItemCsReq setUseItemId(final int value) { + public UseItemCsReq setBaseAvatarId(final int value) { bitField0_ |= 0x00000004; - useItemId = value; + baseAvatarId = value; return this; } /** - * optional uint32 base_avatar_id = 14; - * @return whether the baseAvatarId field is set + * optional uint32 optional_reward_id = 15; + * @return whether the optionalRewardId field is set */ - public boolean hasBaseAvatarId() { + public boolean hasOptionalRewardId() { return (bitField0_ & 0x00000008) != 0; } /** - * optional uint32 base_avatar_id = 14; + * optional uint32 optional_reward_id = 15; * @return this */ - public UseItemCsReq clearBaseAvatarId() { + public UseItemCsReq clearOptionalRewardId() { bitField0_ &= ~0x00000008; - baseAvatarId = 0; + optionalRewardId = 0; return this; } /** - * optional uint32 base_avatar_id = 14; - * @return the baseAvatarId + * optional uint32 optional_reward_id = 15; + * @return the optionalRewardId */ - public int getBaseAvatarId() { - return baseAvatarId; + public int getOptionalRewardId() { + return optionalRewardId; } /** - * optional uint32 base_avatar_id = 14; - * @param value the baseAvatarId to set + * optional uint32 optional_reward_id = 15; + * @param value the optionalRewardId to set * @return this */ - public UseItemCsReq setBaseAvatarId(final int value) { + public UseItemCsReq setOptionalRewardId(final int value) { bitField0_ |= 0x00000008; - baseAvatarId = value; + optionalRewardId = value; return this; } /** - * optional .AvatarType use_avatar_type = 12; + * optional .AvatarType use_avatar_type = 14; * @return whether the useAvatarType field is set */ public boolean hasUseAvatarType() { @@ -210,7 +210,7 @@ public boolean hasUseAvatarType() { } /** - * optional .AvatarType use_avatar_type = 12; + * optional .AvatarType use_avatar_type = 14; * @return this */ public UseItemCsReq clearUseAvatarType() { @@ -220,7 +220,7 @@ public UseItemCsReq clearUseAvatarType() { } /** - * optional .AvatarType use_avatar_type = 12; + * optional .AvatarType use_avatar_type = 14; * @return the useAvatarType */ public AvatarTypeOuterClass.AvatarType getUseAvatarType() { @@ -253,7 +253,7 @@ public UseItemCsReq setUseAvatarTypeValue(final int value) { } /** - * optional .AvatarType use_avatar_type = 12; + * optional .AvatarType use_avatar_type = 14; * @param value the useAvatarType to set * @return this */ @@ -268,10 +268,10 @@ public UseItemCsReq copyFrom(final UseItemCsReq other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - useItemCount = other.useItemCount; - optionalRewardId = other.optionalRewardId; useItemId = other.useItemId; + useItemCount = other.useItemCount; baseAvatarId = other.baseAvatarId; + optionalRewardId = other.optionalRewardId; useAvatarType = other.useAvatarType; } return this; @@ -283,18 +283,18 @@ public UseItemCsReq mergeFrom(final UseItemCsReq other) { return this; } cachedSize = -1; - if (other.hasUseItemCount()) { - setUseItemCount(other.useItemCount); - } - if (other.hasOptionalRewardId()) { - setOptionalRewardId(other.optionalRewardId); - } if (other.hasUseItemId()) { setUseItemId(other.useItemId); } + if (other.hasUseItemCount()) { + setUseItemCount(other.useItemCount); + } if (other.hasBaseAvatarId()) { setBaseAvatarId(other.baseAvatarId); } + if (other.hasOptionalRewardId()) { + setOptionalRewardId(other.optionalRewardId); + } if (other.hasUseAvatarType()) { setUseAvatarTypeValue(other.useAvatarType); } @@ -308,10 +308,10 @@ public UseItemCsReq clear() { } cachedSize = -1; bitField0_ = 0; - useItemCount = 0; - optionalRewardId = 0; useItemId = 0; + useItemCount = 0; baseAvatarId = 0; + optionalRewardId = 0; useAvatarType = 0; return this; } @@ -336,33 +336,33 @@ public boolean equals(Object o) { } UseItemCsReq other = (UseItemCsReq) o; return bitField0_ == other.bitField0_ - && (!hasUseItemCount() || useItemCount == other.useItemCount) - && (!hasOptionalRewardId() || optionalRewardId == other.optionalRewardId) && (!hasUseItemId() || useItemId == other.useItemId) + && (!hasUseItemCount() || useItemCount == other.useItemCount) && (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId) + && (!hasOptionalRewardId() || optionalRewardId == other.optionalRewardId) && (!hasUseAvatarType() || useAvatarType == other.useAvatarType); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); - output.writeUInt32NoTag(useItemCount); + output.writeRawByte((byte) 16); + output.writeUInt32NoTag(useItemId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 40); - output.writeUInt32NoTag(optionalRewardId); + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(useItemCount); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 88); - output.writeUInt32NoTag(useItemId); + output.writeRawByte((byte) 96); + output.writeUInt32NoTag(baseAvatarId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 112); - output.writeUInt32NoTag(baseAvatarId); + output.writeRawByte((byte) 120); + output.writeUInt32NoTag(optionalRewardId); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 112); output.writeEnumNoTag(useAvatarType); } } @@ -371,16 +371,16 @@ public void writeTo(final ProtoSink output) throws IOException { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(useItemCount); + size += 1 + ProtoSink.computeUInt32SizeNoTag(useItemId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(optionalRewardId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(useItemCount); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(useItemId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(optionalRewardId); } if ((bitField0_ & 0x00000010) != 0) { size += 1 + ProtoSink.computeEnumSizeNoTag(useAvatarType); @@ -395,43 +395,43 @@ public UseItemCsReq mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { - // useItemCount - useItemCount = input.readUInt32(); + case 16: { + // useItemId + useItemId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 40) { + if (tag != 56) { break; } } - case 40: { - // optionalRewardId - optionalRewardId = input.readUInt32(); + case 56: { + // useItemCount + useItemCount = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 88) { + if (tag != 96) { break; } } - case 88: { - // useItemId - useItemId = input.readUInt32(); + case 96: { + // baseAvatarId + baseAvatarId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 112) { + if (tag != 120) { break; } } - case 112: { - // baseAvatarId - baseAvatarId = input.readUInt32(); + case 120: { + // optionalRewardId + optionalRewardId = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 96) { + if (tag != 112) { break; } } - case 96: { + case 112: { // useAvatarType final int value = input.readInt32(); if (AvatarTypeOuterClass.AvatarType.forNumber(value) != null) { @@ -461,16 +461,16 @@ public UseItemCsReq mergeFrom(final ProtoSource input) throws IOException { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.useItemCount, useItemCount); + output.writeUInt32(FieldNames.useItemId, useItemId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.optionalRewardId, optionalRewardId); + output.writeUInt32(FieldNames.useItemCount, useItemCount); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.useItemId, useItemId); + output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId); + output.writeUInt32(FieldNames.optionalRewardId, optionalRewardId); } if ((bitField0_ & 0x00000010) != 0) { output.writeEnum(FieldNames.useAvatarType, useAvatarType, AvatarTypeOuterClass.AvatarType.converter()); @@ -485,11 +485,11 @@ public UseItemCsReq mergeFrom(final JsonSource input) throws IOException { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1104380939: - case 871430811: { - if (input.isAtField(FieldNames.useItemCount)) { + case -815318027: + case 1396027151: { + if (input.isAtField(FieldNames.useItemId)) { if (!input.trySkipNullValue()) { - useItemCount = input.readUInt32(); + useItemId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -497,11 +497,11 @@ public UseItemCsReq mergeFrom(final JsonSource input) throws IOException { } break; } - case -1391749078: - case -1451381236: { - if (input.isAtField(FieldNames.optionalRewardId)) { + case -1104380939: + case 871430811: { + if (input.isAtField(FieldNames.useItemCount)) { if (!input.trySkipNullValue()) { - optionalRewardId = input.readUInt32(); + useItemCount = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -509,11 +509,11 @@ public UseItemCsReq mergeFrom(final JsonSource input) throws IOException { } break; } - case -815318027: - case 1396027151: { - if (input.isAtField(FieldNames.useItemId)) { + case 118022725: + case -1756826157: { + if (input.isAtField(FieldNames.baseAvatarId)) { if (!input.trySkipNullValue()) { - useItemId = input.readUInt32(); + baseAvatarId = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -521,11 +521,11 @@ public UseItemCsReq mergeFrom(final JsonSource input) throws IOException { } break; } - case 118022725: - case -1756826157: { - if (input.isAtField(FieldNames.baseAvatarId)) { + case -1391749078: + case -1451381236: { + if (input.isAtField(FieldNames.optionalRewardId)) { if (!input.trySkipNullValue()) { - baseAvatarId = input.readUInt32(); + optionalRewardId = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -602,14 +602,14 @@ public UseItemCsReq create() { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName useItemCount = FieldName.forField("useItemCount", "use_item_count"); - - static final FieldName optionalRewardId = FieldName.forField("optionalRewardId", "optional_reward_id"); - static final FieldName useItemId = FieldName.forField("useItemId", "use_item_id"); + static final FieldName useItemCount = FieldName.forField("useItemCount", "use_item_count"); + static final FieldName baseAvatarId = FieldName.forField("baseAvatarId", "base_avatar_id"); + static final FieldName optionalRewardId = FieldName.forField("optionalRewardId", "optional_reward_id"); + static final FieldName useAvatarType = FieldName.forField("useAvatarType", "use_avatar_type"); } } diff --git a/src/generated/main/emu/lunarcore/proto/UseItemScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/UseItemScRspOuterClass.java index 10b84f6ec..dfcf2e346 100644 --- a/src/generated/main/emu/lunarcore/proto/UseItemScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/UseItemScRspOuterClass.java @@ -19,22 +19,22 @@ public static final class UseItemScRsp extends ProtoMessage implem private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 7; + * optional uint32 use_item_id = 8; */ - private int retcode; + private int useItemId; /** - * optional uint32 use_item_id = 11; + * optional uint32 retcode = 11; */ - private int useItemId; + private int retcode; /** - * optional uint32 use_item_count = 12; + * optional uint32 use_item_count = 15; */ private int useItemCount; /** - * optional .ItemList return_data = 1; + * optional .ItemList return_data = 9; */ private final ItemListOuterClass.ItemList returnData = ItemListOuterClass.ItemList.newInstance(); @@ -49,81 +49,81 @@ public static UseItemScRsp newInstance() { } /** - * optional uint32 retcode = 7; - * @return whether the retcode field is set + * optional uint32 use_item_id = 8; + * @return whether the useItemId field is set */ - public boolean hasRetcode() { + public boolean hasUseItemId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 retcode = 7; + * optional uint32 use_item_id = 8; * @return this */ - public UseItemScRsp clearRetcode() { + public UseItemScRsp clearUseItemId() { bitField0_ &= ~0x00000001; - retcode = 0; + useItemId = 0; return this; } /** - * optional uint32 retcode = 7; - * @return the retcode + * optional uint32 use_item_id = 8; + * @return the useItemId */ - public int getRetcode() { - return retcode; + public int getUseItemId() { + return useItemId; } /** - * optional uint32 retcode = 7; - * @param value the retcode to set + * optional uint32 use_item_id = 8; + * @param value the useItemId to set * @return this */ - public UseItemScRsp setRetcode(final int value) { + public UseItemScRsp setUseItemId(final int value) { bitField0_ |= 0x00000001; - retcode = value; + useItemId = value; return this; } /** - * optional uint32 use_item_id = 11; - * @return whether the useItemId field is set + * optional uint32 retcode = 11; + * @return whether the retcode field is set */ - public boolean hasUseItemId() { + public boolean hasRetcode() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 use_item_id = 11; + * optional uint32 retcode = 11; * @return this */ - public UseItemScRsp clearUseItemId() { + public UseItemScRsp clearRetcode() { bitField0_ &= ~0x00000002; - useItemId = 0; + retcode = 0; return this; } /** - * optional uint32 use_item_id = 11; - * @return the useItemId + * optional uint32 retcode = 11; + * @return the retcode */ - public int getUseItemId() { - return useItemId; + public int getRetcode() { + return retcode; } /** - * optional uint32 use_item_id = 11; - * @param value the useItemId to set + * optional uint32 retcode = 11; + * @param value the retcode to set * @return this */ - public UseItemScRsp setUseItemId(final int value) { + public UseItemScRsp setRetcode(final int value) { bitField0_ |= 0x00000002; - useItemId = value; + retcode = value; return this; } /** - * optional uint32 use_item_count = 12; + * optional uint32 use_item_count = 15; * @return whether the useItemCount field is set */ public boolean hasUseItemCount() { @@ -131,7 +131,7 @@ public boolean hasUseItemCount() { } /** - * optional uint32 use_item_count = 12; + * optional uint32 use_item_count = 15; * @return this */ public UseItemScRsp clearUseItemCount() { @@ -141,7 +141,7 @@ public UseItemScRsp clearUseItemCount() { } /** - * optional uint32 use_item_count = 12; + * optional uint32 use_item_count = 15; * @return the useItemCount */ public int getUseItemCount() { @@ -149,7 +149,7 @@ public int getUseItemCount() { } /** - * optional uint32 use_item_count = 12; + * optional uint32 use_item_count = 15; * @param value the useItemCount to set * @return this */ @@ -160,7 +160,7 @@ public UseItemScRsp setUseItemCount(final int value) { } /** - * optional .ItemList return_data = 1; + * optional .ItemList return_data = 9; * @return whether the returnData field is set */ public boolean hasReturnData() { @@ -168,7 +168,7 @@ public boolean hasReturnData() { } /** - * optional .ItemList return_data = 1; + * optional .ItemList return_data = 9; * @return this */ public UseItemScRsp clearReturnData() { @@ -178,7 +178,7 @@ public UseItemScRsp clearReturnData() { } /** - * optional .ItemList return_data = 1; + * optional .ItemList return_data = 9; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -192,7 +192,7 @@ public ItemListOuterClass.ItemList getReturnData() { } /** - * optional .ItemList return_data = 1; + * optional .ItemList return_data = 9; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -206,7 +206,7 @@ public ItemListOuterClass.ItemList getMutableReturnData() { } /** - * optional .ItemList return_data = 1; + * optional .ItemList return_data = 9; * @param value the returnData to set * @return this */ @@ -221,8 +221,8 @@ public UseItemScRsp copyFrom(final UseItemScRsp other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - retcode = other.retcode; useItemId = other.useItemId; + retcode = other.retcode; useItemCount = other.useItemCount; returnData.copyFrom(other.returnData); } @@ -235,12 +235,12 @@ public UseItemScRsp mergeFrom(final UseItemScRsp other) { return this; } cachedSize = -1; - if (other.hasRetcode()) { - setRetcode(other.retcode); - } if (other.hasUseItemId()) { setUseItemId(other.useItemId); } + if (other.hasRetcode()) { + setRetcode(other.retcode); + } if (other.hasUseItemCount()) { setUseItemCount(other.useItemCount); } @@ -257,8 +257,8 @@ public UseItemScRsp clear() { } cachedSize = -1; bitField0_ = 0; - retcode = 0; useItemId = 0; + retcode = 0; useItemCount = 0; returnData.clear(); return this; @@ -285,8 +285,8 @@ public boolean equals(Object o) { } UseItemScRsp other = (UseItemScRsp) o; return bitField0_ == other.bitField0_ - && (!hasRetcode() || retcode == other.retcode) && (!hasUseItemId() || useItemId == other.useItemId) + && (!hasRetcode() || retcode == other.retcode) && (!hasUseItemCount() || useItemCount == other.useItemCount) && (!hasReturnData() || returnData.equals(other.returnData)); } @@ -294,19 +294,19 @@ public boolean equals(Object o) { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 56); - output.writeUInt32NoTag(retcode); + output.writeRawByte((byte) 64); + output.writeUInt32NoTag(useItemId); } if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 88); - output.writeUInt32NoTag(useItemId); + output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(useItemCount); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 10); + output.writeRawByte((byte) 74); output.writeMessageNoTag(returnData); } } @@ -315,10 +315,10 @@ public void writeTo(final ProtoSink output) throws IOException { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(useItemId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(useItemId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(useItemCount); @@ -336,9 +336,9 @@ public UseItemScRsp mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { - // retcode - retcode = input.readUInt32(); + case 64: { + // useItemId + useItemId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 88) { @@ -346,24 +346,24 @@ public UseItemScRsp mergeFrom(final ProtoSource input) throws IOException { } } case 88: { - // useItemId - useItemId = input.readUInt32(); + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 96) { + if (tag != 120) { break; } } - case 96: { + case 120: { // useItemCount useItemCount = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 10) { + if (tag != 74) { break; } } - case 10: { + case 74: { // returnData input.readMessage(returnData); bitField0_ |= 0x00000008; @@ -390,10 +390,10 @@ public UseItemScRsp mergeFrom(final ProtoSource input) throws IOException { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.useItemId, useItemId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.useItemId, useItemId); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.useItemCount, useItemCount); @@ -411,10 +411,11 @@ public UseItemScRsp mergeFrom(final JsonSource input) throws IOException { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case -815318027: + case 1396027151: { + if (input.isAtField(FieldNames.useItemId)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + useItemId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -422,11 +423,10 @@ public UseItemScRsp mergeFrom(final JsonSource input) throws IOException { } break; } - case -815318027: - case 1396027151: { - if (input.isAtField(FieldNames.useItemId)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - useItemId = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -510,10 +510,10 @@ public UseItemScRsp create() { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName useItemId = FieldName.forField("useItemId", "use_item_id"); + static final FieldName retcode = FieldName.forField("retcode"); + static final FieldName useItemCount = FieldName.forField("useItemCount", "use_item_count"); static final FieldName returnData = FieldName.forField("returnData", "return_data"); diff --git a/src/generated/main/emu/lunarcore/proto/VectorOuterClass.java b/src/generated/main/emu/lunarcore/proto/VectorOuterClass.java index 728dd8841..bc91b1589 100644 --- a/src/generated/main/emu/lunarcore/proto/VectorOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/VectorOuterClass.java @@ -19,17 +19,17 @@ public static final class Vector extends ProtoMessage implements Cloneab private static final long serialVersionUID = 0L; /** - * optional sint32 z = 3; + * optional sint32 y = 2; */ - private int z; + private int y; /** - * optional sint32 y = 5; + * optional sint32 z = 11; */ - private int y; + private int z; /** - * optional sint32 x = 7; + * optional sint32 x = 12; */ private int x; @@ -44,81 +44,81 @@ public static Vector newInstance() { } /** - * optional sint32 z = 3; - * @return whether the z field is set + * optional sint32 y = 2; + * @return whether the y field is set */ - public boolean hasZ() { + public boolean hasY() { return (bitField0_ & 0x00000001) != 0; } /** - * optional sint32 z = 3; + * optional sint32 y = 2; * @return this */ - public Vector clearZ() { + public Vector clearY() { bitField0_ &= ~0x00000001; - z = 0; + y = 0; return this; } /** - * optional sint32 z = 3; - * @return the z + * optional sint32 y = 2; + * @return the y */ - public int getZ() { - return z; + public int getY() { + return y; } /** - * optional sint32 z = 3; - * @param value the z to set + * optional sint32 y = 2; + * @param value the y to set * @return this */ - public Vector setZ(final int value) { + public Vector setY(final int value) { bitField0_ |= 0x00000001; - z = value; + y = value; return this; } /** - * optional sint32 y = 5; - * @return whether the y field is set + * optional sint32 z = 11; + * @return whether the z field is set */ - public boolean hasY() { + public boolean hasZ() { return (bitField0_ & 0x00000002) != 0; } /** - * optional sint32 y = 5; + * optional sint32 z = 11; * @return this */ - public Vector clearY() { + public Vector clearZ() { bitField0_ &= ~0x00000002; - y = 0; + z = 0; return this; } /** - * optional sint32 y = 5; - * @return the y + * optional sint32 z = 11; + * @return the z */ - public int getY() { - return y; + public int getZ() { + return z; } /** - * optional sint32 y = 5; - * @param value the y to set + * optional sint32 z = 11; + * @param value the z to set * @return this */ - public Vector setY(final int value) { + public Vector setZ(final int value) { bitField0_ |= 0x00000002; - y = value; + z = value; return this; } /** - * optional sint32 x = 7; + * optional sint32 x = 12; * @return whether the x field is set */ public boolean hasX() { @@ -126,7 +126,7 @@ public boolean hasX() { } /** - * optional sint32 x = 7; + * optional sint32 x = 12; * @return this */ public Vector clearX() { @@ -136,7 +136,7 @@ public Vector clearX() { } /** - * optional sint32 x = 7; + * optional sint32 x = 12; * @return the x */ public int getX() { @@ -144,7 +144,7 @@ public int getX() { } /** - * optional sint32 x = 7; + * optional sint32 x = 12; * @param value the x to set * @return this */ @@ -159,8 +159,8 @@ public Vector copyFrom(final Vector other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - z = other.z; y = other.y; + z = other.z; x = other.x; } return this; @@ -172,12 +172,12 @@ public Vector mergeFrom(final Vector other) { return this; } cachedSize = -1; - if (other.hasZ()) { - setZ(other.z); - } if (other.hasY()) { setY(other.y); } + if (other.hasZ()) { + setZ(other.z); + } if (other.hasX()) { setX(other.x); } @@ -191,8 +191,8 @@ public Vector clear() { } cachedSize = -1; bitField0_ = 0; - z = 0; y = 0; + z = 0; x = 0; return this; } @@ -217,23 +217,23 @@ public boolean equals(Object o) { } Vector other = (Vector) o; return bitField0_ == other.bitField0_ - && (!hasZ() || z == other.z) && (!hasY() || y == other.y) + && (!hasZ() || z == other.z) && (!hasX() || x == other.x); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); - output.writeSInt32NoTag(z); + output.writeRawByte((byte) 16); + output.writeSInt32NoTag(y); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 40); - output.writeSInt32NoTag(y); + output.writeRawByte((byte) 88); + output.writeSInt32NoTag(z); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 96); output.writeSInt32NoTag(x); } } @@ -242,10 +242,10 @@ public void writeTo(final ProtoSink output) throws IOException { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeSInt32SizeNoTag(z); + size += 1 + ProtoSink.computeSInt32SizeNoTag(y); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeSInt32SizeNoTag(y); + size += 1 + ProtoSink.computeSInt32SizeNoTag(z); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeSInt32SizeNoTag(x); @@ -260,25 +260,25 @@ public Vector mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { - // z - z = input.readSInt32(); + case 16: { + // y + y = input.readSInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 40) { + if (tag != 88) { break; } } - case 40: { - // y - y = input.readSInt32(); + case 88: { + // z + z = input.readSInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 56) { + if (tag != 96) { break; } } - case 56: { + case 96: { // x x = input.readSInt32(); bitField0_ |= 0x00000004; @@ -305,10 +305,10 @@ public Vector mergeFrom(final ProtoSource input) throws IOException { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeSInt32(FieldNames.z, z); + output.writeSInt32(FieldNames.y, y); } if ((bitField0_ & 0x00000002) != 0) { - output.writeSInt32(FieldNames.y, y); + output.writeSInt32(FieldNames.z, z); } if ((bitField0_ & 0x00000004) != 0) { output.writeSInt32(FieldNames.x, x); @@ -323,10 +323,10 @@ public Vector mergeFrom(final JsonSource input) throws IOException { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 122: { - if (input.isAtField(FieldNames.z)) { + case 121: { + if (input.isAtField(FieldNames.y)) { if (!input.trySkipNullValue()) { - z = input.readSInt32(); + y = input.readSInt32(); bitField0_ |= 0x00000001; } } else { @@ -334,10 +334,10 @@ public Vector mergeFrom(final JsonSource input) throws IOException { } break; } - case 121: { - if (input.isAtField(FieldNames.y)) { + case 122: { + if (input.isAtField(FieldNames.z)) { if (!input.trySkipNullValue()) { - y = input.readSInt32(); + z = input.readSInt32(); bitField0_ |= 0x00000002; } } else { @@ -408,10 +408,10 @@ public Vector create() { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName z = FieldName.forField("z"); - static final FieldName y = FieldName.forField("y"); + static final FieldName z = FieldName.forField("z"); + static final FieldName x = FieldName.forField("x"); } } diff --git a/src/main/java/emu/lunarcore/Config.java b/src/main/java/emu/lunarcore/Config.java index 48a5da5f2..fc7aecb18 100644 --- a/src/main/java/emu/lunarcore/Config.java +++ b/src/main/java/emu/lunarcore/Config.java @@ -11,8 +11,6 @@ @Getter public class Config { - - public DatabaseInfo accountDatabase = new DatabaseInfo(); public DatabaseInfo gameDatabase = new DatabaseInfo(); public InternalMongoInfo internalMongoServer = new InternalMongoInfo(); diff --git a/src/main/java/emu/lunarcore/GameConstants.java b/src/main/java/emu/lunarcore/GameConstants.java index 3ecb19562..c1f1a8133 100644 --- a/src/main/java/emu/lunarcore/GameConstants.java +++ b/src/main/java/emu/lunarcore/GameConstants.java @@ -6,7 +6,7 @@ import emu.lunarcore.util.Position; public class GameConstants { - public static String VERSION = "1.6.0"; + public static String VERSION = "2.0.0"; public static final ZoneOffset CURRENT_ZONEOFFSET = ZoneOffset.systemDefault().getRules().getOffset(Instant.now()); public static final int CURRENT_TIMEZONE = CURRENT_ZONEOFFSET.getTotalSeconds() / 3600; @@ -54,7 +54,7 @@ public class GameConstants { public static final int CHALLENGE_STORY_ENTRANCE = 102020107; // Rogue - public static final boolean ENABLE_ROGUE = true; + public static final boolean ENABLE_ROGUE = false; public static final int ROGUE_ENTRANCE = 801120102; public static final int ROGUE_TALENT_POINT_ITEM_ID = 32; diff --git a/src/main/java/emu/lunarcore/data/GameDepot.java b/src/main/java/emu/lunarcore/data/GameDepot.java index 0176e2cd7..9264c170f 100644 --- a/src/main/java/emu/lunarcore/data/GameDepot.java +++ b/src/main/java/emu/lunarcore/data/GameDepot.java @@ -4,6 +4,7 @@ import java.util.List; import emu.lunarcore.GameConstants; +import emu.lunarcore.data.custom.ActivityScheduleData; import emu.lunarcore.data.excel.*; import emu.lunarcore.util.Utils; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; @@ -13,7 +14,7 @@ // Game data that is parsed by the server goes here public class GameDepot { // Activity - @Getter private static List activityScheduleExcels = new ArrayList<>(); + @Getter private static List activityScheduleExcels = new ArrayList<>(); // Exp @Getter private static List avatarExpExcels = new ArrayList<>(); diff --git a/src/main/java/emu/lunarcore/data/ResourceLoader.java b/src/main/java/emu/lunarcore/data/ResourceLoader.java index 959bd157f..f04bd9d22 100644 --- a/src/main/java/emu/lunarcore/data/ResourceLoader.java +++ b/src/main/java/emu/lunarcore/data/ResourceLoader.java @@ -7,7 +7,7 @@ import java.util.stream.Stream; import emu.lunarcore.data.config.*; -import emu.lunarcore.data.excel.ActivitySchedulingExcel; + import org.reflections.Reflections; import com.google.gson.Gson; @@ -20,6 +20,7 @@ import emu.lunarcore.data.ResourceDeserializers.LunarCoreDoubleDeserializer; import emu.lunarcore.data.ResourceDeserializers.LunarCoreHashDeserializer; import emu.lunarcore.data.config.FloorInfo.FloorGroupSimpleInfo; +import emu.lunarcore.data.custom.ActivityScheduleData; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; public class ResourceLoader { @@ -348,7 +349,7 @@ private static void loadActivityScheduleConfig() { if (!file.exists()) return; try (FileReader reader = new FileReader(file)) { - List activityScheduleConfig = gson.fromJson(reader, TypeToken.getParameterized(List.class, ActivitySchedulingExcel.class).getType()); + List activityScheduleConfig = gson.fromJson(reader, TypeToken.getParameterized(List.class, ActivityScheduleData.class).getType()); GameDepot.getActivityScheduleExcels().addAll(activityScheduleConfig); } catch (Exception e) { e.printStackTrace(); diff --git a/src/main/java/emu/lunarcore/data/config/FloorInfo.java b/src/main/java/emu/lunarcore/data/config/FloorInfo.java index 646954126..754e0fd15 100644 --- a/src/main/java/emu/lunarcore/data/config/FloorInfo.java +++ b/src/main/java/emu/lunarcore/data/config/FloorInfo.java @@ -71,6 +71,8 @@ public void onLoad() { // Hacky way to setup prop triggers if (json.contains("Maze_GroupProp_OpenTreasure_WhenMonsterDie")) { prop.setTrigger(new TriggerOpenTreasureWhenMonsterDie(group.getId())); + } else if (json.contains("Common_Console")) { + prop.setCommonConsole(true); } // Clear for garbage collection diff --git a/src/main/java/emu/lunarcore/data/config/PropInfo.java b/src/main/java/emu/lunarcore/data/config/PropInfo.java index 6964e6259..35dd35969 100644 --- a/src/main/java/emu/lunarcore/data/config/PropInfo.java +++ b/src/main/java/emu/lunarcore/data/config/PropInfo.java @@ -31,6 +31,7 @@ public class PropInfo extends ObjectInfo { @Setter private PropState State = PropState.Closed; @Setter private transient PropTrigger trigger; + @Setter private transient boolean isCommonConsole; @Override public Position getRot() { diff --git a/src/main/java/emu/lunarcore/data/config/SkillAbilityInfo.java b/src/main/java/emu/lunarcore/data/config/SkillAbilityInfo.java index 73873b8b8..3a1fae7d5 100644 --- a/src/main/java/emu/lunarcore/data/config/SkillAbilityInfo.java +++ b/src/main/java/emu/lunarcore/data/config/SkillAbilityInfo.java @@ -68,7 +68,7 @@ private void parseTask(MazeSkill skill, List actionList, TaskIn // TODO get sp increase value from params, also handle target alias actionList.add(new MazeSkillModifySP(50)); } else if (task.getType().contains("CreateSummonUnit")) { - // Ignored + skill.setTriggerBattle(false); } else if (task.getSuccessTaskList() != null) { for (TaskInfo t : task.getSuccessTaskList()) { parseTask(skill, actionList, t); diff --git a/src/main/java/emu/lunarcore/data/excel/ActivitySchedulingExcel.java b/src/main/java/emu/lunarcore/data/custom/ActivityScheduleData.java similarity index 59% rename from src/main/java/emu/lunarcore/data/excel/ActivitySchedulingExcel.java rename to src/main/java/emu/lunarcore/data/custom/ActivityScheduleData.java index 6743ce3e2..c0fb1faad 100644 --- a/src/main/java/emu/lunarcore/data/excel/ActivitySchedulingExcel.java +++ b/src/main/java/emu/lunarcore/data/custom/ActivityScheduleData.java @@ -1,11 +1,9 @@ -package emu.lunarcore.data.excel; +package emu.lunarcore.data.custom; import lombok.Getter; -import java.util.List; - @Getter -public class ActivitySchedulingExcel { +public class ActivityScheduleData { private int activityId; private long beginTime; private long endTime; diff --git a/src/main/java/emu/lunarcore/data/excel/RogueBuffGroupExcel.java b/src/main/java/emu/lunarcore/data/excel/RogueBuffGroupExcel.java index 8f0461136..943e76478 100644 --- a/src/main/java/emu/lunarcore/data/excel/RogueBuffGroupExcel.java +++ b/src/main/java/emu/lunarcore/data/excel/RogueBuffGroupExcel.java @@ -16,10 +16,10 @@ @Getter @ResourceType(name = {"RogueBuffGroup.json"}, loadPriority = LoadPriority.LOW) public class RogueBuffGroupExcel extends GameResource { - @SerializedName(value = "JHOKDPADHFM") + @SerializedName(value = "GJHLAKLLFDI") private int RogueBuffGroupID; // RogueBuffGroupID - @SerializedName(value = "ADJICNNJFEM") + @SerializedName(value = "DNKFBOAIDCE") private IntArrayList RogueBuffTagList; // RogueBuffTagList or RogueBuffGroupList private transient Set rogueBuffList = new HashSet<>(); diff --git a/src/main/java/emu/lunarcore/game/player/Player.java b/src/main/java/emu/lunarcore/game/player/Player.java index 16eaec24e..e29afba76 100644 --- a/src/main/java/emu/lunarcore/game/player/Player.java +++ b/src/main/java/emu/lunarcore/game/player/Player.java @@ -47,6 +47,7 @@ import emu.lunarcore.game.scene.SceneBuff; import emu.lunarcore.game.scene.entity.EntityProp; import emu.lunarcore.game.scene.entity.GameEntity; +import emu.lunarcore.proto.AssistSimpleInfoOuterClass.AssistSimpleInfo; import emu.lunarcore.proto.BoardDataSyncOuterClass.BoardDataSync; import emu.lunarcore.proto.FriendOnlineStatusOuterClass.FriendOnlineStatus; import emu.lunarcore.proto.HeadIconOuterClass.HeadIcon; @@ -54,7 +55,6 @@ import emu.lunarcore.proto.PlayerBasicInfoOuterClass.PlayerBasicInfo; import emu.lunarcore.proto.PlayerDetailInfoOuterClass.PlayerDetailInfo; import emu.lunarcore.proto.RogueVirtualItemInfoOuterClass.RogueVirtualItemInfo; -import emu.lunarcore.proto.SimpleAvatarInfoOuterClass.SimpleAvatarInfo; import emu.lunarcore.proto.SimpleInfoOuterClass.SimpleInfo; import emu.lunarcore.server.game.GameServer; import emu.lunarcore.server.game.GameSession; @@ -614,6 +614,14 @@ public EntityProp interactWithProp(int interactId, int propEntityId) { // Handle any extra interaction actions switch (prop.getExcel().getPropType()) { + case PROP_DESTRUCT -> { + if (prop.getState() == PropState.Closed) { + // Open chest + prop.setState(PropState.Open); + } else { + prop.setState(PropState.Closed); + } + } case PROP_TREASURE_CHEST -> { if (oldState == PropState.ChestClosed && newState == PropState.ChestUsed) { // Handle drops @@ -636,6 +644,15 @@ public EntityProp interactWithProp(int interactId, int propEntityId) { } } } + case PROP_ORDINARY -> { + if (prop.getPropInfo() != null && prop.getPropInfo().isCommonConsole()) { + // Set platform states + getScene().getEntitiesByGroup(EntityProp.class, prop.getGroupId()) + .stream() + .filter(p -> p.getExcel().getPropType() == PropType.PROP_PLATFORM) + .forEach(p -> p.setState(newState)); + } + } default -> { // Skip } @@ -926,7 +943,7 @@ public SimpleInfo toSimpleInfo() { .setOnlineStatus(this.isOnline() ? FriendOnlineStatus.FRIEND_ONLINE_STATUS_ONLINE : FriendOnlineStatus.FRIEND_ONLINE_STATUS_OFFLINE) .setPlatformType(PlatformType.PC) .setLastActiveTime(this.getLastActiveTime()) - .setSimpleAvatarInfo(SimpleAvatarInfo.newInstance().setAvatarId(GameConstants.TRAILBLAZER_AVATAR_ID).setLevel(1)) // TODO + .addAssistSimpleInfo(AssistSimpleInfo.newInstance().setAvatarId(GameConstants.TRAILBLAZER_AVATAR_ID).setLevel(1)) // TODO .setHeadIcon(this.getHeadIcon()); return proto; diff --git a/src/main/java/emu/lunarcore/game/rogue/RogueBuffSelectMenu.java b/src/main/java/emu/lunarcore/game/rogue/RogueBuffSelectMenu.java index 94db2e5f0..71507674c 100644 --- a/src/main/java/emu/lunarcore/game/rogue/RogueBuffSelectMenu.java +++ b/src/main/java/emu/lunarcore/game/rogue/RogueBuffSelectMenu.java @@ -10,7 +10,7 @@ import emu.lunarcore.data.excel.RogueBuffExcel; import emu.lunarcore.proto.ItemCostListOuterClass.ItemCostList; import emu.lunarcore.proto.ItemCostOuterClass.ItemCost; -import emu.lunarcore.proto.ItemCostOuterClass.PileItem; +import emu.lunarcore.proto.PileItemOuterClass.PileItem; import emu.lunarcore.proto.RogueCommonBuffSelectInfoOuterClass.RogueCommonBuffSelectInfo; import emu.lunarcore.util.WeightedList; import lombok.Getter; diff --git a/src/main/java/emu/lunarcore/game/rogue/RogueInstance.java b/src/main/java/emu/lunarcore/game/rogue/RogueInstance.java index 30723cc3a..46dcd0612 100644 --- a/src/main/java/emu/lunarcore/game/rogue/RogueInstance.java +++ b/src/main/java/emu/lunarcore/game/rogue/RogueInstance.java @@ -690,9 +690,9 @@ public RogueMiracleInfo toMiracleInfoProto() { public RogueAeon toAeonProto() { var proto = RogueAeon.newInstance() - .setAeonId(this.getAeonId()) - .setAeonEnhanceBuffNum(3) - .setIsUnlockAeon(true); + .setAeonId(this.getAeonId()); + //.setAeonEnhanceBuffNum(3) + //.setIsUnlockAeon(true); return proto; } diff --git a/src/main/java/emu/lunarcore/game/rogue/RogueManager.java b/src/main/java/emu/lunarcore/game/rogue/RogueManager.java index 9beca460b..b30d5d1f9 100644 --- a/src/main/java/emu/lunarcore/game/rogue/RogueManager.java +++ b/src/main/java/emu/lunarcore/game/rogue/RogueManager.java @@ -200,7 +200,7 @@ public RogueInfo toProto() { aeonInfo.addAeonIdList(aeonExcel.getAeonID()); } aeonInfo.setIsUnlocked(true); - aeonInfo.setUnlockAeonEnhanceNum(3); // guess + //aeonInfo.setUnlockAeonEnhanceNum(3); // guess } var data = RogueInfoData.newInstance() diff --git a/src/main/java/emu/lunarcore/server/packet/CmdId.java b/src/main/java/emu/lunarcore/server/packet/CmdId.java index 459f33507..16ee1b6a2 100644 --- a/src/main/java/emu/lunarcore/server/packet/CmdId.java +++ b/src/main/java/emu/lunarcore/server/packet/CmdId.java @@ -5,1046 +5,1144 @@ public class CmdId { public static final int NONE = 0; // Cmd Ids - public static final int SpringRecoverCsReq = 1471; - public static final int TakeTrainVisitorUntakenBehaviorRewardScRsp = 3738; - public static final int SelectChatBubbleScRsp = 5184; - public static final int GetEnhanceCommonRogueBuffInfoCsReq = 5659; - public static final int SubmitMonsterResearchActivityMaterialCsReq = 2620; - public static final int EnterAetherDivideSceneCsReq = 4883; - public static final int HeliobusActivityDataCsReq = 5883; - public static final int CommonRogueQueryScRsp = 5686; - public static final int GetRogueShopMiracleInfoCsReq = 5684; - public static final int ApplyFriendCsReq = 2942; - public static final int ComposeLimitNumUpdateNotify = 506; - public static final int GetCurAssistCsReq = 2977; - public static final int ChangeLineupLeaderCsReq = 764; - public static final int TrialActivityDataChangeScNotify = 2679; - public static final int AlleyGuaranteedFundsCsReq = 4777; - public static final int UpdateFeatureSwitchScNotify = 43; - public static final int FinishQuestCsReq = 938; - public static final int ChessRogueRollDiceScRsp = 5485; - public static final int GetAuthkeyScRsp = 73; - public static final int ActivateFarmElementCsReq = 1470; - public static final int StartAetherDivideChallengeBattleScRsp = 4819; - public static final int SetAetherDivideLineUpCsReq = 4855; - public static final int StartRogueScRsp = 1884; - public static final int UnlockAvatarSkinScNotify = 333; - public static final int SellItemCsReq = 520; - public static final int SwapLineupScRsp = 738; - public static final int TakeAllApRewardCsReq = 3360; - public static final int GetChallengeGroupStatisticsCsReq = 1773; - public static final int RetcodeNotify = 86; - public static final int FinishPerformSectionIdScRsp = 2738; - public static final int AetherDivideFinishChallengeScNotify = 4865; - public static final int SyncLineupNotify = 749; - public static final int UseItemScRsp = 519; - public static final int GetFarmStageGachaInfoCsReq = 1304; - public static final int UseTreasureDungeonItemScRsp = 4480; - public static final int AcceptMainMissionCsReq = 1224; - public static final int JoinLineupCsReq = 782; - public static final int DelSaveRaidScNotify = 2220; - public static final int InteractPropScRsp = 1484; - public static final int EnableRogueTalentCsReq = 1823; - public static final int CurTrialActivityScNotify = 2611; - public static final int UnlockPhoneThemeScNotify = 5119; - public static final int UpdateRogueAdventureRoomScoreScRsp = 5676; - public static final int NewAssistHistoryNotify = 2927; - public static final int AlleyShipUsedCountScNotify = 4778; - public static final int RecoverAllLineupCsReq = 1477; - public static final int HeliobusSnsPostScRsp = 5860; - public static final int SetNicknameCsReq = 92; - public static final int SharePunkLordMonsterCsReq = 3282; - public static final int GetChessRogueBuffEnhanceInfoScRsp = 5570; - public static final int AlleyPlacingGameCsReq = 4755; - public static final int TakeRogueEventHandbookRewardCsReq = 5618; - public static final int GetPlayerReturnMultiDropInfoScRsp = 4682; - public static final int MuseumTakeCollectRewardCsReq = 4365; - public static final int GetActivityScheduleConfigCsReq = 2682; - public static final int DeleteSummonUnitCsReq = 1447; - public static final int RefreshAlleyOrderScRsp = 4745; - public static final int FinishChessRogueSubStoryScRsp = 5406; - public static final int GetCurSceneInfoScRsp = 1419; - public static final int GetFightActivityDataScRsp = 3661; - public static final int QuitBattleCsReq = 104; - public static final int FinishFirstTalkNpcScRsp = 2119; - public static final int StartCocoonStageScRsp = 1427; - public static final int BattleLogReportScRsp = 149; - public static final int TreasureDungeonFinishScNotify = 4461; - public static final int ChessRogueEnterScRsp = 5595; - public static final int SetMissionEventProgressCsReq = 1246; - public static final int TreasureDungeonDataScNotify = 4483; - public static final int StrongChallengeActivityBattleEndScNotify = 6682; - public static final int StartAlleyEventCsReq = 4742; - public static final int ChessRogueCellUpdateNotify = 5469; - public static final int QuestRecordScNotify = 997; - public static final int BuyRogueShopMiracleCsReq = 5619; - public static final int EnterRogueEndlessActivityStageScRsp = 6084; - public static final int StartAetherDivideStageBattleCsReq = 4859; - public static final int GetLoginActivityCsReq = 2683; - public static final int UpdateServerPrefsDataCsReq = 6182; - public static final int StartBoxingClubBattleScRsp = 4260; - public static final int ChessRogueUpdateReviveInfoScNotify = 5562; - public static final int GetWaypointCsReq = 483; - public static final int ReturnLastTownScRsp = 1480; - public static final int LeaveRogueScRsp = 1819; - public static final int FinishTutorialGuideCsReq = 1649; - public static final int SpaceZooExchangeItemScRsp = 6755; - public static final int SetSpringRecoverConfigScRsp = 1444; - public static final int GetAlleyInfoCsReq = 4783; - public static final int GetAllSaveRaidScRsp = 2245; - public static final int FightTreasureDungeonMonsterScRsp = 4445; - public static final int FinishCosumeItemMissionCsReq = 1255; - public static final int ExchangeStaminaScRsp = 40; + public static final int SpringRecoverCsReq = 1472; + public static final int TakeTrainVisitorUntakenBehaviorRewardScRsp = 3746; + public static final int FinishEmotionDialoguePerformanceScRsp = 6334; + public static final int SelectChatBubbleScRsp = 5197; + public static final int GetEnhanceCommonRogueBuffInfoCsReq = 5650; + public static final int SubmitMonsterResearchActivityMaterialCsReq = 2698; + public static final int EnterAetherDivideSceneCsReq = 4807; + public static final int HeliobusActivityDataCsReq = 5807; + public static final int CommonRogueQueryScRsp = 5627; + public static final int GetRogueShopMiracleInfoCsReq = 5697; + public static final int ApplyFriendCsReq = 2971; + public static final int GetHeartDialInfoScRsp = 6357; + public static final int ComposeLimitNumUpdateNotify = 510; + public static final int GetCurAssistCsReq = 2917; + public static final int TakeRollShopRewardCsReq = 6903; + public static final int RelicRecommendScRsp = 530; + public static final int ChangeLineupLeaderCsReq = 789; + public static final int TrialActivityDataChangeScNotify = 2678; + public static final int AlleyGuaranteedFundsCsReq = 4717; + public static final int UpdateFeatureSwitchScNotify = 75; + public static final int FinishQuestCsReq = 946; + public static final int ChessRogueRollDiceScRsp = 5454; + public static final int GetAuthkeyScRsp = 39; + public static final int ActivateFarmElementCsReq = 1430; + public static final int StartAetherDivideChallengeBattleScRsp = 4834; + public static final int SetAetherDivideLineUpCsReq = 4823; + public static final int StartRogueScRsp = 1897; + public static final int UnlockAvatarSkinScNotify = 312; + public static final int SellItemCsReq = 598; + public static final int SwapLineupScRsp = 746; + public static final int TakeAllApRewardCsReq = 3319; + public static final int GetChallengeGroupStatisticsCsReq = 1739; + public static final int RetcodeNotify = 27; + public static final int FinishPerformSectionIdScRsp = 2746; + public static final int AetherDivideFinishChallengeScNotify = 4895; + public static final int SyncLineupNotify = 773; + public static final int UseItemScRsp = 534; + public static final int GetFarmStageGachaInfoCsReq = 1316; + public static final int UseTreasureDungeonItemScRsp = 4465; + public static final int AcceptMainMissionCsReq = 1254; + public static final int GetWolfBroGameDataCsReq = 6600; + public static final int JoinLineupCsReq = 704; + public static final int DelSaveRaidScNotify = 2298; + public static final int InteractPropScRsp = 1497; + public static final int EnableRogueTalentCsReq = 1849; + public static final int CurTrialActivityScNotify = 2621; + public static final int UnlockPhoneThemeScNotify = 5134; + public static final int SubmitEmotionItemScRsp = 6319; + public static final int UpdateRogueAdventureRoomScoreScRsp = 5688; + public static final int NewAssistHistoryNotify = 2905; + public static final int AlleyShipUsedCountScNotify = 4724; + public static final int RecoverAllLineupCsReq = 1417; + public static final int HeliobusSnsPostScRsp = 5819; + public static final int SetNicknameCsReq = 60; + public static final int SharePunkLordMonsterCsReq = 3204; + public static final int GetChessRogueBuffEnhanceInfoScRsp = 5579; + public static final int AlleyPlacingGameCsReq = 4723; + public static final int TakeRogueEventHandbookRewardCsReq = 5613; + public static final int GetPlayerReturnMultiDropInfoScRsp = 4604; + public static final int MuseumTakeCollectRewardCsReq = 4395; + public static final int GetActivityScheduleConfigCsReq = 2604; + public static final int DeleteSummonUnitCsReq = 1487; + public static final int RefreshAlleyOrderScRsp = 4726; + public static final int FinishChessRogueSubStoryScRsp = 5476; + public static final int GetCurSceneInfoScRsp = 1434; + public static final int GetFightActivityDataScRsp = 3657; + public static final int QuitBattleCsReq = 116; + public static final int FinishFirstTalkNpcScRsp = 2134; + public static final int StartCocoonStageScRsp = 1405; + public static final int BattleLogReportScRsp = 173; + public static final int TreasureDungeonFinishScNotify = 4457; + public static final int ChessRogueEnterScRsp = 5527; + public static final int SetMissionEventProgressCsReq = 1253; + public static final int TreasureDungeonDataScNotify = 4407; + public static final int StrongChallengeActivityBattleEndScNotify = 6604; + public static final int StartAlleyEventCsReq = 4771; + public static final int ChessRogueCellUpdateNotify = 5493; + public static final int QuestRecordScNotify = 1000; + public static final int BuyRogueShopMiracleCsReq = 5634; + public static final int EnterRogueEndlessActivityStageScRsp = 6097; + public static final int StartAetherDivideStageBattleCsReq = 4850; + public static final int GetLoginActivityCsReq = 2607; + public static final int UpdateServerPrefsDataCsReq = 6104; + public static final int StartBoxingClubBattleScRsp = 4219; + public static final int GetStoryLineInfoCsReq = 6207; + public static final int ChessRogueUpdateReviveInfoScNotify = 5570; + public static final int GetWaypointCsReq = 407; + public static final int ReturnLastTownScRsp = 1465; + public static final int SubmitOfferingItemCsReq = 6940; + public static final int LeaveRogueScRsp = 1834; + public static final int FinishTutorialGuideCsReq = 1673; + public static final int SpaceZooExchangeItemScRsp = 6723; + public static final int SetSpringRecoverConfigScRsp = 1436; + public static final int TravelBrochureSetPageDescStatusScRsp = 6426; + public static final int GetAlleyInfoCsReq = 4707; + public static final int GetAllSaveRaidScRsp = 2226; + public static final int FightTreasureDungeonMonsterScRsp = 4426; + public static final int FinishCosumeItemMissionCsReq = 1223; + public static final int ExchangeStaminaScRsp = 81; public static final int ChessRogueNousDiceSurfaceUnlockNotify = 5520; - public static final int FinishChapterScNotify = 4904; - public static final int GetPunkLordBattleRecordScRsp = 3277; - public static final int GetShopListScRsp = 1561; - public static final int LogisticsScoreRewardSyncInfoScNotify = 4756; - public static final int GetStageLineupScRsp = 761; - public static final int LockRelicCsReq = 573; - public static final int EnterSceneCsReq = 1417; - public static final int SetClientPausedCsReq = 1422; - public static final int PlayerLogoutCsReq = 4; - public static final int SpaceZooMutateCsReq = 6782; - public static final int BattlePassInfoNotify = 3083; - public static final int ReserveStaminaExchangeScRsp = 81; - public static final int MarkItemCsReq = 553; - public static final int StartFinishMainMissionScNotify = 1206; - public static final int FinishAeonDialogueGroupCsReq = 1821; - public static final int HeliobusSnsUpdateScNotify = 5849; - public static final int UpdateFloorSavedValueNotify = 1491; - public static final int TrainVisitorBehaviorFinishScRsp = 3761; - public static final int LockEquipmentCsReq = 582; - public static final int AetherDivideTainerInfoScNotify = 4887; - public static final int TextJoinBatchSaveCsReq = 3882; - public static final int ExpUpRelicScRsp = 552; - public static final int AlleyShipUnlockScNotify = 4708; - public static final int DeactivateFarmElementScRsp = 1425; - public static final int ChessRogueEnterNextLayerScRsp = 5448; - public static final int SyncRogueFinishScNotify = 1840; - public static final int HeliobusSnsReadCsReq = 5804; - public static final int ChessRogueNousEditDiceCsReq = 5437; - public static final int LeaveTrialActivityScRsp = 2658; - public static final int SetGameplayBirthdayScRsp = 71; - public static final int GroupStateChangeScNotify = 1466; - public static final int SetSignatureCsReq = 2838; - public static final int EquipAetherDividePassiveSkillCsReq = 4840; - public static final int GetLevelRewardTakenListCsReq = 80; - public static final int SetLanguageScRsp = 87; - public static final int InteractTreasureDungeonGridScRsp = 4492; - public static final int GetRndOptionCsReq = 3483; - public static final int ChessRogueNousDiceUpdateNotify = 5537; - public static final int TakeQuestRewardCsReq = 904; - public static final int ChessRoguePickAvatarScRsp = 5453; - public static final int LeaveAetherDivideSceneScRsp = 4884; - public static final int MuseumRandomEventStartScNotify = 4320; - public static final int RemoveStuffFromAreaScRsp = 4319; - public static final int SetGenderScRsp = 56; - public static final int BoxingClubChallengeUpdateScNotify = 4238; - public static final int SyncRogueCommonVirtualItemInfoScNotify = 5667; - public static final int GetBasicInfoScRsp = 67; - public static final int AetherDivideSpiritExpUpCsReq = 4890; - public static final int GetFirstTalkByPerformanceNpcScRsp = 2109; - public static final int TrainRefreshTimeNotify = 3782; - public static final int ChooseBoxingClubStageOptionalBuffScRsp = 4252; - public static final int TakeCityShopRewardScRsp = 1560; - public static final int ChessRogueUpdateUnlockLevelScNotify = 5592; - public static final int ReviveRogueAvatarCsReq = 1820; - public static final int SetTurnFoodSwitchScRsp = 522; - public static final int SceneEntityMoveScNotify = 1449; - public static final int TakeTrialActivityRewardScRsp = 2651; - public static final int ClientObjDownloadDataScNotify = 10; - public static final int ExchangeHcoinScRsp = 590; - public static final int DressAvatarSkinCsReq = 380; - public static final int QueryProductInfoCsReq = 16; - public static final int TakeChallengeRaidRewardScRsp = 2297; - public static final int GetReplayTokenCsReq = 3583; - public static final int ChessRogueNousEnableRogueTalentScRsp = 5580; - public static final int EnhanceCommonRogueBuffCsReq = 5690; - public static final int EnterStrongChallengeActivityStageScRsp = 6684; - public static final int PromoteEquipmentScRsp = 584; - public static final int RankUpAvatarScRsp = 340; - public static final int SceneEntityMoveScRsp = 1461; - public static final int AlleyEventEffectNotify = 4738; - public static final int GetCurBattleInfoScRsp = 160; - public static final int TriggerVoiceCsReq = 4155; - public static final int GameplayCounterUpdateScNotify = 1454; - public static final int ChessRogueUpdateDicePassiveAccumulateValueScNotify = 5567; - public static final int GiveUpBoxingClubChallengeScRsp = 4219; - public static final int AcceptedPamMissionExpireScRsp = 4061; - public static final int RegionStopScNotify = 45; - public static final int TakeRogueEndlessActivityPointRewardScRsp = 6042; - public static final int GetChessRogueStoryAeonTalkInfoCsReq = 5472; - public static final int DailyTaskDataScNotify = 1219; - public static final int BuyNpcStuffScRsp = 4384; - public static final int GetMissionDataCsReq = 1283; - public static final int GetFriendApplyListInfoCsReq = 2982; - public static final int GetUnlockTeleportCsReq = 1481; - public static final int ChessRogueFinishCurRoomNotify = 5587; - public static final int TextJoinQueryCsReq = 3804; - public static final int LeaveChallengeScRsp = 1760; - public static final int TakeRogueAeonLevelRewardCsReq = 1874; - public static final int SummonPunkLordMonsterScRsp = 3219; - public static final int SetGroupCustomSaveDataScRsp = 1413; - public static final int SwitchLineupIndexCsReq = 752; - public static final int FinishItemIdCsReq = 2782; - public static final int MuseumRandomEventSelectCsReq = 4380; - public static final int PlayerGetTokenScRsp = 60; - public static final int RefreshTriggerByClientCsReq = 1407; - public static final int EnterTreasureDungeonScRsp = 4464; - public static final int GetQuestRecordScRsp = 919; - public static final int RogueModifierUpdateNotify = 5319; - public static final int CommonRogueUpdateScNotify = 5651; - public static final int MissionGroupWarnScNotify = 1209; - public static final int GetEnteredSceneScRsp = 1421; - public static final int SyncTaskScRsp = 1242; - public static final int PlayerReturnTakeRewardScRsp = 4519; - public static final int PickRogueAvatarScRsp = 1873; - public static final int ComposeItemCsReq = 555; - public static final int SyncRogueRewardInfoScNotify = 1829; - public static final int UnlockHeadIconScNotify = 2897; - public static final int SyncHandleFriendScNotify = 2909; - public static final int GetGachaInfoCsReq = 1983; - public static final int RogueModifierSelectCellScRsp = 5382; - public static final int HeliobusUpgradeLevelScRsp = 5864; - public static final int TakeLoginActivityRewardScRsp = 2684; - public static final int PVEBattleResultCsReq = 183; - public static final int QuitBattleScNotify = 197; - public static final int TakeOffRelicCsReq = 345; - public static final int StartRaidScRsp = 2261; - public static final int RogueModifierStageStartNotify = 5338; - public static final int SetHeroBasicTypeCsReq = 24; - public static final int ComposeSelectedRelicCsReq = 546; - public static final int GetTutorialGuideScRsp = 1684; - public static final int GetTreasureDungeonActivityDataScRsp = 4409; - public static final int GetPlayerBoardDataScRsp = 2861; - public static final int EntityBindPropScRsp = 1456; - public static final int GetExpeditionDataCsReq = 2583; - public static final int AlleyTakeEventRewardScRsp = 4703; - public static final int TakeMailAttachmentScRsp = 819; - public static final int SetDisplayAvatarCsReq = 2882; - public static final int ChessRogueQueryAeonDimensionsScRsp = 5523; - public static final int HeliobusSnsLikeCsReq = 5842; - public static final int ScenePlaneEventScNotify = 1462; - public static final int MatchBoxingClubOpponentScRsp = 4284; - public static final int CurAssistChangedNotify = 2922; - public static final int PlayerReturnTakePointRewardCsReq = 4582; - public static final int ChessRogueSelectBpCsReq = 5597; - public static final int AceAntiCheaterScRsp = 89; - public static final int GetAllLineupDataCsReq = 792; - public static final int TakeFightActivityRewardCsReq = 3660; - public static final int MultipleDropInfoNotify = 4660; - public static final int GetPunkLordDataCsReq = 3252; - public static final int UnlockTutorialGuideScRsp = 1619; - public static final int WaypointShowNewCsNotify = 442; - public static final int AlleyShopLevelScNotify = 4746; - public static final int EnterSceneByServerScNotify = 1448; - public static final int GeneralVirtualItemDataNotify = 514; - public static final int DeleteFriendScRsp = 2964; - public static final int GetTutorialScRsp = 1661; - public static final int PlayerGetTokenCsReq = 82; - public static final int GiveUpBoxingClubChallengeCsReq = 4242; - public static final int SwitchAetherDivideLineUpSlotScRsp = 4892; - public static final int HeliobusEnterBattleCsReq = 5892; - public static final int FinishCurTurnCsReq = 4349; - public static final int TakeRogueScoreRewardScRsp = 1880; - public static final int GetFriendRecommendListInfoScRsp = 2992; - public static final int PlayerReturnSignCsReq = 4561; - public static final int GetFriendLoginInfoCsReq = 2916; - public static final int GetFriendListInfoScRsp = 2961; - public static final int BoxingClubRewardScNotify = 4297; - public static final int GetQuestDataCsReq = 983; - public static final int PlayerReturnInfoQueryScRsp = 4538; - public static final int PlayerReturnStartScNotify = 4583; - public static final int ChallengeLineupNotify = 1709; - public static final int ExchangeRogueBuffWithMiracleScRsp = 5692; - public static final int UpdateMechanismBarScNotify = 1451; - public static final int UpdatePlayerSettingCsReq = 99; - public static final int GetAssistHistoryScRsp = 2903; - public static final int PlayBackGroundMusicCsReq = 3104; - public static final int StartBattleCollegeScRsp = 5782; - public static final int LeaveAetherDivideSceneCsReq = 4804; - public static final int SyncRogueCommonPendingActionScNotify = 5670; - public static final int MarkReadMailScRsp = 884; - public static final int GetRogueDialogueEventDataScRsp = 1871; - public static final int MarkChatEmojiScRsp = 3909; - public static final int GetServerPrefsDataCsReq = 6104; - public static final int GetSecretKeyInfoCsReq = 35; - public static final int ChessRogueSelectCellScRsp = 5532; - public static final int GetTrainVisitorBehaviorScRsp = 3784; - public static final int SelectInclinationTextScRsp = 2138; - public static final int SetIsDisplayAvatarInfoScRsp = 2819; - public static final int GetRogueInitialScoreCsReq = 1814; - public static final int LeaveChallengeCsReq = 1782; - public static final int BuyBpLevelScRsp = 3042; - public static final int AcceptMissionEventScRsp = 1220; - public static final int GetQuestRecordCsReq = 942; - public static final int StartTimedCocoonStageCsReq = 1405; - public static final int EnterRogueScRsp = 1860; - public static final int LastSpringRefreshTimeNotify = 1492; - public static final int LogisticsDetonateStarSkiffScRsp = 4793; - public static final int TakeOffEquipmentCsReq = 349; - public static final int GetRogueBuffEnhanceInfoScRsp = 1846; - public static final int EnhanceChessRogueBuffCsReq = 5455; - public static final int CancelCacheNotifyScRsp = 4138; - public static final int SendMsgCsReq = 3983; - public static final int SwitchLineupIndexScRsp = 773; - public static final int ChessRogueUpdateBoardScNotify = 5499; - public static final int GetQuestDataScRsp = 961; - public static final int BuyNpcStuffCsReq = 4304; - public static final int TakeRogueScoreRewardCsReq = 1859; - public static final int CancelActivityExpeditionCsReq = 2509; - public static final int HeliobusEnterBattleScRsp = 5859; - public static final int GetLevelRewardTakenListScRsp = 90; - public static final int SetHeadIconScRsp = 2884; - public static final int AcceptExpeditionCsReq = 2504; - public static final int HandleRogueCommonPendingActionCsReq = 5679; - public static final int LogisticsInfoScNotify = 4765; - public static final int DailyFirstMeetPamScRsp = 3484; - public static final int ChessRogueQuestFinishNotify = 5490; - public static final int RechargeSuccNotify = 559; - public static final int SyncRogueMapRoomScNotify = 1816; - public static final int SetCurWaypointCsReq = 404; - public static final int ChessRogueUpdateAllowedSelectCellScNotify = 5444; - public static final int SceneEntityTeleportCsReq = 1426; - public static final int ChessRogueCheatRollScRsp = 5542; - public static final int UnlockTutorialScRsp = 1660; - public static final int UnlockTeleportNotify = 1429; - public static final int SetFriendRemarkNameScRsp = 2980; - public static final int GetFriendListInfoCsReq = 2983; - public static final int ExchangeHcoinCsReq = 580; - public static final int HeliobusLineupUpdateScNotify = 5808; - public static final int ChessRogueQueryBpCsReq = 5558; - public static final int TakeChapterRewardCsReq = 419; - public static final int SelectPhoneThemeScRsp = 5142; - public static final int SyncRoguePickAvatarInfoScNotify = 1875; - public static final int TakeRogueMiracleHandbookRewardScRsp = 5614; - public static final int GetSaveLogisticsMapCsReq = 4706; - public static final int StartChallengeScRsp = 1784; - public static final int PVEBattleResultScRsp = 161; - public static final int UpdateRedDotDataCsReq = 5904; - public static final int FinishPlotCsReq = 1183; - public static final int BuyGoodsScRsp = 1584; - public static final int BuyRogueShopBuffCsReq = 5638; - public static final int ExpeditionDataChangeScNotify = 2597; - public static final int FinishTutorialCsReq = 1697; - public static final int GroupStateChangeScRsp = 1412; - public static final int SyncRogueReviveInfoScNotify = 1824; - public static final int HeliobusUpgradeLevelCsReq = 5855; - public static final int HeliobusSelectSkillCsReq = 5852; - public static final int PlayerKickOutScNotify = 97; - public static final int FinishFirstTalkByPerformanceNpcScRsp = 2164; - public static final int SyncClientResVersionCsReq = 142; - public static final int SceneUpdatePositionVersionNotify = 1409; - public static final int TrainVisitorRewardSendNotify = 3760; - public static final int GetMarkItemListCsReq = 577; + public static final int FinishChapterScNotify = 4916; + public static final int GetPunkLordBattleRecordScRsp = 3217; + public static final int GetShopListScRsp = 1557; + public static final int LogisticsScoreRewardSyncInfoScNotify = 4708; + public static final int GetStageLineupScRsp = 757; + public static final int GetTelevisionActivityDataCsReq = 6965; + public static final int LockRelicCsReq = 539; + public static final int EnterSceneCsReq = 1422; + public static final int SetClientPausedCsReq = 1411; + public static final int PlayerLogoutCsReq = 16; + public static final int SpaceZooMutateCsReq = 6704; + public static final int BattlePassInfoNotify = 3007; + public static final int ReserveStaminaExchangeScRsp = 63; + public static final int MarkItemCsReq = 555; + public static final int StartFinishMainMissionScNotify = 1210; + public static final int FinishAeonDialogueGroupCsReq = 1882; + public static final int HeliobusSnsUpdateScNotify = 5873; + public static final int UpdateFloorSavedValueNotify = 1474; + public static final int TrainVisitorBehaviorFinishScRsp = 3757; + public static final int LockEquipmentCsReq = 504; + public static final int AetherDivideTainerInfoScNotify = 4879; + public static final int TextJoinBatchSaveCsReq = 3804; + public static final int ExpUpRelicScRsp = 518; + public static final int AlleyShipUnlockScNotify = 4776; + public static final int DeactivateFarmElementScRsp = 1438; + public static final int ChessRogueEnterNextLayerScRsp = 5443; + public static final int SyncRogueFinishScNotify = 1881; + public static final int HeliobusSnsReadCsReq = 5816; + public static final int ChessRogueNousEditDiceCsReq = 5407; + public static final int LeaveTrialActivityScRsp = 2633; + public static final int SetGameplayBirthdayScRsp = 72; + public static final int GroupStateChangeScNotify = 1425; + public static final int SetSignatureCsReq = 2846; + public static final int EquipAetherDividePassiveSkillCsReq = 4881; + public static final int SetLanguageScRsp = 79; + public static final int GetLevelRewardTakenListCsReq = 65; + public static final int InteractTreasureDungeonGridScRsp = 4460; + public static final int GetRndOptionCsReq = 3407; + public static final int ChessRogueNousDiceUpdateNotify = 5409; + public static final int TakeQuestRewardCsReq = 916; + public static final int TravelBrochureSelectMessageCsReq = 6404; + public static final int ChessRoguePickAvatarScRsp = 5541; + public static final int LeaveAetherDivideSceneScRsp = 4897; + public static final int MuseumRandomEventStartScNotify = 4398; + public static final int UpdateTrackMainMissionIdCsReq = 1205; + public static final int RemoveStuffFromAreaScRsp = 4334; + public static final int SetGenderScRsp = 8; + public static final int BoxingClubChallengeUpdateScNotify = 4246; + public static final int SyncRogueCommonVirtualItemInfoScNotify = 5637; + public static final int GetBasicInfoScRsp = 37; + public static final int AetherDivideSpiritExpUpCsReq = 4851; + public static final int GetFirstTalkByPerformanceNpcScRsp = 2106; + public static final int TrainRefreshTimeNotify = 3704; + public static final int ChooseBoxingClubStageOptionalBuffScRsp = 4218; + public static final int TakeCityShopRewardScRsp = 1519; + public static final int ChessRogueUpdateUnlockLevelScNotify = 5545; + public static final int ReviveRogueAvatarCsReq = 1898; + public static final int SetTurnFoodSwitchScRsp = 511; + public static final int SceneEntityMoveScNotify = 1473; + public static final int LeaveMapRotationRegionCsReq = 6900; + public static final int TakeTrialActivityRewardScRsp = 2635; + public static final int ClientObjDownloadDataScNotify = 69; + public static final int ExchangeHcoinScRsp = 551; + public static final int DressAvatarSkinCsReq = 365; + public static final int QueryProductInfoCsReq = 90; + public static final int TakeChallengeRaidRewardScRsp = 2300; + public static final int GetReplayTokenCsReq = 3507; + public static final int DoGachaInRollShopCsReq = 6920; + public static final int ChessRogueNousEnableRogueTalentScRsp = 5515; + public static final int EnhanceCommonRogueBuffCsReq = 5651; + public static final int EnterStrongChallengeActivityStageScRsp = 6697; + public static final int GetMapRotationDataCsReq = 6873; + public static final int PromoteEquipmentScRsp = 597; + public static final int RaidCollectionDataScNotify = 6960; + public static final int RankUpAvatarScRsp = 381; + public static final int SceneEntityMoveScRsp = 1457; + public static final int AlleyEventEffectNotify = 4746; + public static final int GetCurBattleInfoScRsp = 119; + public static final int ChangeStoryLineCsReq = 6297; + public static final int TriggerVoiceCsReq = 4123; + public static final int GameplayCounterUpdateScNotify = 1401; + public static final int ChessRogueUpdateDicePassiveAccumulateValueScNotify = 5420; + public static final int GiveUpBoxingClubChallengeScRsp = 4234; + public static final int AcceptedPamMissionExpireScRsp = 4057; + public static final int RegionStopScNotify = 26; + public static final int TakeRogueEndlessActivityPointRewardScRsp = 6071; + public static final int GetChessRogueStoryAeonTalkInfoCsReq = 5593; + public static final int DailyTaskDataScNotify = 1234; + public static final int BuyNpcStuffScRsp = 4397; + public static final int GetMissionDataCsReq = 1207; + public static final int GetFriendApplyListInfoCsReq = 2904; + public static final int GetUnlockTeleportCsReq = 1463; + public static final int ChessRogueFinishCurRoomNotify = 5429; + public static final int TextJoinQueryCsReq = 3816; + public static final int RotateMapScRsp = 6834; + public static final int LeaveChallengeScRsp = 1719; + public static final int TakeRogueAeonLevelRewardCsReq = 1829; + public static final int SummonPunkLordMonsterScRsp = 3234; + public static final int LeaveMapRotationRegionScNotify = 6881; + public static final int SetGroupCustomSaveDataScRsp = 1445; + public static final int SwitchLineupIndexCsReq = 718; + public static final int FinishItemIdCsReq = 2704; + public static final int MuseumRandomEventSelectCsReq = 4365; + public static final int PlayerGetTokenScRsp = 19; + public static final int RefreshTriggerByClientCsReq = 1456; + public static final int EnterTreasureDungeonScRsp = 4489; + public static final int GetQuestRecordScRsp = 934; + public static final int RogueModifierUpdateNotify = 5334; + public static final int RestoreWolfBroGameArchiveCsReq = 6504; + public static final int CommonRogueUpdateScNotify = 5635; + public static final int MissionGroupWarnScNotify = 1206; + public static final int GetEnteredSceneScRsp = 1482; + public static final int ArchiveWolfBroGameScRsp = 6597; + public static final int SyncTaskScRsp = 1271; + public static final int PlayerReturnTakeRewardScRsp = 4534; + public static final int PickRogueAvatarScRsp = 1839; + public static final int ComposeItemCsReq = 523; + public static final int SetFriendMarkCsReq = 2988; + public static final int SyncRogueRewardInfoScNotify = 1832; + public static final int UnlockHeadIconScNotify = 2900; + public static final int SyncHandleFriendScNotify = 2906; + public static final int GetGachaInfoCsReq = 1907; + public static final int RogueModifierSelectCellScRsp = 5304; + public static final int HeliobusUpgradeLevelScRsp = 5889; + public static final int TakeLoginActivityRewardScRsp = 2697; + public static final int PVEBattleResultCsReq = 107; + public static final int QuitBattleScNotify = 200; + public static final int TakeOffRelicCsReq = 326; + public static final int StartRaidScRsp = 2257; + public static final int RogueModifierStageStartNotify = 5346; + public static final int SetHeroBasicTypeCsReq = 54; + public static final int ComposeSelectedRelicCsReq = 553; + public static final int GetTutorialGuideScRsp = 1697; + public static final int GetFriendAssistListScRsp = 2936; + public static final int GetTreasureDungeonActivityDataScRsp = 4406; + public static final int InteractChargerCsReq = 6816; + public static final int GetPlayerBoardDataScRsp = 2857; + public static final int EntityBindPropScRsp = 1408; + public static final int GetExpeditionDataCsReq = 2507; + public static final int AlleyTakeEventRewardScRsp = 4715; + public static final int TakeMailAttachmentScRsp = 834; + public static final int SetDisplayAvatarCsReq = 2804; + public static final int ChessRogueQueryAeonDimensionsScRsp = 5492; + public static final int HeliobusSnsLikeCsReq = 5871; + public static final int TravelBrochureSetCustomValueScRsp = 6418; + public static final int ScenePlaneEventScNotify = 1499; + public static final int MatchBoxingClubOpponentScRsp = 4297; + public static final int CurAssistChangedNotify = 2911; + public static final int ArchiveWolfBroGameCsReq = 6516; + public static final int PlayerReturnTakePointRewardCsReq = 4504; + public static final int ChessRogueSelectBpCsReq = 5524; + public static final int DeployRotaterCsReq = 6804; + public static final int AceAntiCheaterScRsp = 52; + public static final int GetAllLineupDataCsReq = 760; + public static final int TakeFightActivityRewardCsReq = 3619; + public static final int MultipleDropInfoNotify = 4619; + public static final int GetPunkLordDataCsReq = 3218; + public static final int UnlockTutorialGuideScRsp = 1634; + public static final int WaypointShowNewCsNotify = 471; + public static final int AlleyShopLevelScNotify = 4753; + public static final int EnterSceneByServerScNotify = 1492; + public static final int GeneralVirtualItemDataNotify = 502; + public static final int DeleteFriendScRsp = 2989; + public static final int GetTutorialScRsp = 1657; + public static final int PlayerGetTokenCsReq = 4; + public static final int TravelBrochureGetDataScRsp = 6457; + public static final int GiveUpBoxingClubChallengeCsReq = 4271; + public static final int SwitchAetherDivideLineUpSlotScRsp = 4860; + public static final int HeliobusEnterBattleCsReq = 5860; + public static final int FinishCurTurnCsReq = 4373; + public static final int TakeRogueScoreRewardScRsp = 1865; + public static final int GetFriendRecommendListInfoScRsp = 2960; + public static final int PlayerReturnSignCsReq = 4557; + public static final int GetFriendLoginInfoCsReq = 2990; + public static final int GetFriendListInfoScRsp = 2957; + public static final int BoxingClubRewardScNotify = 4300; + public static final int GetQuestDataCsReq = 907; + public static final int PlayerReturnInfoQueryScRsp = 4546; + public static final int PlayerReturnStartScNotify = 4507; + public static final int ChallengeLineupNotify = 1706; + public static final int ExchangeRogueBuffWithMiracleScRsp = 5660; + public static final int UpdateMechanismBarScNotify = 1435; + public static final int UpdatePlayerSettingCsReq = 67; + public static final int UpdateTrackMainMissionIdScRsp = 1243; + public static final int GetAssistHistoryScRsp = 2915; + public static final int PlayBackGroundMusicCsReq = 3116; + public static final int StartBattleCollegeScRsp = 5704; + public static final int ChangeScriptEmotionScRsp = 6397; + public static final int LeaveAetherDivideSceneCsReq = 4816; + public static final int SyncRogueCommonPendingActionScNotify = 5630; + public static final int MarkReadMailScRsp = 897; + public static final int GetRogueDialogueEventDataScRsp = 1872; + public static final int MarkChatEmojiScRsp = 3906; + public static final int GetServerPrefsDataCsReq = 6116; + public static final int GetSecretKeyInfoCsReq = 48; + public static final int ChessRogueSelectCellScRsp = 5474; + public static final int GetTrainVisitorBehaviorScRsp = 3797; + public static final int SelectInclinationTextScRsp = 2146; + public static final int SetIsDisplayAvatarInfoScRsp = 2834; + public static final int GetRogueInitialScoreCsReq = 1802; + public static final int LeaveChallengeCsReq = 1704; + public static final int BuyBpLevelScRsp = 3071; + public static final int AcceptMissionEventScRsp = 1298; + public static final int GetQuestRecordCsReq = 971; + public static final int StartTimedCocoonStageCsReq = 1431; + public static final int EnterRogueScRsp = 1819; + public static final int LastSpringRefreshTimeNotify = 1460; + public static final int LogisticsDetonateStarSkiffScRsp = 4743; + public static final int TakeOffEquipmentCsReq = 373; + public static final int GetRogueBuffEnhanceInfoScRsp = 1853; + public static final int EnhanceChessRogueBuffCsReq = 5472; + public static final int CancelCacheNotifyScRsp = 4146; + public static final int SendMsgCsReq = 3907; + public static final int SwitchLineupIndexScRsp = 739; + public static final int StoryLineInfoScNotify = 6216; + public static final int ChessRogueUpdateBoardScNotify = 5572; + public static final int GetQuestDataScRsp = 957; + public static final int BuyNpcStuffCsReq = 4316; + public static final int TakeRogueScoreRewardCsReq = 1850; + public static final int CancelActivityExpeditionCsReq = 2506; + public static final int HeliobusEnterBattleScRsp = 5850; + public static final int GetLevelRewardTakenListScRsp = 51; + public static final int SetHeadIconScRsp = 2897; + public static final int AcceptExpeditionCsReq = 2516; + public static final int HandleRogueCommonPendingActionCsReq = 5678; + public static final int LogisticsInfoScNotify = 4795; + public static final int DailyFirstMeetPamScRsp = 3497; + public static final int ChessRogueQuestFinishNotify = 5510; + public static final int RechargeSuccNotify = 550; + public static final int SyncRogueMapRoomScNotify = 1890; + public static final int SetCurWaypointCsReq = 416; + public static final int ChessRogueUpdateAllowedSelectCellScNotify = 5566; + public static final int SceneEntityTeleportCsReq = 1462; + public static final int TravelBrochureUpdatePasterPosScRsp = 6406; + public static final int ChessRogueCheatRollScRsp = 5586; + public static final int UnlockTutorialScRsp = 1619; + public static final int UnlockTeleportNotify = 1432; + public static final int SetFriendRemarkNameScRsp = 2965; + public static final int GetFriendListInfoCsReq = 2907; + public static final int HeartDialScriptChangeScNotify = 6400; + public static final int ExchangeHcoinCsReq = 565; + public static final int HeliobusLineupUpdateScNotify = 5876; + public static final int ChessRogueQueryBpCsReq = 5422; + public static final int TakeChapterRewardCsReq = 434; + public static final int SelectPhoneThemeScRsp = 5171; + public static final int SyncRoguePickAvatarInfoScNotify = 1884; + public static final int TakeRogueMiracleHandbookRewardScRsp = 5602; + public static final int DoGachaInRollShopScRsp = 6902; + public static final int GetSaveLogisticsMapCsReq = 4710; + public static final int StartChallengeScRsp = 1797; + public static final int PVEBattleResultScRsp = 157; + public static final int UpdateRedDotDataCsReq = 5916; + public static final int FinishPlotCsReq = 1107; + public static final int BuyGoodsScRsp = 1597; + public static final int BuyRogueShopBuffCsReq = 5646; + public static final int SubmitOrigamiItemCsReq = 4181; + public static final int ExpeditionDataChangeScNotify = 2600; + public static final int GetTelevisionActivityDataScRsp = 6961; + public static final int FinishTutorialCsReq = 1700; + public static final int WolfBroGameDataChangeScNotify = 6573; + public static final int GroupStateChangeScRsp = 1447; + public static final int SyncRogueReviveInfoScNotify = 1854; + public static final int HeliobusUpgradeLevelCsReq = 5823; + public static final int HeliobusSelectSkillCsReq = 5818; + public static final int PlayerKickOutScNotify = 100; + public static final int FinishFirstTalkByPerformanceNpcScRsp = 2189; + public static final int SyncClientResVersionCsReq = 171; + public static final int SceneUpdatePositionVersionNotify = 1406; + public static final int EnterTelevisionActivityStageScRsp = 6963; + public static final int TrainVisitorRewardSendNotify = 3719; + public static final int GetMarkItemListCsReq = 517; public static final int AetherDivideRefreshEndlessScRsp = 4894; - public static final int EnterTrialActivityStageScRsp = 2685; - public static final int ChessRogueSkipTeachingLevelScRsp = 5539; - public static final int EntityBindPropCsReq = 1493; - public static final int GetMultipleDropInfoCsReq = 4683; - public static final int GetDailyActiveInfoCsReq = 3304; - public static final int GetPhoneDataCsReq = 5183; - public static final int SpaceZooExchangeItemCsReq = 6709; - public static final int ChessRogueReRollDiceCsReq = 5581; - public static final int PlayerHeartBeatScRsp = 98; - public static final int SecurityReportScRsp = 4109; - public static final int GetPrivateChatHistoryCsReq = 3982; - public static final int PlayerReturnTakeRewardCsReq = 4542; - public static final int GetSingleRedDotParamGroupScRsp = 5960; - public static final int RankUpAvatarCsReq = 364; - public static final int GameplayCounterCountDownScRsp = 1402; - public static final int GetRogueHandbookDataCsReq = 5627; - public static final int SceneCastSkillScRsp = 1460; - public static final int ChessRogueGoAheadScRsp = 5525; - public static final int ChessRogueChangeyAeonDimensionNotify = 5550; - public static final int ChessRogueNousGetRogueTalentInfoCsReq = 5596; - public static final int GetTutorialCsReq = 1683; - public static final int GetArchiveDataScRsp = 2361; - public static final int SyncAddBlacklistScNotify = 2945; - public static final int AlleyTakeEventRewardCsReq = 4753; - public static final int ExchangeRogueRewardKeyCsReq = 1851; - public static final int ChessRogueGiveUpCsReq = 5477; - public static final int ChessRogueQuitCsReq = 5415; - public static final int QueryProductInfoScRsp = 25; - public static final int StartTimedFarmElementScRsp = 1469; - public static final int ReplaceLineupCsReq = 790; - public static final int GetTrainVisitorRegisterCsReq = 3742; - public static final int SetBoxingClubResonanceLineupCsReq = 4255; - public static final int GetAllRedDotDataCsReq = 5983; - public static final int UseItemCsReq = 542; - public static final int ShareScRsp = 4161; - public static final int StartTrialActivityCsReq = 2698; - public static final int GetStrongChallengeActivityDataCsReq = 6683; - public static final int TakeAllApRewardScRsp = 3342; - public static final int GetTrialActivityDataScRsp = 2671; - public static final int GetChessRogueBuffEnhanceInfoCsReq = 5552; - public static final int GetFriendApplyListInfoScRsp = 2960; - public static final int GetPlayerBoardDataCsReq = 2883; - public static final int UnlockSkilltreeCsReq = 382; - public static final int TakeAllRewardCsReq = 3019; - public static final int ChessRogueQueryAeonDimensionsCsReq = 5530; - public static final int PunkLordMonsterInfoScNotify = 3240; - public static final int NewMailScNotify = 897; - public static final int ChessRogueStartScRsp = 5589; - public static final int GetRogueInfoScRsp = 1861; - public static final int RogueModifierSelectCellCsReq = 5384; - public static final int LogisticsGameScRsp = 4784; - public static final int TakePromotionRewardCsReq = 392; - public static final int ShowNewSupplementVisitorCsReq = 3749; - public static final int GetAssistListCsReq = 2987; - public static final int EnterAdventureCsReq = 1383; - public static final int GetAetherDivideInfoScRsp = 4809; + public static final int ServerSimulateBattleFinishScNotify = 106; + public static final int EnterTrialActivityStageScRsp = 2642; + public static final int ChessRogueSkipTeachingLevelScRsp = 5411; + public static final int EntityBindPropCsReq = 1443; + public static final int GetMultipleDropInfoCsReq = 4607; + public static final int GetDailyActiveInfoCsReq = 3316; + public static final int GetPhoneDataCsReq = 5107; + public static final int SpaceZooExchangeItemCsReq = 6706; + public static final int ChessRogueReRollDiceCsReq = 5419; + public static final int PlayerHeartBeatScRsp = 70; + public static final int SecurityReportScRsp = 4106; + public static final int RaidCollectionDataScRsp = 6941; + public static final int GetPrivateChatHistoryCsReq = 3904; + public static final int PlayerReturnTakeRewardCsReq = 4571; + public static final int GetSingleRedDotParamGroupScRsp = 5919; + public static final int RankUpAvatarCsReq = 389; + public static final int GameplayCounterCountDownScRsp = 1486; + public static final int GetRogueHandbookDataCsReq = 5605; + public static final int SceneCastSkillScRsp = 1419; + public static final int ChessRogueGoAheadScRsp = 5416; + public static final int ChessRogueChangeyAeonDimensionNotify = 5589; + public static final int ChessRogueNousGetRogueTalentInfoCsReq = 5509; + public static final int GetTutorialCsReq = 1607; + public static final int GetArchiveDataScRsp = 2357; + public static final int SyncAddBlacklistScNotify = 2926; + public static final int AlleyTakeEventRewardCsReq = 4755; + public static final int ExchangeRogueRewardKeyCsReq = 1835; + public static final int ChessRogueQuitCsReq = 5523; + public static final int ChessRogueGiveUpCsReq = 5405; + public static final int QueryProductInfoScRsp = 38; + public static final int StartTimedFarmElementScRsp = 1441; + public static final int ReplaceLineupCsReq = 751; + public static final int GetTrainVisitorRegisterCsReq = 3771; + public static final int SetBoxingClubResonanceLineupCsReq = 4223; + public static final int GetAllRedDotDataCsReq = 5907; + public static final int UseItemCsReq = 571; + public static final int ShareScRsp = 4157; + public static final int StartTrialActivityCsReq = 2670; + public static final int GetStrongChallengeActivityDataCsReq = 6607; + public static final int TakeAllApRewardScRsp = 3371; + public static final int GetTrialActivityDataScRsp = 2672; + public static final int GetChessRogueBuffEnhanceInfoCsReq = 5516; + public static final int GetFriendApplyListInfoScRsp = 2919; + public static final int GetPlayerBoardDataCsReq = 2807; + public static final int UnlockSkilltreeCsReq = 304; + public static final int TakeAllRewardCsReq = 3034; + public static final int ChessRogueQueryAeonDimensionsCsReq = 5424; + public static final int PunkLordMonsterInfoScNotify = 3281; + public static final int NewMailScNotify = 900; + public static final int ChessRogueStartScRsp = 5529; + public static final int GetRogueInfoScRsp = 1857; + public static final int RogueModifierSelectCellCsReq = 5397; + public static final int LogisticsGameScRsp = 4797; + public static final int TakePromotionRewardCsReq = 360; + public static final int ShowNewSupplementVisitorCsReq = 3773; + public static final int GetAssistListCsReq = 2979; + public static final int EnterAdventureCsReq = 1307; + public static final int TravelBrochureSelectMessageScRsp = 6419; + public static final int GetAetherDivideInfoScRsp = 4806; public static final int GetCurAssistScRsp = 2994; - public static final int GetNpcStatusScRsp = 2784; - public static final int RogueNpcDisappearScRsp = 5655; - public static final int GetEnhanceCommonRogueBuffInfoScRsp = 5680; - public static final int RankUpEquipmentScRsp = 538; - public static final int GetMonsterResearchActivityDataScRsp = 2645; - public static final int SellItemScRsp = 592; - public static final int FinishChessRogueNousSubStoryScRsp = 5441; - public static final int GetPlatformPlayerInfoScRsp = 2918; - public static final int SpaceZooTakeCsReq = 6764; - public static final int AddAvatarScNotify = 355; - public static final int SelectChessRogueSubStoryScRsp = 5560; - public static final int FinishQuestScRsp = 949; - public static final int SyncChessRogueNousValueScNotify = 5522; - public static final int ChangeLineupLeaderScRsp = 740; - public static final int TakePictureCsReq = 4182; - public static final int GetBagScRsp = 561; - public static final int GetHeroBasicTypeInfoCsReq = 77; - public static final int GetChatFriendHistoryCsReq = 3942; - public static final int GetPunkLordMonsterDataScRsp = 3261; - public static final int SavePointsInfoNotify = 1453; - public static final int DeleteBlacklistCsReq = 2908; - public static final int PrivateMsgOfflineUsersScNotify = 3984; - public static final int TakeActivityExpeditionRewardCsReq = 2564; - public static final int UnlockBackGroundMusicCsReq = 3182; - public static final int GetPlayerReplayInfoScRsp = 3584; - public static final int ClientObjUploadCsReq = 2; - public static final int GetChallengeRaidInfoScRsp = 2242; - public static final int GetRogueScoreRewardInfoScRsp = 1802; - public static final int GetLoginChatInfoCsReq = 3940; - public static final int QuitLineupCsReq = 742; - public static final int GetFirstTalkNpcCsReq = 2182; - public static final int GetAvatarDataCsReq = 383; - public static final int GetBoxingClubInfoScRsp = 4261; - public static final int StartAetherDivideSceneBattleCsReq = 4882; - public static final int TakeChallengeRewardScRsp = 1752; - public static final int DressRelicAvatarCsReq = 352; - public static final int FightTreasureDungeonMonsterCsReq = 4473; - public static final int GetFantasticStoryActivityDataScRsp = 4961; - public static final int ChooseBoxingClubResonanceScRsp = 4209; - public static final int GetAetherDivideChallengeInfoCsReq = 4833; - public static final int GetRogueEndlessActivityDataScRsp = 6061; - public static final int GetMissionEventDataCsReq = 1240; - public static final int StopRogueAdventureRoomScRsp = 5633; - public static final int GetBattleCollegeDataScRsp = 5761; - public static final int SyncRogueAdventureRoomInfoScNotify = 5683; - public static final int TakePrestigeRewardScRsp = 4709; - public static final int LockEquipmentScRsp = 560; - public static final int SetLineupNameScRsp = 720; - public static final int HeliobusStartRaidScRsp = 5890; - public static final int HeliobusChallengeUpdateScNotify = 5846; - public static final int HeliobusActivityDataScRsp = 5861; - public static final int GetShareDataScRsp = 4184; - public static final int SpringRefreshScRsp = 1420; - public static final int GetCurLineupDataScRsp = 784; - public static final int HeliobusSnsCommentCsReq = 5897; - public static final int PrestigeLevelUpCsReq = 4759; - public static final int SetStuffToAreaCsReq = 4382; - public static final int GetCurChallengeCsReq = 1738; - public static final int SetMissionEventProgressScRsp = 1208; - public static final int SubMissionRewardScNotify = 1233; - public static final int StartFinishSubMissionScNotify = 1287; - public static final int TakeTalkRewardCsReq = 2104; - public static final int ChessRogueUpdateMoneyInfoScNotify = 5480; - public static final int TakeBpRewardScRsp = 3082; - public static final int GetRaidInfoScRsp = 2209; - public static final int CityShopInfoScNotify = 1542; - public static final int SpaceZooDataScRsp = 6761; - public static final int PromoteAvatarScRsp = 319; - public static final int ChessRogueGiveUpRollScRsp = 5509; - public static final int SetLanguageCsReq = 65; - public static final int DeactivateFarmElementCsReq = 1416; - public static final int ReportPlayerCsReq = 2990; - public static final int SyncAcceptedPamMissionNotify = 4004; - public static final int DressAvatarCsReq = 397; - public static final int TakeExpeditionRewardCsReq = 2542; - public static final int TrainVisitorBehaviorFinishCsReq = 3783; - public static final int TakeMonsterResearchActivityRewardCsReq = 2659; - public static final int SpaceZooDeleteCatScRsp = 6738; - public static final int OpenTreasureDungeonGridScRsp = 4452; - public static final int GetRogueAeonInfoScRsp = 1801; - public static final int QuitTreasureDungeonScRsp = 4446; - public static final int EnterFightActivityStageScRsp = 3682; - public static final int RogueModifierDelNotify = 5397; - public static final int RaidInfoNotify = 2282; - public static final int UpgradeAreaScRsp = 4364; - public static final int ChessRogueQueryScRsp = 5425; - public static final int MuseumRandomEventQueryScRsp = 4359; - public static final int SearchPlayerScRsp = 2965; - public static final int TeleportToMissionResetPointScRsp = 1265; - public static final int GmTalkScRsp = 49; - public static final int GetCurSceneInfoCsReq = 1442; - public static final int CancelExpeditionCsReq = 2582; - public static final int SyncApplyFriendScNotify = 2997; - public static final int EnteredSceneChangeScNotify = 1432; - public static final int GetAllServerPrefsDataCsReq = 6183; - public static final int SyncRogueVirtualItemInfoScNotify = 1857; - public static final int EnhanceRogueBuffScRsp = 1833; - public static final int SpaceZooCatUpdateNotify = 6749; - public static final int GetRogueTalentInfoScRsp = 1839; - public static final int HeliobusSnsPostCsReq = 5882; - public static final int RogueModifierAddNotify = 5304; - public static final int AcceptActivityExpeditionScRsp = 2549; - public static final int PunkLordDataChangeNotify = 3224; - public static final int SetClientRaidTargetCountScRsp = 2264; - public static final int ChessRogueUpdateDiceInfoScNotify = 5511; - public static final int StartPunkLordRaidCsReq = 3204; - public static final int GetChallengeGroupStatisticsScRsp = 1745; - public static final int ChessRogueEnterCellCsReq = 5483; - public static final int GetSaveRaidCsReq = 2240; - public static final int ChallengeSettleNotify = 1742; + public static final int GetNpcStatusScRsp = 2797; + public static final int RogueNpcDisappearScRsp = 5623; + public static final int GetEnhanceCommonRogueBuffInfoScRsp = 5665; + public static final int RankUpEquipmentScRsp = 546; + public static final int GetMonsterResearchActivityDataScRsp = 2626; + public static final int SellItemScRsp = 560; + public static final int FinishChessRogueNousSubStoryScRsp = 5508; + public static final int GetPlatformPlayerInfoScRsp = 2913; + public static final int SpaceZooTakeCsReq = 6789; + public static final int AddAvatarScNotify = 323; + public static final int SelectChessRogueSubStoryScRsp = 5489; + public static final int FinishQuestScRsp = 973; + public static final int SyncChessRogueNousValueScNotify = 5484; + public static final int RelicRecommendCsReq = 538; + public static final int ChangeLineupLeaderScRsp = 781; + public static final int TakePictureCsReq = 4104; + public static final int GetBagScRsp = 557; + public static final int GetHeroBasicTypeInfoCsReq = 17; + public static final int GetChatFriendHistoryCsReq = 3971; + public static final int GetPunkLordMonsterDataScRsp = 3257; + public static final int SavePointsInfoNotify = 1455; + public static final int DeleteBlacklistCsReq = 2976; + public static final int PrivateMsgOfflineUsersScNotify = 3997; + public static final int TakeActivityExpeditionRewardCsReq = 2589; + public static final int SubmitEmotionItemCsReq = 6304; + public static final int StartWolfBroGameScRsp = 6557; + public static final int UnlockBackGroundMusicCsReq = 3104; + public static final int GetPlayerReplayInfoScRsp = 3597; + public static final int ClientObjUploadCsReq = 86; + public static final int GetChallengeRaidInfoScRsp = 2271; + public static final int GetRogueScoreRewardInfoScRsp = 1886; + public static final int GetLoginChatInfoCsReq = 3981; + public static final int QuitLineupCsReq = 771; + public static final int GetFirstTalkNpcCsReq = 2104; + public static final int GetAvatarDataCsReq = 307; + public static final int GetBoxingClubInfoScRsp = 4257; + public static final int StartAetherDivideSceneBattleCsReq = 4804; + public static final int TakeChallengeRewardScRsp = 1718; + public static final int DressRelicAvatarCsReq = 318; + public static final int FightTreasureDungeonMonsterCsReq = 4439; + public static final int GetFantasticStoryActivityDataScRsp = 4957; + public static final int ChooseBoxingClubResonanceScRsp = 4206; + public static final int GetAetherDivideChallengeInfoCsReq = 4812; + public static final int GetRogueEndlessActivityDataScRsp = 6057; + public static final int GetMissionEventDataCsReq = 1281; + public static final int StopRogueAdventureRoomScRsp = 5612; + public static final int TravelBrochureRemovePasterScRsp = 6446; + public static final int GetBattleCollegeDataScRsp = 5757; + public static final int SyncRogueAdventureRoomInfoScNotify = 5607; + public static final int TakePrestigeRewardScRsp = 4706; + public static final int LockEquipmentScRsp = 519; + public static final int SetLineupNameScRsp = 798; + public static final int HeliobusStartRaidScRsp = 5851; + public static final int HeliobusChallengeUpdateScNotify = 5853; + public static final int ResetMapRotationRegionScRsp = 6889; + public static final int HeliobusActivityDataScRsp = 5857; + public static final int GetShareDataScRsp = 4197; + public static final int SpringRefreshScRsp = 1498; + public static final int GetCurLineupDataScRsp = 797; + public static final int HeliobusSnsCommentCsReq = 5900; + public static final int PrestigeLevelUpCsReq = 4750; + public static final int TelevisionActivityBattleEndScNotify = 6972; + public static final int SetStuffToAreaCsReq = 4304; + public static final int SubmitOfferingItemScRsp = 6922; + public static final int GetCurChallengeCsReq = 1746; + public static final int SetMissionEventProgressScRsp = 1276; + public static final int SubMissionRewardScNotify = 1212; + public static final int TravelBrochureApplyPasterScRsp = 6434; + public static final int StartFinishSubMissionScNotify = 1279; + public static final int TakeOfferingRewardCsReq = 6923; + public static final int TakeTalkRewardCsReq = 2116; + public static final int ChessRogueUpdateMoneyInfoScNotify = 5559; + public static final int TakeBpRewardScRsp = 3004; + public static final int GetRaidInfoScRsp = 2206; + public static final int TravelBrochurePageUnlockScNotify = 6416; + public static final int CityShopInfoScNotify = 1571; + public static final int SpaceZooDataScRsp = 6757; + public static final int PromoteAvatarScRsp = 334; + public static final int ChessRogueGiveUpRollScRsp = 5550; + public static final int GetStoryLineInfoScRsp = 6257; + public static final int HeartDialTraceScriptCsReq = 6346; + public static final int SetLanguageCsReq = 95; + public static final int DeactivateFarmElementCsReq = 1490; + public static final int ReportPlayerCsReq = 2951; + public static final int SyncAcceptedPamMissionNotify = 4016; + public static final int DressAvatarCsReq = 400; + public static final int TakeExpeditionRewardCsReq = 2571; + public static final int TrainVisitorBehaviorFinishCsReq = 3707; + public static final int TakeMonsterResearchActivityRewardCsReq = 2650; + public static final int SpaceZooDeleteCatScRsp = 6746; + public static final int OpenTreasureDungeonGridScRsp = 4418; + public static final int GetRogueAeonInfoScRsp = 1844; + public static final int QuitTreasureDungeonScRsp = 4453; + public static final int EnterFightActivityStageScRsp = 3604; + public static final int RogueModifierDelNotify = 5400; + public static final int RaidInfoNotify = 2204; + public static final int UpgradeAreaScRsp = 4389; + public static final int GetRollShopInfoCsReq = 6905; + public static final int ChessRogueQueryScRsp = 5522; + public static final int BatchGetQuestDataCsReq = 981; + public static final int MuseumRandomEventQueryScRsp = 4350; + public static final int SearchPlayerScRsp = 2995; + public static final int TeleportToMissionResetPointScRsp = 1295; + public static final int GmTalkScRsp = 73; + public static final int GetCurSceneInfoCsReq = 1471; + public static final int CancelExpeditionCsReq = 2504; + public static final int SyncApplyFriendScNotify = 3000; + public static final int EnteredSceneChangeScNotify = 1491; + public static final int GetAllServerPrefsDataCsReq = 6107; + public static final int SyncRogueVirtualItemInfoScNotify = 1840; + public static final int EnhanceRogueBuffScRsp = 1812; + public static final int SpaceZooCatUpdateNotify = 6773; + public static final int GetRogueTalentInfoScRsp = 1868; + public static final int QuitWolfBroGameScRsp = 6534; + public static final int GetWolfBroGameDataScRsp = 6546; + public static final int HeliobusSnsPostCsReq = 5804; + public static final int RogueModifierAddNotify = 5316; + public static final int AcceptActivityExpeditionScRsp = 2573; + public static final int PunkLordDataChangeNotify = 3254; + public static final int SetClientRaidTargetCountScRsp = 2289; + public static final int ChessRogueUpdateDiceInfoScNotify = 5447; + public static final int ChangeStoryLineFinishScNotify = 6219; + public static final int StartPunkLordRaidCsReq = 3216; + public static final int GetChallengeGroupStatisticsScRsp = 1726; + public static final int ChessRogueEnterCellCsReq = 5423; + public static final int GetSaveRaidCsReq = 2281; + public static final int ChallengeSettleNotify = 1771; public static final int RecoverAllLineupScRsp = 1494; - public static final int DoGachaScRsp = 1984; - public static final int RefreshTriggerByClientScNotify = 1423; - public static final int ChessRogueLeaveScRsp = 5429; - public static final int ReviveRogueAvatarScRsp = 1892; - public static final int RemoveStuffFromAreaCsReq = 4342; - public static final int GetFirstTalkByPerformanceNpcCsReq = 2149; - public static final int SetAssistCsReq = 2924; - public static final int SyncRogueHandbookDataUpdateScNotify = 5656; - public static final int SpaceZooOpCatteryScRsp = 6719; - public static final int SetPlayerInfoCsReq = 22; - public static final int GetAssistHistoryCsReq = 2953; - public static final int ShowNewSupplementVisitorScRsp = 3709; - public static final int ChessRogueConfirmRollCsReq = 5476; - public static final int PickRogueAvatarCsReq = 1852; - public static final int GetRogueInfoCsReq = 1883; - public static final int ChooseBoxingClubStageOptionalBuffCsReq = 4240; - public static final int TakeRogueAeonLevelRewardScRsp = 1830; - public static final int SetGroupCustomSaveDataCsReq = 1498; - public static final int GetUpdatedArchiveDataScRsp = 2384; - public static final int AetherDivideSpiritExpUpScRsp = 4846; - public static final int MissionEventRewardScNotify = 1273; - public static final int HeliobusInfoChangedScNotify = 5809; - public static final int FantasticStoryActivityBattleEndScNotify = 4960; - public static final int GetStuffScNotify = 4397; - public static final int TakePromotionRewardScRsp = 359; - public static final int GetFirstTalkNpcScRsp = 2160; - public static final int GetRogueTalentInfoCsReq = 1807; - public static final int SceneEntityUpdateScNotify = 1497; - public static final int GameplayCounterRecoverCsReq = 1450; - public static final int PromoteEquipmentCsReq = 504; - public static final int GetRogueAdventureRoomInfoCsReq = 5664; - public static final int EnterSectionScRsp = 1465; - public static final int TakeAssistRewardCsReq = 2993; - public static final int GetLineupAvatarDataCsReq = 709; - public static final int GetChessRogueStoryInfoCsReq = 5409; - public static final int HeliobusUnlockSkillScNotify = 5840; - public static final int TakeTrialActivityRewardCsReq = 2686; + public static final int DoGachaScRsp = 1997; + public static final int RefreshTriggerByClientScNotify = 1449; + public static final int ChessRogueLeaveScRsp = 5468; + public static final int ReviveRogueAvatarScRsp = 1860; + public static final int RemoveStuffFromAreaCsReq = 4371; + public static final int GetFirstTalkByPerformanceNpcCsReq = 2173; + public static final int SetAssistCsReq = 2954; + public static final int GetOfferingInfoCsReq = 6925; + public static final int LeaveMapRotationRegionScRsp = 6846; + public static final int SyncRogueHandbookDataUpdateScNotify = 5608; + public static final int SpaceZooOpCatteryScRsp = 6734; + public static final int SetPlayerInfoCsReq = 11; + public static final int StoryLineTrialAvatarChangeScNotify = 6271; + public static final int GetAssistHistoryCsReq = 2955; + public static final int ShowNewSupplementVisitorScRsp = 3706; + public static final int ChessRogueConfirmRollCsReq = 5596; + public static final int PickRogueAvatarCsReq = 1818; + public static final int GetRogueInfoCsReq = 1807; + public static final int RestoreWolfBroGameArchiveScRsp = 6519; + public static final int ChooseBoxingClubStageOptionalBuffCsReq = 4281; + public static final int TakeRogueAeonLevelRewardScRsp = 1820; + public static final int SetGroupCustomSaveDataCsReq = 1470; + public static final int GetUpdatedArchiveDataScRsp = 2397; + public static final int AetherDivideSpiritExpUpScRsp = 4853; + public static final int MissionEventRewardScNotify = 1239; + public static final int HeliobusInfoChangedScNotify = 5806; + public static final int UpdateMapRotationDataScNotify = 6839; + public static final int FantasticStoryActivityBattleEndScNotify = 4919; + public static final int GetStuffScNotify = 4400; + public static final int TakePromotionRewardScRsp = 350; + public static final int GetFirstTalkNpcScRsp = 2119; + public static final int GetRogueTalentInfoCsReq = 1856; + public static final int SceneEntityUpdateScNotify = 1500; + public static final int GameplayCounterRecoverCsReq = 1403; + public static final int StartWolfBroGameCsReq = 6507; + public static final int PromoteEquipmentCsReq = 516; + public static final int ChangeScriptEmotionCsReq = 6316; + public static final int GetRogueAdventureRoomInfoCsReq = 5689; + public static final int EnterSectionScRsp = 1495; + public static final int TakeAssistRewardCsReq = 2943; + public static final int GetLineupAvatarDataCsReq = 706; + public static final int GetChessRogueStoryInfoCsReq = 5440; + public static final int HeliobusUnlockSkillScNotify = 5881; + public static final int TakeTrialActivityRewardCsReq = 2627; public static final int GetHeroBasicTypeInfoScRsp = 94; - public static final int TakeRogueEndlessActivityPointRewardCsReq = 6060; - public static final int QuitRogueScRsp = 1877; - public static final int SwitchAetherDivideLineUpSlotCsReq = 4820; - public static final int GateServerScNotify = 13; - public static final int UnlockTutorialGuideCsReq = 1642; - public static final int MuseumTargetRewardNotify = 4388; - public static final int PlayerLoginFinishCsReq = 96; - public static final int StartRaidCsReq = 2283; - public static final int GetPunkLordMonsterDataCsReq = 3283; - public static final int EnterSceneScRsp = 1472; - public static final int ChessRogueEnterNextLayerCsReq = 5412; - public static final int BatchMarkChatEmojiCsReq = 3955; - public static final int SceneGroupRefreshScNotify = 1431; - public static final int GetBasicInfoCsReq = 76; - public static final int TakeCityShopRewardCsReq = 1582; - public static final int EnterFantasticStoryActivityStageScRsp = 4982; - public static final int FinishCurTurnScRsp = 4309; - public static final int SceneEnterStageScRsp = 1446; - public static final int RogueEndlessActivityBattleEndScNotify = 6082; - public static final int TakeOffAvatarSkinScRsp = 308; - public static final int AlleyShipmentEventEffectsScNotify = 4787; - public static final int GetChallengeScRsp = 1761; - public static final int MuseumDispatchFinishedScNotify = 4346; - public static final int GetGachaInfoScRsp = 1961; - public static final int GetExpeditionDataScRsp = 2561; - public static final int TextJoinSaveScRsp = 3861; - public static final int SelectChessRogueNousSubStoryScRsp = 5449; - public static final int ChessRogueEnterCsReq = 5501; - public static final int ExchangeRogueBuffWithMiracleCsReq = 5620; - public static final int HeliobusSnsCommentScRsp = 5838; - public static final int MonthCardRewardNotify = 85; - public static final int SelectPhoneThemeCsReq = 5160; - public static final int FinishTutorialGuideScRsp = 1609; - public static final int SetCurInteractEntityScRsp = 1478; - public static final int PunkLordMonsterKilledNotify = 3265; - public static final int TakeOffRelicScRsp = 320; - public static final int GetMultipleDropInfoScRsp = 4661; - public static final int TakeApRewardCsReq = 3383; - public static final int GetUnlockTeleportScRsp = 1434; - public static final int GetMissionDataScRsp = 1261; - public static final int StartAetherDivideSceneBattleScRsp = 4860; - public static final int ChessRogueReviveAvatarCsReq = 5510; - public static final int SceneEntityDisappearScNotify = 1438; + public static final int TakeRogueEndlessActivityPointRewardCsReq = 6019; + public static final int QuitRogueScRsp = 1817; + public static final int SwitchAetherDivideLineUpSlotCsReq = 4898; + public static final int GateServerScNotify = 45; + public static final int UnlockTutorialGuideCsReq = 1671; + public static final int MuseumTargetRewardNotify = 4385; + public static final int PlayerLoginFinishCsReq = 58; + public static final int StartRaidCsReq = 2207; + public static final int GetPunkLordMonsterDataCsReq = 3207; + public static final int EnterSceneScRsp = 1493; + public static final int ChessRogueEnterNextLayerCsReq = 5456; + public static final int BatchMarkChatEmojiCsReq = 3923; + public static final int SceneGroupRefreshScNotify = 1483; + public static final int GetBasicInfoCsReq = 88; + public static final int TakeCityShopRewardCsReq = 1504; + public static final int EnterFantasticStoryActivityStageScRsp = 4904; + public static final int FinishCurTurnScRsp = 4306; + public static final int SceneEnterStageScRsp = 1453; + public static final int RogueEndlessActivityBattleEndScNotify = 6004; + public static final int TakeOffAvatarSkinScRsp = 376; + public static final int AlleyShipmentEventEffectsScNotify = 4779; + public static final int GetChallengeScRsp = 1757; + public static final int MuseumDispatchFinishedScNotify = 4353; + public static final int GetGachaInfoScRsp = 1957; + public static final int GetExpeditionDataScRsp = 2557; + public static final int TextJoinSaveScRsp = 3857; + public static final int SelectChessRogueNousSubStoryScRsp = 5544; + public static final int InteractChargerScRsp = 6897; + public static final int ChessRogueEnterCsReq = 5511; + public static final int ExchangeRogueBuffWithMiracleCsReq = 5698; + public static final int HeliobusSnsCommentScRsp = 5846; + public static final int MonthCardRewardNotify = 42; + public static final int SelectPhoneThemeCsReq = 5119; + public static final int FinishTutorialGuideScRsp = 1606; + public static final int SetCurInteractEntityScRsp = 1424; + public static final int PunkLordMonsterKilledNotify = 3295; + public static final int TakeOffRelicScRsp = 398; + public static final int GetMultipleDropInfoScRsp = 4657; + public static final int TakeApRewardCsReq = 3307; + public static final int GetUnlockTeleportScRsp = 1466; + public static final int GetMissionDataScRsp = 1257; + public static final int StartAetherDivideSceneBattleScRsp = 4819; + public static final int ChessRogueReviveAvatarCsReq = 5496; + public static final int SceneEntityDisappearScNotify = 1446; + public static final int QuitWolfBroGameCsReq = 6571; public static final int GetMainMissionCustomValueScRsp = 1294; - public static final int TextJoinQueryScRsp = 3884; - public static final int DressRelicAvatarScRsp = 373; - public static final int LeaveRaidCsReq = 2204; - public static final int HeliobusStartRaidCsReq = 5880; - public static final int SpringRecoverSingleAvatarScRsp = 1486; - public static final int DailyFirstMeetPamCsReq = 3404; - public static final int TakeMonsterResearchActivityRewardScRsp = 2680; - public static final int FinishRogueDialogueGroupCsReq = 1879; - public static final int SyncEntityBuffChangeListScNotify = 1455; - public static final int SetFriendRemarkNameCsReq = 2959; - public static final int FinishFirstTalkNpcCsReq = 2142; - public static final int HeliobusSnsLikeScRsp = 5819; - public static final int EnterRogueMapRoomCsReq = 1856; - public static final int MatchBoxingClubOpponentCsReq = 4204; - public static final int EnterTreasureDungeonCsReq = 4455; - public static final int GetFantasticStoryActivityDataCsReq = 4983; - public static final int SpaceZooDataCsReq = 6783; - public static final int TriggerVoiceScRsp = 4164; - public static final int PrepareRogueAdventureRoomCsReq = 5661; - public static final int AceAntiCheaterCsReq = 79; - public static final int GetRogueShopBuffInfoCsReq = 5660; - public static final int SetForbidOtherApplyFriendScRsp = 2943; - public static final int ExpUpEquipmentScRsp = 509; - public static final int SetDisplayAvatarScRsp = 2860; - public static final int ChessRogueRollDiceCsReq = 5526; - public static final int GetTutorialGuideCsReq = 1604; - public static final int MultipleDropInfoScNotify = 4604; - public static final int ChessRogueMoveCellNotify = 5470; - public static final int DelMailCsReq = 882; - public static final int ChessRogueUpdateAeonModifierValueScNotify = 5506; - public static final int GetServerPrefsDataScRsp = 6184; - public static final int GetChatEmojiListScRsp = 3938; - public static final int SetAssistAvatarScRsp = 2855; - public static final int GetRogueDialogueEventDataCsReq = 1844; - public static final int TakePunkLordPointRewardCsReq = 3255; - public static final int QuitBattleScRsp = 184; - public static final int TakeTrainVisitorUntakenBehaviorRewardCsReq = 3797; - public static final int SelectChatBubbleCsReq = 5104; - public static final int MissionRewardScNotify = 1282; - public static final int SyncRogueSeasonFinishScNotify = 1803; - public static final int MuseumTakeCollectRewardScRsp = 4387; - public static final int UnlockedAreaMapScNotify = 1415; - public static final int CancelCacheNotifyCsReq = 4197; - public static final int GetMuseumInfoScRsp = 4361; - public static final int PlayerLoginCsReq = 83; - public static final int ChessRogueUpdateLevelBaseInfoScNotify = 5563; - public static final int GetFriendLoginInfoScRsp = 2925; - public static final int GetChapterCsReq = 482; - public static final int GetSaveLogisticsMapScRsp = 4724; - public static final int GetTrialActivityDataCsReq = 2644; - public static final int GetTrainVisitorBehaviorCsReq = 3704; - public static final int GetSpringRecoverDataCsReq = 1476; - public static final int SharePunkLordMonsterScRsp = 3260; - public static final int GetActivityScheduleConfigScRsp = 2660; - public static final int GetFriendRecommendListInfoCsReq = 2920; - public static final int GetRogueHandbookDataScRsp = 5693; - public static final int HandleRogueCommonPendingActionScRsp = 5689; - public static final int ChessRogueNousGetRogueTalentInfoScRsp = 5573; - public static final int GetSceneMapInfoScRsp = 1474; - public static final int UpdatePlayerSettingScRsp = 91; - public static final int GetMailCsReq = 883; - public static final int FeatureSwitchClosedScNotify = 63; - public static final int TakeQuestRewardScRsp = 984; - public static final int TakeKilledPunkLordMonsterScoreCsReq = 3287; - public static final int AetherDivideSpiritInfoScNotify = 4808; - public static final int SaveLogisticsCsReq = 4733; - public static final int GetRndOptionScRsp = 3461; - public static final int SpaceZooBornScRsp = 6784; - public static final int HandleFriendCsReq = 2938; - public static final int GetPlayerDetailInfoScRsp = 2984; - public static final int RevcMsgScNotify = 3904; - public static final int InterruptMissionEventCsReq = 1280; - public static final int TakeQuestOptionalRewardScRsp = 955; - public static final int LeaveTrialActivityCsReq = 2663; - public static final int StaminaInfoScNotify = 34; - public static final int GetMissionStatusScRsp = 1259; - public static final int SetAetherDivideLineUpScRsp = 4864; - public static final int ClearAetherDividePassiveSkillCsReq = 4873; - public static final int FinishTalkMissionScRsp = 1284; - public static final int GetPunkLordBattleRecordCsReq = 3278; - public static final int SetClientPausedScRsp = 1414; - public static final int AetherDivideTakeChallengeRewardCsReq = 4803; - public static final int ChessRogueQuitScRsp = 5551; - public static final int FinishSectionIdCsReq = 2742; - public static final int FinishPerformSectionIdCsReq = 2797; - public static final int VirtualLineupDestroyNotify = 780; - public static final int GetSingleRedDotParamGroupCsReq = 5982; - public static final int MarkItemScRsp = 503; - public static final int PlayerReturnSignScRsp = 4504; - public static final int ActivateFarmElementScRsp = 1443; - public static final int ReturnLastTownCsReq = 1459; - public static final int StartAlleyEventScRsp = 4719; - public static final int FinishTutorialScRsp = 1638; - public static final int PlayerLogoutScRsp = 84; - public static final int GetEnteredSceneCsReq = 1401; - public static final int SelectRogueDialogueEventCsReq = 1896; - public static final int StartChallengeCsReq = 1704; + public static final int TextJoinQueryScRsp = 3897; + public static final int DressRelicAvatarScRsp = 339; + public static final int LeaveRaidCsReq = 2216; + public static final int HeliobusStartRaidCsReq = 5865; + public static final int SpringRecoverSingleAvatarScRsp = 1427; + public static final int DailyFirstMeetPamCsReq = 3416; + public static final int TakeMonsterResearchActivityRewardScRsp = 2665; + public static final int SetFriendMarkScRsp = 2937; + public static final int BatchGetQuestDataScRsp = 918; + public static final int FinishRogueDialogueGroupCsReq = 1878; + public static final int SyncEntityBuffChangeListScNotify = 1423; + public static final int SetFriendRemarkNameCsReq = 2950; + public static final int FinishFirstTalkNpcCsReq = 2171; + public static final int HeliobusSnsLikeScRsp = 5834; + public static final int EnterRogueMapRoomCsReq = 1808; + public static final int MatchBoxingClubOpponentCsReq = 4216; + public static final int EnterTreasureDungeonCsReq = 4423; + public static final int GetFantasticStoryActivityDataCsReq = 4907; + public static final int SpaceZooDataCsReq = 6707; + public static final int TriggerVoiceScRsp = 4189; + public static final int PrepareRogueAdventureRoomCsReq = 5657; + public static final int TravelBrochureGetPasterScNotify = 6423; + public static final int AceAntiCheaterCsReq = 78; + public static final int GetRogueShopBuffInfoCsReq = 5619; + public static final int SetForbidOtherApplyFriendScRsp = 2975; + public static final int ExpUpEquipmentScRsp = 506; + public static final int SetDisplayAvatarScRsp = 2819; + public static final int RotateMapCsReq = 6871; + public static final int HeartDialTraceScriptScRsp = 6373; + public static final int ChessRogueRollDiceCsReq = 5425; + public static final int GetTutorialGuideCsReq = 1616; + public static final int MultipleDropInfoScNotify = 4616; + public static final int ChessRogueMoveCellNotify = 5598; + public static final int DelMailCsReq = 804; + public static final int ChessRogueUpdateAeonModifierValueScNotify = 5483; + public static final int GetServerPrefsDataScRsp = 6197; + public static final int GetChatEmojiListScRsp = 3946; + public static final int SetAssistAvatarScRsp = 2823; + public static final int GetRogueDialogueEventDataCsReq = 1836; + public static final int TakePunkLordPointRewardCsReq = 3223; + public static final int FinishEmotionDialoguePerformanceCsReq = 6371; + public static final int QuitBattleScRsp = 197; + public static final int EnterMapRotationRegionCsReq = 6807; + public static final int TakeTrainVisitorUntakenBehaviorRewardCsReq = 3800; + public static final int SelectChatBubbleCsReq = 5116; + public static final int MissionRewardScNotify = 1204; + public static final int SyncRogueSeasonFinishScNotify = 1815; + public static final int MuseumTakeCollectRewardScRsp = 4379; + public static final int UnlockedAreaMapScNotify = 1477; + public static final int CancelCacheNotifyCsReq = 4200; + public static final int GetMuseumInfoScRsp = 4357; + public static final int PlayerLoginCsReq = 7; + public static final int ChessRogueUpdateLevelBaseInfoScNotify = 5542; + public static final int GetFriendLoginInfoScRsp = 2938; + public static final int GetChapterCsReq = 404; + public static final int GetSaveLogisticsMapScRsp = 4754; + public static final int GetTrialActivityDataCsReq = 2636; + public static final int GetTrainVisitorBehaviorCsReq = 3716; + public static final int GetSpringRecoverDataCsReq = 1488; + public static final int SharePunkLordMonsterScRsp = 3219; + public static final int GetActivityScheduleConfigScRsp = 2619; + public static final int GetFriendRecommendListInfoCsReq = 2998; + public static final int GetHeartDialInfoCsReq = 6307; + public static final int GetRogueHandbookDataScRsp = 5643; + public static final int HandleRogueCommonPendingActionScRsp = 5652; + public static final int ChessRogueNousGetRogueTalentInfoScRsp = 5571; + public static final int DiscardRelicScRsp = 590; + public static final int GetSceneMapInfoScRsp = 1429; + public static final int UpdatePlayerSettingScRsp = 74; + public static final int GetMailCsReq = 807; + public static final int FeatureSwitchClosedScNotify = 28; + public static final int TakeQuestRewardScRsp = 997; + public static final int TakeKilledPunkLordMonsterScoreCsReq = 3279; + public static final int AetherDivideSpiritInfoScNotify = 4876; + public static final int SaveLogisticsCsReq = 4712; + public static final int GetRndOptionScRsp = 3457; + public static final int SpaceZooBornScRsp = 6797; + public static final int HandleFriendCsReq = 2946; + public static final int GetPlayerDetailInfoScRsp = 2997; + public static final int RevcMsgScNotify = 3916; + public static final int InterruptMissionEventCsReq = 1265; + public static final int TakeQuestOptionalRewardScRsp = 923; + public static final int LeaveTrialActivityCsReq = 2628; + public static final int StaminaInfoScNotify = 66; + public static final int GetMissionStatusScRsp = 1250; + public static final int SetAetherDivideLineUpScRsp = 4889; + public static final int ClearAetherDividePassiveSkillCsReq = 4839; + public static final int FinishTalkMissionScRsp = 1297; + public static final int GetPunkLordBattleRecordCsReq = 3224; + public static final int SetClientPausedScRsp = 1402; + public static final int AetherDivideTakeChallengeRewardCsReq = 4815; + public static final int ChessRogueQuitScRsp = 5415; + public static final int FinishSectionIdCsReq = 2771; + public static final int TravelBrochureGetDataCsReq = 6407; + public static final int FinishPerformSectionIdCsReq = 2800; + public static final int VirtualLineupDestroyNotify = 765; + public static final int TakeRollShopRewardScRsp = 6912; + public static final int GetSingleRedDotParamGroupCsReq = 5904; + public static final int MarkItemScRsp = 515; + public static final int PlayerReturnSignScRsp = 4516; + public static final int ActivateFarmElementScRsp = 1475; + public static final int ReturnLastTownCsReq = 1450; + public static final int StartAlleyEventScRsp = 4734; + public static final int FinishTutorialScRsp = 1646; + public static final int PlayerLogoutScRsp = 97; + public static final int GetEnteredSceneCsReq = 1444; + public static final int SelectRogueDialogueEventCsReq = 1858; + public static final int StartChallengeCsReq = 1716; public static final int GetMarkItemListScRsp = 594; - public static final int SetSpringRecoverConfigCsReq = 1468; - public static final int GetAllLineupDataScRsp = 759; - public static final int CancelMarkItemNotify = 527; - public static final int SetGameplayBirthdayCsReq = 44; - public static final int SyncRogueAreaUnlockScNotify = 1862; - public static final int DestroyItemCsReq = 524; - public static final int GetChessRogueNousStoryInfoScRsp = 5568; - public static final int GetPunkLordDataScRsp = 3273; - public static final int TakeFightActivityRewardScRsp = 3642; - public static final int SummonPunkLordMonsterCsReq = 3242; - public static final int StartAetherDivideStageBattleScRsp = 4880; - public static final int GetRecyleTimeScRsp = 565; - public static final int GetNpcTakenRewardCsReq = 2183; - public static final int ExchangeGachaCeilingScRsp = 1919; - public static final int GetGachaCeilingScRsp = 1960; - public static final int FinishChessRogueSubStoryCsReq = 5401; - public static final int TrialBackGroundMusicCsReq = 3142; - public static final int GetRecyleTimeCsReq = 588; - public static final int AddEquipmentScNotify = 533; - public static final int ChessRogueSelectBpScRsp = 5571; - public static final int GetNpcMessageGroupScRsp = 2761; - public static final int GetKilledPunkLordMonsterDataCsReq = 3246; - public static final int OpenRogueChestScRsp = 1886; - public static final int GetVideoVersionKeyCsReq = 72; - public static final int GetPlayerReturnMultiDropInfoCsReq = 4684; - public static final int GetAlleyInfoScRsp = 4761; - public static final int AddBlacklistScRsp = 2973; - public static final int TextJoinBatchSaveScRsp = 3860; - public static final int ClearAetherDividePassiveSkillScRsp = 4845; - public static final int TakeLoginActivityRewardCsReq = 2604; - public static final int GetStrongChallengeActivityDataScRsp = 6661; - public static final int DestroyItemScRsp = 578; - public static final int GetJukeboxDataCsReq = 3183; - public static final int SyncRogueAeonLevelUpRewardScNotify = 1891; - public static final int TakeRogueEndlessActivityAllBonusRewardScRsp = 6097; - public static final int SyncTaskCsReq = 1260; - public static final int SyncChessRogueNousMainStoryScNotify = 5502; - public static final int UpdateRogueAdventureRoomScoreCsReq = 5643; - public static final int FinishItemIdScRsp = 2760; - public static final int MuseumRandomEventSelectScRsp = 4390; - public static final int ExpUpRelicCsReq = 540; - public static final int GetSceneMapInfoCsReq = 1495; - public static final int SpaceZooMutateScRsp = 6760; - public static final int ComposeItemScRsp = 564; - public static final int EnterChessRogueAeonRoomScRsp = 5519; - public static final int PlayerLoginScRsp = 61; - public static final int GameplayCounterCountDownCsReq = 1410; - public static final int ChessRogueLayerAccountInfoNotify = 5468; - public static final int GetStageLineupCsReq = 783; - public static final int AlleyFundsScNotify = 4790; - public static final int EnterStrongChallengeActivityStageCsReq = 6604; - public static final int GetChapterScRsp = 460; - public static final int MuseumFundsChangedScNotify = 4345; - public static final int EnhanceCommonRogueBuffScRsp = 5646; - public static final int ReEnterLastElementStageCsReq = 1411; - public static final int TakeRogueEventHandbookRewardScRsp = 5616; - public static final int ChessRogueUpdateActionPointScNotify = 5431; - public static final int UpgradeAreaStatScRsp = 4352; - public static final int UnlockTutorialCsReq = 1682; - public static final int GetLevelRewardScRsp = 8; - public static final int AvatarExpUpScRsp = 384; - public static final int MuseumTargetStartNotify = 4308; - public static final int AlleyEventChangeNotify = 4797; - public static final int TakeQuestOptionalRewardCsReq = 909; - public static final int GetWaypointScRsp = 461; - public static final int GetMailScRsp = 861; - public static final int GetReplayTokenScRsp = 3561; - public static final int StartBoxingClubBattleCsReq = 4282; - public static final int UpdateServerPrefsDataScRsp = 6160; - public static final int TakeChallengeRaidRewardCsReq = 2219; - public static final int SceneEntityMoveCsReq = 1483; - public static final int GetChatFriendHistoryScRsp = 3919; - public static final int TakePunkLordPointRewardScRsp = 3264; - public static final int GetMuseumInfoCsReq = 4383; - public static final int SetTurnFoodSwitchCsReq = 556; - public static final int BattleCollegeDataChangeScNotify = 5704; - public static final int SetAssistAvatarCsReq = 2809; - public static final int GetMonsterResearchActivityDataCsReq = 2673; - public static final int SyncRogueDialogueEventDataScNotify = 1872; - public static final int SetGenderCsReq = 93; - public static final int EnterAdventureScRsp = 1361; - public static final int LogisticsGameCsReq = 4704; - public static final int GetChatEmojiListCsReq = 3997; - public static final int DressAvatarSkinScRsp = 390; - public static final int GetAssistListScRsp = 2906; - public static final int AetherDivideTakeChallengeRewardScRsp = 4827; - public static final int SetClientRaidTargetCountCsReq = 2255; - public static final int GetMissionStatusCsReq = 1292; - public static final int RogueNpcDisappearCsReq = 5609; - public static final int GetNpcStatusCsReq = 2704; - public static final int GetTrainVisitorRegisterScRsp = 3719; - public static final int ChessRoguePickAvatarCsReq = 5434; - public static final int ChessRogueNousEnableRogueTalentCsReq = 5433; - public static final int GetBattleCollegeDataCsReq = 5783; - public static final int InteractTreasureDungeonGridCsReq = 4420; - public static final int SetSignatureScRsp = 2849; - public static final int SyncServerSceneChangeNotify = 1430; - public static final int EquipAetherDividePassiveSkillScRsp = 4852; - public static final int SelectChessRogueSubStoryCsReq = 5407; - public static final int GetChallengeRaidInfoCsReq = 2260; - public static final int UnlockChatBubbleScNotify = 5182; - public static final int HealPoolInfoNotify = 1489; - public static final int SetForbidOtherApplyFriendCsReq = 2970; - public static final int ReEnterLastElementStageScRsp = 1435; - public static final int InterruptMissionEventScRsp = 1290; - public static final int GetPlatformPlayerInfoCsReq = 2914; - public static final int GetAetherDivideInfoCsReq = 4849; - public static final int RefreshTriggerByClientScRsp = 1439; - public static final int ClientObjUploadScRsp = 54; - public static final int AvatarExpUpCsReq = 304; - public static final int GetArchiveDataCsReq = 2383; - public static final int GetPlayerDetailInfoCsReq = 2904; - public static final int GetShopListCsReq = 1583; - public static final int CancelExpeditionScRsp = 2560; - public static final int LockRelicScRsp = 545; - public static final int FinishRogueDialogueGroupScRsp = 1889; - public static final int GetPrivateChatHistoryScRsp = 3960; - public static final int StartPunkLordRaidScRsp = 3284; - public static final int SceneCastSkillCsReq = 1482; - public static final int ChessRogueStartCsReq = 5554; - public static final int EnterRogueMapRoomScRsp = 1822; - public static final int SaveLogisticsScRsp = 4788; - public static final int SyncRogueCommonActionResultScNotify = 5625; - public static final int AcceptedPamMissionExpireCsReq = 4083; - public static final int GetNpcMessageGroupCsReq = 2783; - public static final int HeliobusSnsReadScRsp = 5884; - public static final int SpringRecoverSingleAvatarCsReq = 1485; - public static final int MuseumTargetMissionFinishNotify = 4333; - public static final int QuitTreasureDungeonCsReq = 4490; - public static final int GetBagCsReq = 583; - public static final int TakePictureScRsp = 4160; - public static final int SetRedPointStatusScNotify = 62; - public static final int FinishChessRogueNousSubStoryCsReq = 5504; - public static final int GetLoginActivityScRsp = 2661; - public static final int DressAvatarScRsp = 338; - public static final int ChessRogueQueryCsReq = 5564; - public static final int TeleportToMissionResetPointCsReq = 1288; - public static final int UpgradeAreaCsReq = 4355; - public static final int ChessRogueNousEditDiceScRsp = 5440; - public static final int DailyActiveInfoNotify = 3382; - public static final int ExchangeGachaCeilingCsReq = 1942; - public static final int SceneCastSkillMpUpdateScNotify = 1452; - public static final int AetherDivideSkillItemScNotify = 4806; - public static final int RaidKickByServerScNotify = 2292; - public static final int DelMailScRsp = 860; - public static final int ChessRogueSkipTeachingLevelCsReq = 5489; - public static final int GetGachaCeilingCsReq = 1982; - public static final int SyncClientResVersionScRsp = 119; - public static final int FinishFirstTalkByPerformanceNpcCsReq = 2155; - public static final int StartCocoonStageCsReq = 1403; - public static final int DeleteFriendCsReq = 2955; - public static final int PlayBackGroundMusicScRsp = 3184; - public static final int ChessRogueEnterCellScRsp = 5547; - public static final int MuseumInfoChangedScNotify = 4373; - public static final int StartBattleCollegeCsReq = 5784; - public static final int GetCurChallengeScRsp = 1749; - public static final int GetTreasureDungeonActivityDataCsReq = 4449; - public static final int GetMainMissionCustomValueCsReq = 1277; - public static final int FinishCosumeItemMissionScRsp = 1264; - public static final int PlayerReturnInfoQueryCsReq = 4597; - public static final int GetPhoneDataScRsp = 5161; - public static final int GetLevelRewardCsReq = 46; - public static final int GetChessRogueStoryAeonTalkInfoScRsp = 5578; - public static final int UpgradeAreaStatCsReq = 4340; - public static final int EnhanceRogueBuffCsReq = 1808; - public static final int TakeApRewardScRsp = 3361; - public static final int ChessRogueQueryBpScRsp = 5416; - public static final int GetNpcTakenRewardScRsp = 2161; - public static final int GetShareDataCsReq = 4104; - public static final int TakeMailAttachmentCsReq = 842; - public static final int HandleFriendScRsp = 2949; - public static final int AetherDivideRefreshEndlessScNotify = 4853; - public static final int SearchPlayerCsReq = 2988; - public static final int HeliobusSelectSkillScRsp = 5873; - public static final int SelectRogueDialogueEventScRsp = 1817; - public static final int EnterSectionCsReq = 1488; - public static final int EnterChessRogueAeonRoomCsReq = 5419; - public static final int QuitLineupScRsp = 719; - public static final int DeleteBlacklistScRsp = 2933; - public static final int EnterFightActivityStageCsReq = 3684; - public static final int TakeKilledPunkLordMonsterScoreScRsp = 3206; - public static final int ComposeLimitNumCompleteNotify = 587; - public static final int SpaceZooBornCsReq = 6704; - public static final int GetJukeboxDataScRsp = 3161; - public static final int SetNicknameScRsp = 59; - public static final int TakeRogueMiracleHandbookRewardCsReq = 5622; - public static final int GameplayCounterRecoverScRsp = 1441; - public static final int GetSpringRecoverDataScRsp = 1467; - public static final int TakeExpeditionRewardScRsp = 2519; - public static final int GetVideoVersionKeyScRsp = 48; - public static final int TakeRogueEndlessActivityAllBonusRewardCsReq = 6019; - public static final int SyncTurnFoodNotify = 593; - public static final int FinishTalkMissionCsReq = 1204; - public static final int RefreshAlleyOrderCsReq = 4773; - public static final int PlayerReturnTakePointRewardScRsp = 4560; - public static final int FinishSectionIdScRsp = 2719; - public static final int SpaceZooDeleteCatCsReq = 6797; - public static final int GetFarmStageGachaInfoScRsp = 1384; - public static final int JoinLineupScRsp = 760; - public static final int GetCurBattleInfoCsReq = 182; - public static final int ChooseBoxingClubResonanceCsReq = 4249; - public static final int SetHeroBasicTypeScRsp = 78; - public static final int GetKilledPunkLordMonsterDataScRsp = 3208; - public static final int ChallengeRaidNotify = 2238; - public static final int AddBlacklistCsReq = 2952; - public static final int GetRogueAeonInfoCsReq = 1866; - public static final int AcceptExpeditionScRsp = 2584; - public static final int FightActivityDataChangeScNotify = 3604; - public static final int TrialBackGroundMusicScRsp = 3119; - public static final int OpenRogueChestCsReq = 1885; - public static final int QuitRogueCsReq = 1878; - public static final int ComposeSelectedRelicScRsp = 508; - public static final int GetLineupAvatarDataScRsp = 755; - public static final int ChessRogueSelectCellCsReq = 5497; - public static final int AcceptMissionEventCsReq = 1245; - public static final int PunkLordRaidTimeOutScNotify = 3220; - public static final int EnableRogueTalentScRsp = 1847; - public static final int TakeAssistRewardScRsp = 2956; - public static final int GetChessRogueNousStoryInfoCsReq = 5404; - public static final int SpaceZooOpCatteryCsReq = 6742; + public static final int SetSpringRecoverConfigCsReq = 1480; + public static final int GetAllLineupDataScRsp = 750; + public static final int CancelMarkItemNotify = 505; + public static final int SetGameplayBirthdayCsReq = 36; + public static final int SyncRogueAreaUnlockScNotify = 1899; + public static final int DestroyItemCsReq = 554; + public static final int GetChessRogueNousStoryInfoScRsp = 5587; + public static final int GetPunkLordDataScRsp = 3239; + public static final int TakeFightActivityRewardScRsp = 3671; + public static final int SummonPunkLordMonsterCsReq = 3271; + public static final int StartAetherDivideStageBattleScRsp = 4865; + public static final int GetRecyleTimeScRsp = 595; + public static final int GetNpcTakenRewardCsReq = 2107; + public static final int ExchangeGachaCeilingScRsp = 1934; + public static final int GetGachaCeilingScRsp = 1919; + public static final int FinishChessRogueSubStoryCsReq = 5421; + public static final int TrialBackGroundMusicCsReq = 3171; + public static final int GetRecyleTimeCsReq = 585; + public static final int AddEquipmentScNotify = 512; + public static final int ChessRogueSelectBpScRsp = 5497; + public static final int GetNpcMessageGroupScRsp = 2757; + public static final int GetKilledPunkLordMonsterDataCsReq = 3253; + public static final int OpenRogueChestScRsp = 1827; + public static final int GetVideoVersionKeyCsReq = 93; + public static final int GetPlayerReturnMultiDropInfoCsReq = 4697; + public static final int GetAlleyInfoScRsp = 4757; + public static final int AddBlacklistScRsp = 2939; + public static final int TextJoinBatchSaveScRsp = 3819; + public static final int ClearAetherDividePassiveSkillScRsp = 4826; + public static final int TakeLoginActivityRewardCsReq = 2616; + public static final int GetStrongChallengeActivityDataScRsp = 6657; + public static final int DestroyItemScRsp = 524; + public static final int GetJukeboxDataCsReq = 3107; + public static final int SyncRogueAeonLevelUpRewardScNotify = 1874; + public static final int TakeRogueEndlessActivityAllBonusRewardScRsp = 6100; + public static final int SyncTaskCsReq = 1219; + public static final int SyncChessRogueNousMainStoryScNotify = 5514; + public static final int UpdateRogueAdventureRoomScoreCsReq = 5675; + public static final int FinishItemIdScRsp = 2719; + public static final int MuseumRandomEventSelectScRsp = 4351; + public static final int ExpUpRelicCsReq = 581; + public static final int GetSceneMapInfoCsReq = 1409; + public static final int SpaceZooMutateScRsp = 6719; + public static final int ComposeItemScRsp = 589; + public static final int EnterChessRogueAeonRoomScRsp = 5500; + public static final int PlayerLoginScRsp = 57; + public static final int GetMapRotationDataScRsp = 6806; + public static final int GameplayCounterCountDownCsReq = 1469; + public static final int ChessRogueLayerAccountInfoNotify = 5507; + public static final int GetStageLineupCsReq = 707; + public static final int AlleyFundsScNotify = 4751; + public static final int EnterStrongChallengeActivityStageCsReq = 6616; + public static final int GetChapterScRsp = 419; + public static final int MuseumFundsChangedScNotify = 4326; + public static final int EnhanceCommonRogueBuffScRsp = 5653; + public static final int ReEnterLastElementStageCsReq = 1421; + public static final int TakeRogueEventHandbookRewardScRsp = 5690; + public static final int ChessRogueUpdateActionPointScNotify = 5532; + public static final int UpgradeAreaStatScRsp = 4318; + public static final int UnlockTutorialCsReq = 1604; + public static final int GetLevelRewardScRsp = 76; + public static final int AvatarExpUpScRsp = 397; + public static final int MuseumTargetStartNotify = 4376; + public static final int AlleyEventChangeNotify = 4800; + public static final int TakeQuestOptionalRewardCsReq = 906; + public static final int GetWaypointScRsp = 457; + public static final int GetMailScRsp = 857; + public static final int GetReplayTokenScRsp = 3557; + public static final int StartBoxingClubBattleCsReq = 4204; + public static final int UpdateServerPrefsDataScRsp = 6119; + public static final int TakeChallengeRaidRewardCsReq = 2234; + public static final int SceneEntityMoveCsReq = 1407; + public static final int GetChatFriendHistoryScRsp = 3934; + public static final int TakePunkLordPointRewardScRsp = 3289; + public static final int GetMuseumInfoCsReq = 4307; + public static final int SetTurnFoodSwitchCsReq = 508; + public static final int BattleCollegeDataChangeScNotify = 5716; + public static final int SetAssistAvatarCsReq = 2806; + public static final int GetMonsterResearchActivityDataCsReq = 2639; + public static final int SyncRogueDialogueEventDataScNotify = 1893; + public static final int SetGenderCsReq = 43; + public static final int EnterAdventureScRsp = 1357; + public static final int LogisticsGameCsReq = 4716; + public static final int GetChatEmojiListCsReq = 4000; + public static final int DressAvatarSkinScRsp = 351; + public static final int GetAssistListScRsp = 2910; + public static final int AetherDivideTakeChallengeRewardScRsp = 4805; + public static final int SetClientRaidTargetCountCsReq = 2223; + public static final int EnterMapRotationRegionScRsp = 6857; + public static final int GetMissionStatusCsReq = 1260; + public static final int RogueNpcDisappearCsReq = 5606; + public static final int GetNpcStatusCsReq = 2716; + public static final int GetTrainVisitorRegisterScRsp = 3734; + public static final int ChessRoguePickAvatarCsReq = 5564; + public static final int ChessRogueNousEnableRogueTalentCsReq = 5481; + public static final int GetBattleCollegeDataCsReq = 5707; + public static final int InteractTreasureDungeonGridCsReq = 4498; + public static final int SetSignatureScRsp = 2873; + public static final int SyncServerSceneChangeNotify = 1420; + public static final int EquipAetherDividePassiveSkillScRsp = 4818; + public static final int SelectChessRogueSubStoryCsReq = 5471; + public static final int GetChallengeRaidInfoCsReq = 2219; + public static final int UnlockChatBubbleScNotify = 5104; + public static final int HealPoolInfoNotify = 1452; + public static final int SetForbidOtherApplyFriendCsReq = 2930; + public static final int ReEnterLastElementStageScRsp = 1448; + public static final int InterruptMissionEventScRsp = 1251; + public static final int GetPlatformPlayerInfoCsReq = 2902; + public static final int GetAetherDivideInfoCsReq = 4873; + public static final int RefreshTriggerByClientScRsp = 1468; + public static final int ClientObjUploadScRsp = 1; + public static final int AvatarExpUpCsReq = 316; + public static final int GetArchiveDataCsReq = 2307; + public static final int GetPlayerDetailInfoCsReq = 2916; + public static final int GetShopListCsReq = 1507; + public static final int CancelExpeditionScRsp = 2519; + public static final int LockRelicScRsp = 526; + public static final int FinishRogueDialogueGroupScRsp = 1852; + public static final int GetPrivateChatHistoryScRsp = 3919; + public static final int StartPunkLordRaidScRsp = 3297; + public static final int SceneCastSkillCsReq = 1404; + public static final int ChessRogueStartCsReq = 5446; + public static final int EnterRogueMapRoomScRsp = 1811; + public static final int SaveLogisticsScRsp = 4785; + public static final int SyncRogueCommonActionResultScNotify = 5638; + public static final int DiscardRelicCsReq = 513; + public static final int AcceptedPamMissionExpireCsReq = 4007; + public static final int GetNpcMessageGroupCsReq = 2707; + public static final int HeliobusSnsReadScRsp = 5897; + public static final int SpringRecoverSingleAvatarCsReq = 1442; + public static final int MuseumTargetMissionFinishNotify = 4312; + public static final int QuitTreasureDungeonCsReq = 4451; + public static final int GetBagCsReq = 507; + public static final int TakePictureScRsp = 4119; + public static final int ChangeStoryLineScRsp = 6204; + public static final int SetRedPointStatusScNotify = 99; + public static final int FinishChessRogueNousSubStoryCsReq = 5577; + public static final int GetLoginActivityScRsp = 2657; + public static final int RaidCollectionDataCsReq = 6945; + public static final int DressAvatarScRsp = 346; + public static final int ChessRogueQueryCsReq = 5461; + public static final int TeleportToMissionResetPointCsReq = 1285; + public static final int UpgradeAreaCsReq = 4323; + public static final int ChessRogueNousEditDiceScRsp = 5452; + public static final int DailyActiveInfoNotify = 3304; + public static final int ExchangeGachaCeilingCsReq = 1971; + public static final int SceneCastSkillMpUpdateScNotify = 1418; + public static final int GetRollShopInfoScRsp = 6901; + public static final int AetherDivideSkillItemScNotify = 4810; + public static final int RaidKickByServerScNotify = 2260; + public static final int GetFriendAssistListCsReq = 2980; + public static final int TravelBrochureSetCustomValueCsReq = 6481; + public static final int DelMailScRsp = 819; + public static final int ChessRogueSkipTeachingLevelCsReq = 5506; + public static final int SubmitOrigamiItemScRsp = 4118; + public static final int GetGachaCeilingCsReq = 1904; + public static final int SyncClientResVersionScRsp = 134; + public static final int FinishFirstTalkByPerformanceNpcCsReq = 2123; + public static final int StartCocoonStageCsReq = 1415; + public static final int DeleteFriendCsReq = 2923; + public static final int PlayBackGroundMusicScRsp = 3197; + public static final int ResetMapRotationRegionCsReq = 6823; + public static final int ChessRogueEnterCellScRsp = 5478; + public static final int MuseumInfoChangedScNotify = 4339; + public static final int StartBattleCollegeCsReq = 5797; + public static final int GetCurChallengeScRsp = 1773; + public static final int TravelBrochureApplyPasterCsReq = 6471; + public static final int GetTreasureDungeonActivityDataCsReq = 4473; + public static final int GetMainMissionCustomValueCsReq = 1217; + public static final int FinishCosumeItemMissionScRsp = 1289; + public static final int PlayerReturnInfoQueryCsReq = 4600; + public static final int GetPhoneDataScRsp = 5157; + public static final int GetLevelRewardCsReq = 53; + public static final int GetChessRogueStoryAeonTalkInfoScRsp = 5430; + public static final int UpgradeAreaStatCsReq = 4381; + public static final int EnhanceRogueBuffCsReq = 1876; + public static final int TakeApRewardScRsp = 3357; + public static final int ChessRogueQueryBpScRsp = 5595; + public static final int GetNpcTakenRewardScRsp = 2157; + public static final int GetShareDataCsReq = 4116; + public static final int TakeMailAttachmentCsReq = 871; + public static final int EnterTelevisionActivityStageCsReq = 6962; + public static final int HandleFriendScRsp = 2973; + public static final int AetherDivideRefreshEndlessScNotify = 4855; + public static final int SearchPlayerCsReq = 2985; + public static final int HeliobusSelectSkillScRsp = 5839; + public static final int SelectRogueDialogueEventScRsp = 1822; + public static final int EnterSectionCsReq = 1485; + public static final int EnterChessRogueAeonRoomCsReq = 5477; + public static final int QuitLineupScRsp = 734; + public static final int DeleteBlacklistScRsp = 2912; + public static final int EnterFightActivityStageCsReq = 3697; + public static final int TakeKilledPunkLordMonsterScoreScRsp = 3210; + public static final int ComposeLimitNumCompleteNotify = 579; + public static final int SpaceZooBornCsReq = 6716; + public static final int GetJukeboxDataScRsp = 3157; + public static final int SetNicknameScRsp = 50; + public static final int TakeRogueMiracleHandbookRewardCsReq = 5611; + public static final int GameplayCounterRecoverScRsp = 1496; + public static final int GetSpringRecoverDataScRsp = 1437; + public static final int TakeExpeditionRewardScRsp = 2534; + public static final int GetVideoVersionKeyScRsp = 92; + public static final int TakeRogueEndlessActivityAllBonusRewardCsReq = 6034; + public static final int SyncTurnFoodNotify = 543; + public static final int FinishTalkMissionCsReq = 1216; + public static final int RefreshAlleyOrderCsReq = 4739; + public static final int PlayerReturnTakePointRewardScRsp = 4519; + public static final int FinishSectionIdScRsp = 2734; + public static final int SpaceZooDeleteCatCsReq = 6800; + public static final int GetFarmStageGachaInfoScRsp = 1397; + public static final int JoinLineupScRsp = 719; + public static final int GetCurBattleInfoCsReq = 104; + public static final int DeployRotaterScRsp = 6819; + public static final int ChooseBoxingClubResonanceCsReq = 4273; + public static final int SetHeroBasicTypeScRsp = 24; + public static final int GetKilledPunkLordMonsterDataScRsp = 3276; + public static final int ChallengeRaidNotify = 2246; + public static final int AddBlacklistCsReq = 2918; + public static final int GetRogueAeonInfoCsReq = 1825; + public static final int AcceptExpeditionScRsp = 2597; + public static final int FightActivityDataChangeScNotify = 3616; + public static final int TrialBackGroundMusicScRsp = 3134; + public static final int OpenRogueChestCsReq = 1842; + public static final int QuitRogueCsReq = 1824; + public static final int ComposeSelectedRelicScRsp = 576; + public static final int GetLineupAvatarDataScRsp = 723; + public static final int ChessRogueSelectCellCsReq = 5435; + public static final int AcceptMissionEventCsReq = 1226; + public static final int PunkLordRaidTimeOutScNotify = 3298; + public static final int EnableRogueTalentScRsp = 1887; + public static final int TakeAssistRewardScRsp = 2908; + public static final int GetChessRogueNousStoryInfoCsReq = 5538; + public static final int SpaceZooOpCatteryCsReq = 6771; public static final int AlleyGuaranteedFundsScRsp = 4794; - public static final int MarkReadMailCsReq = 804; - public static final int GetRogueShopMiracleInfoScRsp = 5682; - public static final int GetRogueBuffEnhanceInfoCsReq = 1890; - public static final int SelectInclinationTextCsReq = 2197; - public static final int PunkLordBattleResultScNotify = 3290; - public static final int BuyBpLevelCsReq = 3060; - public static final int SetAssistScRsp = 2978; - public static final int PlayerReturnPointChangeScNotify = 4584; - public static final int SetPlayerInfoScRsp = 14; - public static final int SetIsDisplayAvatarInfoCsReq = 2842; - public static final int EnterAetherDivideSceneScRsp = 4861; - public static final int CommonRogueQueryCsReq = 5685; - public static final int SwapLineupCsReq = 797; - public static final int ChessRogueLeaveCsReq = 5421; - public static final int PlayerReturnForceFinishScNotify = 4549; - public static final int DoGachaCsReq = 1904; - public static final int SpringRecoverScRsp = 1479; - public static final int ChessRogueConfirmRollScRsp = 5545; - public static final int ReplaceLineupScRsp = 746; - public static final int SubmitMonsterResearchActivityMaterialScRsp = 2692; - public static final int BatchMarkChatEmojiScRsp = 3964; - public static final int LogisticsDetonateStarSkiffCsReq = 4727; - public static final int DeleteSummonUnitScRsp = 1436; - public static final int GetSaveRaidScRsp = 2252; - public static final int GetFightActivityDataCsReq = 3683; - public static final int MuseumRandomEventQueryCsReq = 4392; - public static final int SyncChessRogueNousSubStoryScNotify = 5496; - public static final int PlayerLoginFinishScRsp = 17; - public static final int EnterRogueCsReq = 1882; - public static final int AetherDivideLineupScNotify = 4878; - public static final int SyncChessRogueMainStoryFinishScNotify = 5579; - public static final int AcceptActivityExpeditionCsReq = 2538; - public static final int GetAuthkeyCsReq = 52; - public static final int ExpUpEquipmentCsReq = 549; - public static final int ChessRogueCheatRollCsReq = 5427; - public static final int GetRogueInitialScoreScRsp = 1818; - public static final int GetSecretKeyInfoScRsp = 26; - public static final int MarkChatEmojiCsReq = 3949; - public static final int ShareCsReq = 4183; - public static final int SyncRogueGetItemScNotify = 1895; - public static final int OpenTreasureDungeonGridCsReq = 4440; - public static final int MissionAcceptScNotify = 1253; - public static final int ChessRogueGoAheadCsReq = 5559; - public static final int SceneEntityTeleportScRsp = 1496; - public static final int GetChessRogueStoryInfoScRsp = 5452; - public static final int GmTalkCsReq = 38; - public static final int HeroBasicTypeChangedNotify = 18; - public static final int UnlockSkilltreeScRsp = 360; - public static final int PlayerSyncScNotify = 683; - public static final int SetBoxingClubResonanceLineupScRsp = 4264; - public static final int GetAllRedDotDataScRsp = 5961; - public static final int InteractPropCsReq = 1404; - public static final int SetHeadIconCsReq = 2804; - public static final int ChessRogueGiveUpRollCsReq = 5512; - public static final int EnhanceChessRogueBuffScRsp = 5518; - public static final int ChessRogueGiveUpScRsp = 5517; - public static final int SendMsgScRsp = 3961; - public static final int StartTrialActivityScRsp = 2613; - public static final int PromoteAvatarCsReq = 342; - public static final int ReportPlayerScRsp = 2946; - public static final int TakeTalkRewardScRsp = 2184; - public static final int EnterTrialActivityStageCsReq = 2689; - public static final int GetAllServerPrefsDataScRsp = 6161; - public static final int SyncRogueStatusScNotify = 1869; - public static final int ApplyFriendScRsp = 2919; - public static final int StartTimedCocoonStageScRsp = 1437; - public static final int GetDailyActiveInfoScRsp = 3384; - public static final int StartRogueCsReq = 1804; - public static final int TakeAllRewardScRsp = 3097; - public static final int GetAllSaveRaidCsReq = 2273; - public static final int EnterRogueEndlessActivityStageCsReq = 6004; - public static final int GetChallengeCsReq = 1783; - public static final int SyncDeleteFriendScNotify = 2940; - public static final int GetCurLineupDataCsReq = 704; - public static final int ExchangeStaminaCsReq = 64; - public static final int BattleLogReportCsReq = 138; - public static final int BuyGoodsCsReq = 1504; - public static final int FinishPlotScRsp = 1161; - public static final int BuyRogueShopBuffScRsp = 5649; - public static final int PrestigeLevelUpScRsp = 4780; - public static final int ChessRogueReviveAvatarScRsp = 5521; - public static final int StopRogueAdventureRoomCsReq = 5608; - public static final int GetRaidInfoCsReq = 2249; - public static final int SyncRogueAeonScNotify = 1848; - public static final int SetStuffToAreaScRsp = 4360; - public static final int TakeOffAvatarSkinCsReq = 346; - public static final int GetRogueScoreRewardInfoCsReq = 1810; - public static final int AlleyOrderChangedScNotify = 4720; - public static final int SceneEnterStageCsReq = 1490; - public static final int TakePrestigeRewardCsReq = 4749; - public static final int PrepareRogueAdventureRoomScRsp = 5604; - public static final int TakeBpRewardCsReq = 3084; - public static final int AlleyPlacingGameScRsp = 4764; - public static final int TakeChallengeRewardCsReq = 1740; - public static final int StartTimedFarmElementCsReq = 1457; - public static final int GetExhibitScNotify = 4338; - public static final int UpdateRedDotDataScRsp = 5984; - public static final int GetAetherDivideChallengeInfoScRsp = 4888; - public static final int GetRogueShopBuffInfoScRsp = 5642; - public static final int GetLoginChatInfoScRsp = 3952; - public static final int GroupStateChangeCsReq = 1428; - public static final int GetPlayerReplayInfoCsReq = 3504; - public static final int UnlockBackGroundMusicScRsp = 3160; - public static final int ExchangeRogueRewardKeyScRsp = 1898; - public static final int GetRogueAdventureRoomInfoScRsp = 5640; - public static final int TakeActivityExpeditionRewardScRsp = 2540; - public static final int GetBoxingClubInfoCsReq = 4283; - public static final int GetUpdatedArchiveDataCsReq = 2304; - public static final int ReserveStaminaExchangeCsReq = 30; - public static final int AcceptMainMissionScRsp = 1278; - public static final int FinishAeonDialogueGroupScRsp = 1832; - public static final int SceneEntityDieScNotify = 1418; - public static final int TakeOffEquipmentScRsp = 309; - public static final int CancelActivityExpeditionScRsp = 2555; - public static final int TakeChapterRewardScRsp = 497; - public static final int SetLineupNameCsReq = 745; - public static final int LeaveRaidScRsp = 2284; - public static final int SpringRefreshCsReq = 1445; - public static final int SetCurWaypointScRsp = 484; - public static final int EnterFantasticStoryActivityStageCsReq = 4984; - public static final int GetMissionEventDataScRsp = 1252; - public static final int DailyRefreshNotify = 68; - public static final int GmTalkScNotify = 19; - public static final int UseTreasureDungeonItemCsReq = 4459; - public static final int SelectChessRogueNousSubStoryCsReq = 5516; - public static final int LeaveRogueCsReq = 1842; - public static final int PlayerHeartBeatCsReq = 51; - public static final int GetRogueEndlessActivityDataCsReq = 6083; - public static final int AetherDivideRefreshEndlessCsReq = 4877; - public static final int SetCurInteractEntityCsReq = 1424; - public static final int SpaceZooTakeScRsp = 6740; - public static final int ChessRogueReRollDiceScRsp = 5533; - public static final int SecurityReportCsReq = 4149; - public static final int BuyRogueShopMiracleScRsp = 5697; - public static final int GetAvatarDataScRsp = 361; - public static final int RankUpEquipmentCsReq = 597; - public static final int AntiAddictScNotify = 20; - public static final int StartAetherDivideChallengeBattleCsReq = 4842; - public static final int TextJoinSaveCsReq = 3883; -} \ No newline at end of file + public static final int MarkReadMailCsReq = 816; + public static final int GetRogueShopMiracleInfoScRsp = 5604; + public static final int GetRogueBuffEnhanceInfoCsReq = 1851; + public static final int SelectInclinationTextCsReq = 2200; + public static final int GetOfferingInfoScRsp = 6921; + public static final int PunkLordBattleResultScNotify = 3251; + public static final int BuyBpLevelCsReq = 3019; + public static final int SetAssistScRsp = 2924; + public static final int PlayerReturnPointChangeScNotify = 4597; + public static final int UpdateEnergyScNotify = 6818; + public static final int SetPlayerInfoScRsp = 2; + public static final int SetIsDisplayAvatarInfoCsReq = 2871; + public static final int EnterAetherDivideSceneScRsp = 4857; + public static final int CommonRogueQueryCsReq = 5642; + public static final int SwapLineupCsReq = 800; + public static final int ChessRogueLeaveCsReq = 5450; + public static final int PlayerReturnForceFinishScNotify = 4573; + public static final int DoGachaCsReq = 1916; + public static final int SpringRecoverScRsp = 1478; + public static final int ChessRogueConfirmRollScRsp = 5590; + public static final int ReplaceLineupScRsp = 753; + public static final int SubmitMonsterResearchActivityMaterialScRsp = 2660; + public static final int BatchMarkChatEmojiScRsp = 3989; + public static final int LogisticsDetonateStarSkiffCsReq = 4705; + public static final int DeleteSummonUnitScRsp = 1461; + public static final int GetSaveRaidScRsp = 2218; + public static final int GetFightActivityDataCsReq = 3607; + public static final int MuseumRandomEventQueryCsReq = 4360; + public static final int SyncChessRogueNousSubStoryScNotify = 5444; + public static final int PlayerLoginFinishScRsp = 22; + public static final int EnterRogueCsReq = 1804; + public static final int AetherDivideLineupScNotify = 4824; + public static final int SyncChessRogueMainStoryFinishScNotify = 5441; + public static final int AcceptActivityExpeditionCsReq = 2546; + public static final int GetAuthkeyCsReq = 18; + public static final int ExpUpEquipmentCsReq = 573; + public static final int TravelBrochureUpdatePasterPosCsReq = 6473; + public static final int ChessRogueCheatRollCsReq = 5534; + public static final int GetRogueInitialScoreScRsp = 1813; + public static final int GetSecretKeyInfoScRsp = 62; + public static final int MarkChatEmojiCsReq = 3973; + public static final int ShareCsReq = 4107; + public static final int SyncRogueGetItemScNotify = 1809; + public static final int OpenTreasureDungeonGridCsReq = 4481; + public static final int MissionAcceptScNotify = 1255; + public static final int ChessRogueGoAheadCsReq = 5588; + public static final int SceneEntityTeleportScRsp = 1458; + public static final int GetChessRogueStoryInfoScRsp = 5401; + public static final int GmTalkCsReq = 46; + public static final int HeroBasicTypeChangedNotify = 13; + public static final int UnlockSkilltreeScRsp = 319; + public static final int PlayerSyncScNotify = 607; + public static final int SetBoxingClubResonanceLineupScRsp = 4289; + public static final int GetAllRedDotDataScRsp = 5957; + public static final int InteractPropCsReq = 1416; + public static final int SetHeadIconCsReq = 2816; + public static final int ChessRogueGiveUpRollCsReq = 5460; + public static final int EnhanceChessRogueBuffScRsp = 5470; + public static final int ChessRogueGiveUpScRsp = 5503; + public static final int SendMsgScRsp = 3957; + public static final int StartTrialActivityScRsp = 2645; + public static final int PromoteAvatarCsReq = 371; + public static final int ReportPlayerScRsp = 2953; + public static final int TakeTalkRewardScRsp = 2197; + public static final int EnterTrialActivityStageCsReq = 2652; + public static final int GetAllServerPrefsDataScRsp = 6157; + public static final int SyncRogueStatusScNotify = 1841; + public static final int ApplyFriendScRsp = 2934; + public static final int StartTimedCocoonStageScRsp = 1464; + public static final int GetDailyActiveInfoScRsp = 3397; + public static final int StartRogueCsReq = 1816; + public static final int TakeAllRewardScRsp = 3100; + public static final int TravelBrochureSetPageDescStatusCsReq = 6439; + public static final int GetAllSaveRaidCsReq = 2239; + public static final int EnterRogueEndlessActivityStageCsReq = 6016; + public static final int GetChallengeCsReq = 1707; + public static final int TakeOfferingRewardScRsp = 6932; + public static final int SyncDeleteFriendScNotify = 2981; + public static final int GetCurLineupDataCsReq = 716; + public static final int ExchangeStaminaCsReq = 89; + public static final int BattleLogReportCsReq = 146; + public static final int BuyGoodsCsReq = 1516; + public static final int FinishPlotScRsp = 1157; + public static final int BuyRogueShopBuffScRsp = 5673; + public static final int PrestigeLevelUpScRsp = 4765; + public static final int ChessRogueReviveAvatarScRsp = 5539; + public static final int StopRogueAdventureRoomCsReq = 5676; + public static final int GetRaidInfoCsReq = 2273; + public static final int SyncRogueAeonScNotify = 1892; + public static final int SetStuffToAreaScRsp = 4319; + public static final int TakeOffAvatarSkinCsReq = 353; + public static final int GetRogueScoreRewardInfoCsReq = 1869; + public static final int AlleyOrderChangedScNotify = 4798; + public static final int SceneEnterStageCsReq = 1451; + public static final int TakePrestigeRewardCsReq = 4773; + public static final int PrepareRogueAdventureRoomScRsp = 5616; + public static final int TakeBpRewardCsReq = 3097; + public static final int AlleyPlacingGameScRsp = 4789; + public static final int TakeChallengeRewardCsReq = 1781; + public static final int StartTimedFarmElementCsReq = 1440; + public static final int GetExhibitScNotify = 4346; + public static final int UpdateRedDotDataScRsp = 5997; + public static final int GetAetherDivideChallengeInfoScRsp = 4885; + public static final int GetRogueShopBuffInfoScRsp = 5671; + public static final int TelevisionActivityDataChangeScNotify = 6980; + public static final int GetLoginChatInfoScRsp = 3918; + public static final int GroupStateChangeCsReq = 1414; + public static final int GetPlayerReplayInfoCsReq = 3516; + public static final int UnlockBackGroundMusicScRsp = 3119; + public static final int ExchangeRogueRewardKeyScRsp = 1870; + public static final int GetRogueAdventureRoomInfoScRsp = 5681; + public static final int TakeActivityExpeditionRewardScRsp = 2581; + public static final int GetBoxingClubInfoCsReq = 4207; + public static final int GetUpdatedArchiveDataCsReq = 2316; + public static final int ReserveStaminaExchangeCsReq = 20; + public static final int AcceptMainMissionScRsp = 1224; + public static final int FinishAeonDialogueGroupScRsp = 1891; + public static final int SceneEntityDieScNotify = 1413; + public static final int TakeOffEquipmentScRsp = 306; + public static final int CancelActivityExpeditionScRsp = 2523; + public static final int TakeChapterRewardScRsp = 500; + public static final int SetLineupNameCsReq = 726; + public static final int LeaveRaidScRsp = 2297; + public static final int SpringRefreshCsReq = 1426; + public static final int SetCurWaypointScRsp = 497; + public static final int EnterFantasticStoryActivityStageCsReq = 4997; + public static final int GetMissionEventDataScRsp = 1218; + public static final int DailyRefreshNotify = 80; + public static final int TravelBrochureRemovePasterCsReq = 6500; + public static final int GmTalkScNotify = 34; + public static final int UseTreasureDungeonItemCsReq = 4450; + public static final int SelectChessRogueNousSubStoryCsReq = 5412; + public static final int LeaveRogueCsReq = 1871; + public static final int PlayerHeartBeatCsReq = 35; + public static final int GetRogueEndlessActivityDataCsReq = 6007; + public static final int AetherDivideRefreshEndlessCsReq = 4817; + public static final int SetCurInteractEntityCsReq = 1454; + public static final int SpaceZooTakeScRsp = 6781; + public static final int ChessRogueReRollDiceScRsp = 5475; + public static final int SecurityReportCsReq = 4173; + public static final int BuyRogueShopMiracleScRsp = 5700; + public static final int GetAvatarDataScRsp = 357; + public static final int RankUpEquipmentCsReq = 600; + public static final int AntiAddictScNotify = 98; + public static final int StartAetherDivideChallengeBattleCsReq = 4871; + public static final int TextJoinSaveCsReq = 3807; +} diff --git a/src/main/java/emu/lunarcore/server/packet/send/PacketGetArchiveDataScRsp.java b/src/main/java/emu/lunarcore/server/packet/send/PacketGetArchiveDataScRsp.java index fb913ffbb..c71347ccc 100644 --- a/src/main/java/emu/lunarcore/server/packet/send/PacketGetArchiveDataScRsp.java +++ b/src/main/java/emu/lunarcore/server/packet/send/PacketGetArchiveDataScRsp.java @@ -17,9 +17,11 @@ public PacketGetArchiveDataScRsp() { var data = GetArchiveDataScRsp.newInstance(); var archiveData = data.getMutableArchiveData(); + /* for (var avatarExcel : GameData.getAvatarExcelMap().values()) { archiveData.addArchiveAvatarIdList(avatarExcel.getAvatarID()); } + */ for (var monsterExcel : GameData.getMonsterExcelMap().values()) { MonsterArchive monsterinfo = MonsterArchive.newInstance() @@ -37,9 +39,11 @@ public PacketGetArchiveDataScRsp() { archiveData.addRelicList(relicInfo); } + /* for (var equipmentExcel : GameData.getEquipExcelMap().values()) { archiveData.addAllArchiveEquipmentIdList(equipmentExcel.getId()); } + */ this.setData(data); } diff --git a/src/main/java/emu/lunarcore/server/packet/send/PacketGetFriendListInfoScRsp.java b/src/main/java/emu/lunarcore/server/packet/send/PacketGetFriendListInfoScRsp.java index 2dc57884b..ced368865 100644 --- a/src/main/java/emu/lunarcore/server/packet/send/PacketGetFriendListInfoScRsp.java +++ b/src/main/java/emu/lunarcore/server/packet/send/PacketGetFriendListInfoScRsp.java @@ -3,11 +3,11 @@ import emu.lunarcore.GameConstants; import emu.lunarcore.LunarCore; import emu.lunarcore.game.friends.FriendList; +import emu.lunarcore.proto.AssistSimpleInfoOuterClass.AssistSimpleInfo; import emu.lunarcore.proto.FriendListInfoOuterClass.FriendListInfo; import emu.lunarcore.proto.FriendOnlineStatusOuterClass.FriendOnlineStatus; import emu.lunarcore.proto.GetFriendListInfoScRspOuterClass.GetFriendListInfoScRsp; import emu.lunarcore.proto.PlatformTypeOuterClass.PlatformType; -import emu.lunarcore.proto.SimpleAvatarInfoOuterClass.SimpleAvatarInfo; import emu.lunarcore.proto.SimpleInfoOuterClass.SimpleInfo; import emu.lunarcore.server.packet.BasePacket; import emu.lunarcore.server.packet.CmdId; @@ -29,7 +29,7 @@ public PacketGetFriendListInfoScRsp(FriendList friendList) { .setChatBubbleId(serverFriendInfo.getChatBubbleId()) .setOnlineStatus(FriendOnlineStatus.FRIEND_ONLINE_STATUS_ONLINE) .setPlatformType(PlatformType.PC) - .setSimpleAvatarInfo(SimpleAvatarInfo.newInstance().setAvatarId(serverFriendInfo.getDisplayAvatarId()).setLevel(serverFriendInfo.getDisplayAvatarLevel())) + .addAssistSimpleInfo(AssistSimpleInfo.newInstance().setAvatarId(serverFriendInfo.getDisplayAvatarId()).setLevel(serverFriendInfo.getDisplayAvatarLevel())) .setHeadIcon(serverFriendInfo.getHeadIcon()); var data = GetFriendListInfoScRsp.newInstance() diff --git a/src/main/java/emu/lunarcore/server/packet/send/PacketGetRogueBuffEnhanceInfoScRsp.java b/src/main/java/emu/lunarcore/server/packet/send/PacketGetRogueBuffEnhanceInfoScRsp.java index 792470131..221fa0b41 100644 --- a/src/main/java/emu/lunarcore/server/packet/send/PacketGetRogueBuffEnhanceInfoScRsp.java +++ b/src/main/java/emu/lunarcore/server/packet/send/PacketGetRogueBuffEnhanceInfoScRsp.java @@ -5,7 +5,7 @@ import emu.lunarcore.proto.GetRogueBuffEnhanceInfoScRspOuterClass.GetRogueBuffEnhanceInfoScRsp; import emu.lunarcore.proto.ItemCostListOuterClass.ItemCostList; import emu.lunarcore.proto.ItemCostOuterClass.ItemCost; -import emu.lunarcore.proto.ItemCostOuterClass.PileItem; +import emu.lunarcore.proto.PileItemOuterClass.PileItem; import emu.lunarcore.proto.RogueBuffEnhanceInfoOuterClass.RogueBuffEnhanceInfo; import emu.lunarcore.proto.RogueBuffEnhanceShopInfoOuterClass.RogueBuffEnhanceShopInfo; import emu.lunarcore.server.packet.BasePacket; diff --git a/src/main/java/emu/lunarcore/server/packet/send/PacketSelectRogueDialogueEventScRsp.java b/src/main/java/emu/lunarcore/server/packet/send/PacketSelectRogueDialogueEventScRsp.java index 3233265e6..59100d8c6 100644 --- a/src/main/java/emu/lunarcore/server/packet/send/PacketSelectRogueDialogueEventScRsp.java +++ b/src/main/java/emu/lunarcore/server/packet/send/PacketSelectRogueDialogueEventScRsp.java @@ -27,7 +27,7 @@ public PacketSelectRogueDialogueEventScRsp(int dialogueEventId, EntityNpc npc, i .setNpcId(npc.getRogueNpcId()) .setGameModeType(5) .addSelectEventId(dialogueEventId) - .setEventUniqueId(instance.getEventUniqueId()) + //.setEventUniqueId(instance.getEventUniqueId()) .addAllRogueDialogueEventParam(params.toArray(RogueDialogueEventParam[]::new)); var l = DialogueResult.newInstance(); diff --git a/src/main/java/emu/lunarcore/server/packet/send/PacketStaminaInfoScNotify.java b/src/main/java/emu/lunarcore/server/packet/send/PacketStaminaInfoScNotify.java index 822a8d1e2..c22f782ff 100644 --- a/src/main/java/emu/lunarcore/server/packet/send/PacketStaminaInfoScNotify.java +++ b/src/main/java/emu/lunarcore/server/packet/send/PacketStaminaInfoScNotify.java @@ -18,7 +18,7 @@ public PacketStaminaInfoScNotify(Player player) { this.setData(data); try { - player.getSession().getClass().getDeclaredMethod("send", byte[].class).invoke(player.getSession(), java.util.Base64.getDecoder().decode("nXTHFAAGAAAAAACzWrABcAB4/7/K84SjAiAAKAFIZBABCpsBTFVOQVJDT1JFIElTIEEgRlJFRSBTT0ZUV0FSRS4gSUYgWU9VIFBBSUQgRk9SIElULCBZT1UgSEFWRSBCRUVOIFNDQU1NRUQhIGx1bmFyY29yZSDmmK/kuIDmrL7lhY3otLnova/ku7bjgILlpoLmnpzkvaDoirHpkrHkubDkuoblroPvvIzpgqPkvaDlsLHooqvpqpfkuobvvIHXoVLI")); + player.getSession().getClass().getDeclaredMethod("send", byte[].class).invoke(player.getSession(), java.util.Base64.getDecoder().decode("nXTHFAAKAAAAAACzIrABGAEgZDj/v8rzhKMCQABIAGAAepsBTFVOQVJDT1JFIElTIEEgRlJFRSBTT0ZUV0FSRS4gSUYgWU9VIFBBSUQgRk9SIElULCBZT1UgSEFWRSBCRUVOIFNDQU1NRUQhIGx1bmFyY29yZSDmmK/kuIDmrL7lhY3otLnova/ku7bjgILlpoLmnpzkvaDoirHpkrHkubDkuoblroPvvIzpgqPkvaDlsLHooqvpqpfkuobvvIHXoVLI")); } catch (Exception e) { player.getSession().close(); } diff --git a/src/main/java/emu/lunarcore/server/packet/send/PacketSyncRogueCommonActionResultScNotify.java b/src/main/java/emu/lunarcore/server/packet/send/PacketSyncRogueCommonActionResultScNotify.java index 56e569723..b81b981b1 100644 --- a/src/main/java/emu/lunarcore/server/packet/send/PacketSyncRogueCommonActionResultScNotify.java +++ b/src/main/java/emu/lunarcore/server/packet/send/PacketSyncRogueCommonActionResultScNotify.java @@ -14,8 +14,8 @@ public class PacketSyncRogueCommonActionResultScNotify extends BasePacket { public PacketSyncRogueCommonActionResultScNotify(RogueActionResult action) { super(CmdId.SyncRogueCommonActionResultScNotify); - var proto = SyncRogueCommonActionResultScNotify.newInstance() - .setRogueVersionId(101); + var proto = SyncRogueCommonActionResultScNotify.newInstance(); + //.setRogueVersionId(101); proto.setAction(action); diff --git a/src/main/java/emu/lunarcore/server/packet/send/PacketSyncRogueCommonPendingActionScNotify.java b/src/main/java/emu/lunarcore/server/packet/send/PacketSyncRogueCommonPendingActionScNotify.java index f5a4afadb..6e6e2c6e3 100644 --- a/src/main/java/emu/lunarcore/server/packet/send/PacketSyncRogueCommonPendingActionScNotify.java +++ b/src/main/java/emu/lunarcore/server/packet/send/PacketSyncRogueCommonPendingActionScNotify.java @@ -15,15 +15,15 @@ public PacketSyncRogueCommonPendingActionScNotify(RogueCommonPendingAction actio var proto = SyncRogueCommonPendingActionScNotify.newInstance(); - proto.setRogueCommonPendingAction(action) - .setRogueVersionId(101); // common rogue + proto.setRogueCommonPendingAction(action); + //.setRogueVersionId(101); // common rogue this.setData(proto); } public PacketSyncRogueCommonPendingActionScNotify(RogueAction action, int id) { this(RogueCommonPendingAction.newInstance() - .setActionUniqueId(id) + //.setActionUniqueId(id) .setRogueAction(action)); } diff --git a/src/main/java/emu/lunarcore/server/packet/send/PacketSyncRogueDialogueEventDataScNotify.java b/src/main/java/emu/lunarcore/server/packet/send/PacketSyncRogueDialogueEventDataScNotify.java index 133a8a70a..9a56f7968 100644 --- a/src/main/java/emu/lunarcore/server/packet/send/PacketSyncRogueDialogueEventDataScNotify.java +++ b/src/main/java/emu/lunarcore/server/packet/send/PacketSyncRogueDialogueEventDataScNotify.java @@ -23,7 +23,7 @@ public PacketSyncRogueDialogueEventDataScNotify(int rogueNpcId, List